Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active
TypeScript aianthropicartifactsawsazurechatgptchatgpt-cloneclaudeclonedeepseekgeminigooglegpt-5librechatmcpo1openairesponses-apivisionwebui
📧 fix: Log User IDs Instead of Emails in Admin Panel Auth Flow (#17032)
Marco Berettac0f7822f2eaf
diff --git a/api/server/controllers/auth/oauth.js b/api/server/controllers/auth/oauth.jsindex 588e6bfa03..e7df7661a2 100644--- a/api/server/controllers/auth/oauth.js+++ b/api/server/controllers/auth/oauth.js@@ -66,7 +66,7 @@ function createOAuthHandler(redirectUri = domains.client) {expiresAt,);callbackUrl.searchParams.set('code', exchangeCode);- logger.info(`[OAuth] Admin panel redirect with exchange code for user: ${req.user.email}`);+ logger.info(`[OAuth] Admin panel redirect with exchange code for user: ${req.user._id}`);return res.redirect(callbackUrl.toString());}diff --git a/e2e/specs/mock/scenarios/admin-auth-log-ids.spec.ts b/e2e/specs/mock/scenarios/admin-auth-log-ids.spec.tsnew file mode 100644index 0000000000..31d66f0c43--- /dev/null+++ b/e2e/specs/mock/scenarios/admin-auth-log-ids.spec.ts@@ -0,0 +1,65 @@+import { randomBytes, randomUUID } from 'crypto';+import { expect, test } from '@playwright/test';+import cleanupUser from '../../../setup/cleanupUser';++/**+ * The admin panel auth flow logs user ids instead of emails. The success paths that+ * log (OAuth callback, code exchange, token refresh) need a live identity provider, so+ * the log content itself is covered by the unit specs; these exercise the reachable+ * edges of the same flow and check that no response carries the user's email.+ */++test.describe('admin panel auth after log id change', () => {+ test('an unknown admin exchange code is rejected without user data @scenario:admin-exchange-unknown-code-rejected', async ({+ playwright,+ baseURL,+ }) => {+ const request = await playwright.request.newContext({ baseURL });+ try {+ const response = await request.post('/api/admin/oauth/exchange', {+ data: { code: randomBytes(32).toString('hex') },+ });+ expect(response.status()).toBe(401);+ const body = (await response.json()) as Record<string, unknown>;+ expect(body.error_code).toBe('INVALID_OR_EXPIRED_CODE');+ expect(body).not.toHaveProperty('token');+ expect(body).not.toHaveProperty('user');+ } finally {+ await request.dispose();+ }+ });++ test('a non-admin user is denied the admin panel without echoing their email @scenario:admin-verify-non-admin-denied', async ({+ playwright,+ baseURL,+ }) => {+ const request = await playwright.request.newContext({ baseURL });+ const user = {+ email: `admin-log-ids-${randomUUID().slice(0, 8)}@example.com`,+ name: 'Admin Log Ids',+ password: 'securepassword789',+ };+ try {+ const register = await request.post('/api/auth/register', {+ data: { ...user, confirm_password: user.password },+ });+ expect(register.ok()).toBeTruthy();++ const login = await request.post('/api/auth/login', {+ data: { email: user.email, password: user.password },+ });+ expect(login.ok()).toBeTruthy();+ const { token } = (await login.json()) as { token: string };+ expect(token).toBeTruthy();++ const response = await request.get('/api/admin/verify', {+ headers: { Authorization: `Bearer ${token}` },+ });+ expect(response.status()).toBe(403);+ expect(await response.text()).not.toContain(user.email);+ } finally {+ await request.dispose();+ await cleanupUser(user);+ }+ });+});diff --git a/packages/api/src/auth/exchange.ts b/packages/api/src/auth/exchange.tsindex 9dd53ae293..969f09deaa 100644--- a/packages/api/src/auth/exchange.ts+++ b/packages/api/src/auth/exchange.ts@@ -132,7 +132,7 @@ export async function generateAdminExchangeCode(await cache.set(exchangeCode, data);- logger.info(`[adminExchange] Generated exchange code for user: ${user.email}`);+ logger.info(`[adminExchange] Generated exchange code for user: ${user._id}`);return exchangeCode;}@@ -171,7 +171,7 @@ export async function exchangeAdminCode(}}- logger.info(`[adminExchange] Exchanged code for user: ${data.user?.email}`);+ logger.info(`[adminExchange] Exchanged code for user: ${data.user?.id}`);return {token: data.token,diff --git a/packages/api/src/auth/refresh.spec.ts b/packages/api/src/auth/refresh.spec.tsindex 683b40e4f8..46fe0546c6 100644--- a/packages/api/src/auth/refresh.spec.ts+++ b/packages/api/src/auth/refresh.spec.ts@@ -630,12 +630,16 @@ describe('applyAdminRefresh', () => {});describe('logging', () => {- it('logs the refreshed user email at debug', async () => {- const deps = makeDeps(makeUser());+ it('logs the refreshed user id at debug, never the email', async () => {+ const user = makeUser();+ const deps = makeDeps(user);await applyAdminRefresh(makeTokenset(), deps);- expect(logger.debug).toHaveBeenCalledWith(expect.stringContaining('[email protected]'));+ expect(logger.debug).toHaveBeenCalledWith(expect.stringContaining(String(user._id)));+ expect(JSON.stringify((logger.debug as jest.Mock).mock.calls)).not.toContain(+ '[email protected]',+ );});});});diff --git a/packages/api/src/auth/refresh.ts b/packages/api/src/auth/refresh.tsindex ba35c15f4c..cd64735a3f 100644--- a/packages/api/src/auth/refresh.ts+++ b/packages/api/src/auth/refresh.ts@@ -302,7 +302,7 @@ export async function applyAdminRefresh(const responseUser = serializeUserForExchange(user);- logger.debug(`[adminRefresh] Refreshed tokens for user: ${responseUser.email}`);+ logger.debug(`[adminRefresh] Refreshed tokens for user: ${responseUser.id}`);return {token: minted.token,diff --git a/packages/api/src/middleware/admin.spec.ts b/packages/api/src/middleware/admin.spec.tsindex 0074461cb4..a4f1d1a68f 100644--- a/packages/api/src/middleware/admin.spec.ts+++ b/packages/api/src/middleware/admin.spec.ts@@ -1,8 +1,8 @@import { logger } from '@librechat/data-schemas';import { SystemRoles } from 'librechat-data-provider';-import { requireAdmin } from './admin';import type { Response } from 'express';import type { ServerRequest } from '~/types/http';+import { requireAdmin } from './admin';jest.mock('@librechat/data-schemas', () => ({...jest.requireActual('@librechat/data-schemas'),@@ -62,7 +62,7 @@ describe('requireAdmin middleware', () => {describe('when user does not have admin role', () => {it('should return 403 when user has no role property', () => {- mockReq.user = { email: '[email protected]' } as ServerRequest['user'];+ mockReq.user = { id: 'user-123', email: '[email protected]' } as ServerRequest['user'];requireAdmin(mockReq as ServerRequest, mockRes as Response, mockNext);@@ -73,8 +73,9 @@ describe('requireAdmin middleware', () => {});expect(mockNext).not.toHaveBeenCalled();expect(logger.debug).toHaveBeenCalledWith(- '[requireAdmin] Access denied for non-admin user: [email protected]',+ '[requireAdmin] Access denied for non-admin user: user-123',);+ expect(JSON.stringify((logger.debug as jest.Mock).mock.calls)).not.toContain('[email protected]');});it('should return 403 when user has USER role', () => {diff --git a/packages/api/src/middleware/admin.ts b/packages/api/src/middleware/admin.tsindex 07bbd39218..6d1e70b80f 100644--- a/packages/api/src/middleware/admin.ts+++ b/packages/api/src/middleware/admin.ts@@ -21,7 +21,7 @@ export const requireAdmin = (}if (!req.user.role || req.user.role !== SystemRoles.ADMIN) {- logger.debug(`[requireAdmin] Access denied for non-admin user: ${req.user.email}`);+ logger.debug(`[requireAdmin] Access denied for non-admin user: ${req.user.id}`);return res.status(403).json({error: 'Access denied: Admin privileges required',error_code: 'ADMIN_REQUIRED',