Merge main; fix OAuth callback imports and Solid login config

Author: PreciousOritsedere

api/server/routes/config.js

@@ -62,10 +62,15 @@ router.get('/', async function (req, res) {
 
     const balanceConfig = getBalanceConfig(appConfig);
 
+    let socialLogins = appConfig?.registration?.socialLogins ?? defaultSocialLogins;
+    if (isSolidEnabled && !socialLogins.includes('solid')) {
+      socialLogins = [...socialLogins, 'solid'];
+    }
+
     /** @type {TStartupConfig} */
     const payload = {
       appTitle: process.env.APP_TITLE || 'LibreChat',
-      socialLogins: appConfig?.registration?.socialLogins ?? defaultSocialLogins,
+      socialLogins,
       discordLoginEnabled: !!process.env.DISCORD_CLIENT_ID && !!process.env.DISCORD_CLIENT_SECRET,
       facebookLoginEnabled:
         !!process.env.FACEBOOK_CLIENT_ID && !!process.env.FACEBOOK_CLIENT_SECRET,

api/server/routes/oauth.js

@@ -4,9 +4,11 @@ const passport = require('passport');
 const { randomState } = require('openid-client');
 const { logger } = require('@librechat/data-schemas');
 const { ErrorTypes } = require('librechat-data-provider');
-const { createSetBalanceConfig } = require('@librechat/api');
-const { checkDomainAllowed, loginLimiter, logHeaders } = require('~/server/middleware');
+const { createSetBalanceConfig, isEnabled } = require('@librechat/api');
+const { checkDomainAllowed, loginLimiter, logHeaders, checkBan } = require('~/server/middleware');
 const { createOAuthHandler } = require('~/server/controllers/auth/oauth');
+const { setAuthTokens, setOpenIDAuthTokens } = require('~/server/services/AuthService');
+const { syncUserEntraGroupMemberships } = require('~/server/services/PermissionService');
 const { getAppConfig } = require('~/server/services/Config');
 const { Balance } = require('~/db/models');
 

api/strategies/index.js

@@ -1,4 +1,5 @@
 const { setupOpenId, getOpenIdConfig } = require('./openidStrategy');
+const { setupSolidOpenId, getSolidOpenIdConfig } = require('./SolidOpenidStrategy');
 const openIdJwtLogin = require('./openIdJwtStrategy');
 const facebookLogin = require('./facebookStrategy');
 const discordLogin = require('./discordStrategy');