From c0d640438528ef8ee4f5a684da4766bd70178622 Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Tue, 19 Aug 2025 00:46:38 -0400
Subject: [PATCH] refactor: replace getMCPAuthMap with getUserMCPAuthMap and
 remove unused getCustomConfig file

---
 api/server/controllers/agents/client.js       |  9 +++---
 api/server/services/Config/getCustomConfig.js | 31 -------------------
 api/server/services/Config/index.js           |  2 --
 3 files changed, 5 insertions(+), 37 deletions(-)
 delete mode 100644 api/server/services/Config/getCustomConfig.js

diff --git a/api/server/controllers/agents/client.js b/api/server/controllers/agents/client.js
index 255f178d98..8f706e10b6 100644
--- a/api/server/controllers/agents/client.js
+++ b/api/server/controllers/agents/client.js
@@ -8,6 +8,7 @@ const {
   Tokenizer,
   checkAccess,
   hasCustomUserVars,
+  getUserMCPAuthMap,
   memoryInstructions,
   formatContentStrings,
   createMemoryProcessor,
@@ -40,10 +41,10 @@ const {
   deleteMemory,
   setMemory,
 } = require('~/models');
-const { checkCapability, getMCPAuthMap, getAppConfig } = require('~/server/services/Config');
 const { addCacheControl, createContextHandlers } = require('~/app/clients/prompts');
 const { initializeAgent } = require('~/server/services/Endpoints/agents/agent');
 const { spendTokens, spendStructuredTokens } = require('~/models/spendTokens');
+const { checkCapability, getAppConfig } = require('~/server/services/Config');
 const { encodeAndFormat } = require('~/server/services/Files/images/encode');
 const { getProviderConfig } = require('~/server/services/Endpoints');
 const BaseClient = require('~/app/clients/BaseClient');
@@ -913,10 +914,10 @@ class AgentClient extends BaseClient {
         }
 
         try {
-          if (hasCustomUserVars(appConfig)) {
-            config.configurable.userMCPAuthMap = await getMCPAuthMap({
-              tools: agent.tools,
+          if (agent.tools?.length && hasCustomUserVars(appConfig)) {
+            config.configurable.userMCPAuthMap = await getUserMCPAuthMap({
               userId: this.options.req.user.id,
+              tools: agent.tools,
               findPluginAuthsByKeys,
             });
           }
diff --git a/api/server/services/Config/getCustomConfig.js b/api/server/services/Config/getCustomConfig.js
deleted file mode 100644
index 10fa68d0c7..0000000000
--- a/api/server/services/Config/getCustomConfig.js
+++ /dev/null
@@ -1,31 +0,0 @@
-const { logger } = require('@librechat/data-schemas');
-const { getUserMCPAuthMap } = require('@librechat/api');
-
-/**
- * @param {Object} params
- * @param {string} params.userId
- * @param {GenericTool[]} [params.tools]
- * @param {import('@librechat/data-schemas').PluginAuthMethods['findPluginAuthsByKeys']} params.findPluginAuthsByKeys
- * @returns {Promise<Record<string, Record<string, string>> | undefined>}
- */
-async function getMCPAuthMap({ userId, tools, findPluginAuthsByKeys }) {
-  try {
-    if (!tools || tools.length === 0) {
-      return;
-    }
-    return await getUserMCPAuthMap({
-      tools,
-      userId,
-      findPluginAuthsByKeys,
-    });
-  } catch (err) {
-    logger.error(
-      `[api/server/controllers/agents/client.js #chatCompletion] Error getting custom user vars for agent`,
-      err,
-    );
-  }
-}
-
-module.exports = {
-  getMCPAuthMap,
-};
diff --git a/api/server/services/Config/index.js b/api/server/services/Config/index.js
index efb4d19a88..c6eee234f3 100644
--- a/api/server/services/Config/index.js
+++ b/api/server/services/Config/index.js
@@ -1,7 +1,6 @@
 const appConfig = require('./app');
 const { config } = require('./EndpointService');
 const getCachedTools = require('./getCachedTools');
-const getCustomConfig = require('./getCustomConfig');
 const loadCustomConfig = require('./loadCustomConfig');
 const loadConfigModels = require('./loadConfigModels');
 const loadDefaultModels = require('./loadDefaultModels');
@@ -18,6 +17,5 @@ module.exports = {
   loadAsyncEndpoints,
   ...appConfig,
   ...getCachedTools,
-  ...getCustomConfig,
   ...getEndpointsConfig,
 };