- Move auth strategies to package/auth

- Move email and avatar functions to package/auth

api/server/services/Files/images/avatar.js

@@ -1,69 +0,0 @@
-const sharp = require('sharp');
-const fs = require('fs').promises;
-const fetch = require('node-fetch');
-const { EImageOutputType } = require('librechat-data-provider');
-const { resizeAndConvert } = require('./resize');
-const { logger } = require('~/config');
-
-/**
- * Uploads an avatar image for a user. This function can handle various types of input (URL, Buffer, or File object),
- * processes the image to a square format, converts it to target format, and returns the resized buffer.
- *
- * @param {Object} params - The parameters object.
- * @param {string} params.userId - The unique identifier of the user for whom the avatar is being uploaded.
- * @param {string} options.desiredFormat - The desired output format of the image.
- * @param {(string|Buffer|File)} params.input - The input representing the avatar image. Can be a URL (string),
- *                                               a Buffer, or a File object.
- *
- * @returns {Promise<any>}
- *          A promise that resolves to a resized buffer.
- *
- * @throws {Error} Throws an error if the user ID is undefined, the input type is invalid, the image fetching fails,
- *                 or any other error occurs during the processing.
- */
-async function resizeAvatar({ userId, input, desiredFormat = EImageOutputType.PNG }) {
-  try {
-    if (userId === undefined) {
-      throw new Error('User ID is undefined');
-    }
-
-    let imageBuffer;
-    if (typeof input === 'string') {
-      const response = await fetch(input);
-
-      if (!response.ok) {
-        throw new Error(`Failed to fetch image from URL. Status: ${response.status}`);
-      }
-      imageBuffer = await response.buffer();
-    } else if (input instanceof Buffer) {
-      imageBuffer = input;
-    } else if (typeof input === 'object' && input instanceof File) {
-      const fileContent = await fs.readFile(input.path);
-      imageBuffer = Buffer.from(fileContent);
-    } else {
-      throw new Error('Invalid input type. Expected URL, Buffer, or File.');
-    }
-
-    const { width, height } = await sharp(imageBuffer).metadata();
-    const minSize = Math.min(width, height);
-    const squaredBuffer = await sharp(imageBuffer)
-      .extract({
-        left: Math.floor((width - minSize) / 2),
-        top: Math.floor((height - minSize) / 2),
-        width: minSize,
-        height: minSize,
-      })
-      .toBuffer();
-
-    const { buffer } = await resizeAndConvert({
-      inputBuffer: squaredBuffer,
-      desiredFormat,
-    });
-    return buffer;
-  } catch (error) {
-    logger.error('Error uploading the avatar:', error);
-    throw error;
-  }
-}
-
-module.exports = { resizeAvatar };

api/server/services/Files/images/index.js

@@ -1,4 +1,3 @@
-const avatar = require('./avatar');
 const convert = require('./convert');
 const encode = require('./encode');
 const parse = require('./parse');
@@ -9,5 +8,4 @@ module.exports = {
   ...encode,
   ...parse,
   ...resize,
-  avatar,
 };

api/server/services/Files/images/resize.js

@@ -89,28 +89,4 @@ async function resizeImageBuffer(inputBuffer, resolution, endpoint) {
   };
 }
 
-/**
- * Resizes an image buffer to a specified format and width.
- *
- * @param {Object} options - The options for resizing and converting the image.
- * @param {Buffer} options.inputBuffer - The buffer of the image to be resized.
- * @param {string} options.desiredFormat - The desired output format of the image.
- * @param {number} [options.width=150] - The desired width of the image. Defaults to 150 pixels.
- * @returns {Promise<{ buffer: Buffer, width: number, height: number, bytes: number }>} An object containing the resized image buffer, its size, and dimensions.
- * @throws Will throw an error if the resolution or format parameters are invalid.
- */
-async function resizeAndConvert({ inputBuffer, desiredFormat, width = 150 }) {
-  const resizedBuffer = await sharp(inputBuffer)
-    .resize({ width })
-    .toFormat(desiredFormat)
-    .toBuffer();
-  const resizedMetadata = await sharp(resizedBuffer).metadata();
-  return {
-    buffer: resizedBuffer,
-    width: resizedMetadata.width,
-    height: resizedMetadata.height,
-    bytes: Buffer.byteLength(resizedBuffer),
-  };
-}
-
-module.exports = { resizeImageBuffer, resizeAndConvert };
+module.exports = { resizeImageBuffer };

