From 55fc37ff494f0b22c9a60eb15e531e83ba002303 Mon Sep 17 00:00:00 2001
From: Dustin Healy <54083382+dustinhealy@users.noreply.github.com>
Date: Wed, 8 Apr 2026 17:04:15 -0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=90=20fix:=20Add=20Tenant=20Context=20?=
 =?UTF-8?q?to=20Admin=20OAuth=20Callback=20Routes=20(#12579)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 🔐 fix: Add Tenant Context to Admin OAuth Callback Routes

* fix: add tenant context to admin local login route
---
 api/server/routes/admin/auth.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/api/server/routes/admin/auth.js b/api/server/routes/admin/auth.js
index 07306ac4db..9b0ecb66a5 100644
--- a/api/server/routes/admin/auth.js
+++ b/api/server/routes/admin/auth.js
@@ -8,6 +8,7 @@ const {
   exchangeAdminCode,
   createSetBalanceConfig,
   storeAndStripChallenge,
+  tenantContextMiddleware,
 } = require('@librechat/api');
 const { loginController } = require('~/server/controllers/auth/LoginController');
 const { requireCapability } = require('~/server/middleware/roles/capabilities');
@@ -56,6 +57,7 @@ router.post(
   middleware.loginLimiter,
   middleware.checkBan,
   middleware.requireLocalAuth,
+  tenantContextMiddleware,
   requireAdminAccess,
   setBalanceConfig,
   loginController,
@@ -152,6 +154,7 @@ router.get(
     failureMessage: true,
     session: false,
   }),
+  tenantContextMiddleware,
   retrievePkceChallenge('openid'),
   requireAdminAccess,
   setBalanceConfig,
@@ -190,6 +193,7 @@ router.post(
     failureMessage: true,
     session: false,
   }),
+  tenantContextMiddleware,
   retrievePkceChallenge('saml'),
   requireAdminAccess,
   setBalanceConfig,
@@ -229,6 +233,7 @@ router.get(
     failureMessage: true,
     session: false,
   }),
+  tenantContextMiddleware,
   retrievePkceChallenge('google'),
   requireAdminAccess,
   setBalanceConfig,
@@ -268,6 +273,7 @@ router.get(
     failureMessage: true,
     session: false,
   }),
+  tenantContextMiddleware,
   retrievePkceChallenge('github'),
   requireAdminAccess,
   setBalanceConfig,
@@ -307,6 +313,7 @@ router.get(
     failureMessage: true,
     session: false,
   }),
+  tenantContextMiddleware,
   retrievePkceChallenge('discord'),
   requireAdminAccess,
   setBalanceConfig,
@@ -346,6 +353,7 @@ router.get(
     failureMessage: true,
     session: false,
   }),
+  tenantContextMiddleware,
   retrievePkceChallenge('facebook'),
   requireAdminAccess,
   setBalanceConfig,
@@ -384,6 +392,7 @@ router.post(
     failureMessage: true,
     session: false,
   }),
+  tenantContextMiddleware,
   retrievePkceChallenge('apple'),
   requireAdminAccess,
   setBalanceConfig,