Skip to content

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

⚙️ refactor: Only register OpenID Strategy if Config Succeeded (#9094)

Danny Avila8bcdc041b285
diff --git a/api/server/socialLogins.js b/api/server/socialLogins.js
index 938d97e042..0a89313ba9 100644
--- a/api/server/socialLogins.js
+++ b/api/server/socialLogins.js
@@ -1,19 +1,48 @@
const passport = require('passport');
const session = require('express-session');
+const { isEnabled } = require('@librechat/api');
+const { logger } = require('@librechat/data-schemas');
+const { CacheKeys } = require('librechat-data-provider');
const {
+ openIdJwtLogin,
+ facebookLogin,
+ discordLogin,
setupOpenId,
googleLogin,
githubLogin,
- discordLogin,
- facebookLogin,
appleLogin,
setupSaml,
- openIdJwtLogin,
} = require('~/strategies');
-const { isEnabled } = require('~/server/utils');
-const { logger } = require('~/config');
const { getLogStores } = require('~/cache');
-const { CacheKeys } = require('librechat-data-provider');
+
+/**
+ * Configures OpenID Connect for the application.
+ * @param {Express.Application} app - The Express application instance.
+ * @returns {Promise<void>}
+ */
+async function configureOpenId(app) {
+ logger.info('Configuring OpenID Connect...');
+ const sessionOptions = {
+ secret: process.env.OPENID_SESSION_SECRET,
+ resave: false,
+ saveUninitialized: false,
+ store: getLogStores(CacheKeys.OPENID_SESSION),
+ };
+ app.use(session(sessionOptions));
+ app.use(passport.session());
+
+ const config = await setupOpenId();
+ if (!config) {
+ logger.error('OpenID Connect configuration failed - strategy not registered.');
+ return;
+ }
+
+ if (isEnabled(process.env.OPENID_REUSE_TOKENS)) {
+ logger.info('OpenID token reuse is enabled.');
+ passport.use('openidJwt', openIdJwtLogin(config));
+ }
+ logger.info('OpenID Connect configured successfully.');
+}
/**
*
@@ -44,21 +73,7 @@ const configureSocialLogins = async (app) => {
process.env.OPENID_SCOPE &&
process.env.OPENID_SESSION_SECRET
) {
- logger.info('Configuring OpenID Connect...');
- const sessionOptions = {
- secret: process.env.OPENID_SESSION_SECRET,
- resave: false,
- saveUninitialized: false,
- store: getLogStores(CacheKeys.OPENID_SESSION),
- };
- app.use(session(sessionOptions));
- app.use(passport.session());
- const config = await setupOpenId();
- if (isEnabled(process.env.OPENID_REUSE_TOKENS)) {
- logger.info('OpenID token reuse is enabled.');
- passport.use('openidJwt', openIdJwtLogin(config));
- }
- logger.info('OpenID Connect configured.');
+ await configureOpenId(app);
}
if (
process.env.SAML_ENTRY_POINT &&