api/server/services/Files/process.js

@@ -19,11 +19,8 @@ const {
   isAssistantsEndpoint,
 } = require('librechat-data-provider');
 const { EnvVar } = require('@librechat/agents');
-const {
-  convertImage,
-  resizeAndConvert,
-  resizeImageBuffer,
-} = require('~/server/services/Files/images');
+const { convertImage, resizeImageBuffer } = require('~/server/services/Files/images');
+const { resizeAndConvert } = require('@librechat/auth');
 const { addResourceFileId, deleteResourceFileId } = require('~/server/controllers/assistants/v2');
 const { addAgentResourceFile, removeAgentResourceFiles } = require('~/models/Agent');
 const { getOpenAIClient } = require('~/server/controllers/assistants/helpers');

api/server/services/Files/strategies.js

@@ -59,7 +59,6 @@ const firebaseStrategy = () => ({
   deleteFile: deleteFirebaseFile,
   saveBuffer: saveBufferToFirebase,
   prepareImagePayload: prepareImageURL,
-  processAvatar: processFirebaseAvatar,
   handleImageUpload: uploadImageToFirebase,
   getDownloadStream: getFirebaseFileStream,
 });
@@ -74,7 +73,6 @@ const localStrategy = () => ({
   getFileURL: getLocalFileURL,
   saveBuffer: saveLocalBuffer,
   deleteFile: deleteLocalFile,
-  processAvatar: processLocalAvatar,
   handleImageUpload: uploadLocalImage,
   prepareImagePayload: prepareImagesLocal,
   getDownloadStream: getLocalFileStream,
@@ -91,7 +89,6 @@ const s3Strategy = () => ({
   deleteFile: deleteFileFromS3,
   saveBuffer: saveBufferToS3,
   prepareImagePayload: prepareImageURLS3,
-  processAvatar: processS3Avatar,
   handleImageUpload: uploadImageToS3,
   getDownloadStream: getS3FileStream,
 });
@@ -107,7 +104,6 @@ const azureStrategy = () => ({
   deleteFile: deleteFileFromAzure,
   saveBuffer: saveBufferToAzure,
   prepareImagePayload: prepareAzureImageURL,
-  processAvatar: processAzureAvatar,
   handleImageUpload: uploadImageToAzure,
   getDownloadStream: getAzureFileStream,
 });
@@ -123,8 +119,6 @@ const vectorStrategy = () => ({
   getFileURL: null,
   /** @type {typeof saveLocalBuffer | null} */
   saveBuffer: null,
-  /** @type {typeof processLocalAvatar | null} */
-  processAvatar: null,
   /** @type {typeof uploadLocalImage | null} */
   handleImageUpload: null,
   /** @type {typeof prepareImagesLocal | null} */
@@ -147,8 +141,6 @@ const openAIStrategy = () => ({
   getFileURL: null,
   /** @type {typeof saveLocalBuffer | null} */
   saveBuffer: null,
-  /** @type {typeof processLocalAvatar | null} */
-  processAvatar: null,
   /** @type {typeof uploadLocalImage | null} */
   handleImageUpload: null,
   /** @type {typeof prepareImagesLocal | null} */
@@ -170,8 +162,6 @@ const codeOutputStrategy = () => ({
   getFileURL: null,
   /** @type {typeof saveLocalBuffer | null} */
   saveBuffer: null,
-  /** @type {typeof processLocalAvatar | null} */
-  processAvatar: null,
   /** @type {typeof uploadLocalImage | null} */
   handleImageUpload: null,
   /** @type {typeof prepareImagesLocal | null} */
@@ -189,8 +179,6 @@ const mistralOCRStrategy = () => ({
   getFileURL: null,
   /** @type {typeof saveLocalBuffer | null} */
   saveBuffer: null,
-  /** @type {typeof processLocalAvatar | null} */
-  processAvatar: null,
   /** @type {typeof uploadLocalImage | null} */
   handleImageUpload: null,
   /** @type {typeof prepareImagesLocal | null} */