6704: Azure Blob Storage URL Signing and Refresh Support

api/cache/getLogStores.js

@@ -44,6 +44,7 @@ const namespaces = {
   [CacheKeys.TOKEN_CONFIG]: standardCache(CacheKeys.TOKEN_CONFIG, Time.THIRTY_MINUTES),
   [CacheKeys.GEN_TITLE]: standardCache(CacheKeys.GEN_TITLE, Time.TWO_MINUTES),
   [CacheKeys.S3_EXPIRY_INTERVAL]: standardCache(CacheKeys.S3_EXPIRY_INTERVAL, Time.THIRTY_MINUTES),
+  [CacheKeys.AZURE_EXPIRY_INTERVAL]: standardCache(CacheKeys.AZURE_EXPIRY_INTERVAL, Time.THIRTY_MINUTES),
   [CacheKeys.MODEL_QUERIES]: standardCache(CacheKeys.MODEL_QUERIES),
   [CacheKeys.AUDIO_RUNS]: standardCache(CacheKeys.AUDIO_RUNS, Time.TEN_MINUTES),
   [CacheKeys.MESSAGES]: standardCache(CacheKeys.MESSAGES, Time.ONE_MINUTE),

api/server/controllers/UserController.js

@@ -38,6 +38,17 @@ const { verifyEmail, resendVerificationEmail } = require('~/server/services/Auth
 const { getMCPManager, getFlowStateManager, getMCPServersRegistry } = require('~/config');
 const { invalidateCachedTools } = require('~/server/services/Config/getCachedTools');
 const { needsRefresh, getNewS3URL } = require('~/server/services/Files/S3/crud');
+const { needsRefreshAzure, getNewAzureURL } = require('~/server/services/Files/Azure/crud');
+
+/** DI maps: dispatch avatar URL check and refresh by storage source */
+const avatarNeedsRefreshBySource = {
+  [FileSources.s3]: (url) => needsRefresh(url, 3600),
+  [FileSources.azure_blob]: (url) => needsRefreshAzure(url, 3600),
+};
+const getNewAvatarUrlBySource = {
+  [FileSources.s3]: getNewS3URL,
+  [FileSources.azure_blob]: getNewAzureURL,
+};
 const { processDeleteRequest } = require('~/server/services/Files/process');
 const { getAppConfig } = require('~/server/services/Config');
 const { deleteToolCalls } = require('~/models/ToolCall');
@@ -56,20 +67,25 @@ const getUserController = async (req, res) => {
   delete userData.password;
   delete userData.totpSecret;
   delete userData.backupCodes;
-  if (appConfig.fileStrategy === FileSources.s3 && userData.avatar) {
-    const avatarNeedsRefresh = needsRefresh(userData.avatar, 3600);
-    if (!avatarNeedsRefresh) {
+
+  // Signed-URL avatar refresh (S3 / Azure Blob) — dispatches by active file strategy
+  const strategy = appConfig.fileStrategy;
+  const checkNeedsRefresh = avatarNeedsRefreshBySource[strategy];
+  const getNewAvatarUrl = getNewAvatarUrlBySource[strategy];
+  if (checkNeedsRefresh && getNewAvatarUrl && userData.avatar) {
+    if (!checkNeedsRefresh(userData.avatar)) {
       return res.status(200).send(userData);
     }
     const originalAvatar = userData.avatar;
     try {
-      userData.avatar = await getNewS3URL(userData.avatar);
+      userData.avatar = await getNewAvatarUrl(userData.avatar);
       await updateUser(userData.id, { avatar: userData.avatar });
     } catch (error) {
       userData.avatar = originalAvatar;
-      logger.error('Error getting new S3 URL for avatar:', error);
+      logger.error(`Error refreshing ${strategy} avatar URL:`, error);
     }
   }
+
   res.status(200).send(userData);
 };
 

api/server/controllers/agents/v1.js

@@ -47,6 +47,7 @@ const { refreshS3Url } = require('~/server/services/Files/S3/crud');
 const { filterFile } = require('~/server/services/Files/process');
 const { updateAction, getActions } = require('~/models/Action');
 const { getCachedTools } = require('~/server/services/Config');
+const { refreshAzureUrl } = require('~/server/services/Files/Azure/crud');
 const { getLogStores } = require('~/cache');
 
 const systemTools = {
@@ -58,6 +59,12 @@ const systemTools = {
 const MAX_SEARCH_LEN = 100;
 const escapeRegex = (str = '') => str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 
+/** DI map: dispatches avatar URL refresh by storage source */
+const urlRefreshersBySource = {
+  [FileSources.s3]: refreshS3Url,
+  [FileSources.azure_blob]: refreshAzureUrl,
+};
+
 /**
  * Creates an Agent.
  * @route POST /Agents
@@ -160,14 +167,13 @@ const getAgentHandler = async (req, res, expandProperties = false) => {
 
     agent.version = agent.versions ? agent.versions.length : 0;
 
-    if (agent.avatar && agent.avatar?.source === FileSources.s3) {
+    const refreshFn = agent.avatar && urlRefreshersBySource[agent.avatar.source];
+    if (refreshFn) {
       try {
-        agent.avatar = {
-          ...agent.avatar,
-          filepath: await refreshS3Url(agent.avatar),
-        };
+        const newPath = await refreshFn(agent.avatar);
+        agent.avatar = { ...agent.avatar, filepath: newPath };
       } catch (e) {
-        logger.warn('[/Agents/:id] Failed to refresh S3 URL', e);
+        logger.warn('[/Agents/:id] Failed to refresh signed URL', e);
       }
     }
 
@@ -545,6 +551,7 @@ const getListAgentsHandler = async (req, res) => {
           agents: fullList?.data ?? [],
           userId,
           refreshS3Url,
+          refreshAzureUrl,
           updateAgent,
         });
         cachedRefresh = { urlCache };
@@ -553,7 +560,7 @@ const getListAgentsHandler = async (req, res) => {
         logger.error('[/Agents] Error refreshing avatars for full list: %o', err);
       }
     } else {
-      logger.debug('[/Agents] S3 avatar refresh already checked, skipping');
+      logger.debug('[/Agents] Avatar refresh already checked, skipping');
     }
 
     // Use the new ACL-aware function
@@ -577,12 +584,7 @@ const getListAgentsHandler = async (req, res) => {
         if (agent?._id && publicSet.has(agent._id.toString())) {
           agent.isPublic = true;
         }
-        if (
-          urlCache &&
-          agent?.id &&
-          agent?.avatar?.source === FileSources.s3 &&
-          urlCache[agent.id]
-        ) {
+        if (urlCache && agent?.id && agent?.avatar && urlCache[agent.id]) {
           agent.avatar = { ...agent.avatar, filepath: urlCache[agent.id] };
         }
       } catch (e) {

api/server/routes/files/files.js

@@ -3,7 +3,6 @@ const express = require('express');
 const { EnvVar } = require('@librechat/agents');
 const { logger } = require('@librechat/data-schemas');
 const {
-  Time,
   isUUID,
   CacheKeys,
   FileSources,
@@ -26,8 +25,10 @@ const { getOpenAIClient } = require('~/server/controllers/assistants/helpers');
 const { checkPermission } = require('~/server/services/PermissionService');
 const { loadAuthValues } = require('~/server/services/Tools/credentials');
 const { refreshS3FileUrls } = require('~/server/services/Files/S3/crud');
+const { refreshAzureFileUrls } = require('~/server/services/Files/Azure/crud');
 const { hasAccessToFilesViaAgent } = require('~/server/services/Files');
 const { getFiles, batchUpdateFiles } = require('~/models');
+const { getFileURLRefreshCacheTime } = require('~/server/utils/getFileStrategy');
 const { cleanFileName } = require('~/server/utils/files');
 const { getAssistant } = require('~/models/Assistant');
 const { getAgent } = require('~/models/Agent');
@@ -40,16 +41,24 @@ router.get('/', async (req, res) => {
   try {
     const appConfig = req.config;
     const files = await getFiles({ user: req.user.id });
-    if (appConfig.fileStrategy === FileSources.s3) {
+    if (appConfig.fileStrategy === FileSources.s3 || appConfig.fileStrategy === FileSources.azure_blob) {
       try {
-        const cache = getLogStores(CacheKeys.S3_EXPIRY_INTERVAL);
+        const cacheKey = appConfig.fileStrategy === FileSources.s3 
+          ? CacheKeys.S3_EXPIRY_INTERVAL 
+          : CacheKeys.AZURE_EXPIRY_INTERVAL;
+        const cache = getLogStores(cacheKey);
         const alreadyChecked = await cache.get(req.user.id);
         if (!alreadyChecked) {
-          await refreshS3FileUrls(files, batchUpdateFiles);
-          await cache.set(req.user.id, true, Time.THIRTY_MINUTES);
+          if (appConfig.fileStrategy === FileSources.s3) {
+            await refreshS3FileUrls(files, batchUpdateFiles);
+          } else {
+            await refreshAzureFileUrls(files, batchUpdateFiles);
+          }
+          const cacheTime = getFileURLRefreshCacheTime(appConfig.fileStrategy);
+          await cache.set(req.user.id, true, cacheTime);
         }
       } catch (error) {
-        logger.warn('[/files] Error refreshing S3 file URLs:', error);
+        logger.warn('[/files] Error refreshing file URLs for strategy:', appConfig.fileStrategy, error);
       }
     }
     res.status(200).send(files);