fixing merge conflict errors

Author: PreciousOritsedere

api/server/controllers/AuthController.js

@@ -78,17 +78,13 @@ const refreshController = async (req, res) => {
       logger.warn(
         '[refreshController] No OpenID refresh token available, falling back to standard refresh',
       );
-      // Fall through to standard refresh logic below
-    } else {
-      // We have a refresh token, use OpenID refresh flow
-      try {
+      return res.status(200).send('Refresh token not provided');
+    }
+
+    // We have a refresh token, use OpenID refresh flow
+    try {
         const openIdConfig = getOpenIdConfig();
-        const refreshParams = process.env.OPENID_SCOPE ? { scope: process.env.OPENID_SCOPE } : {};
-      const tokenset = await openIdClient.refreshTokenGrant(
-        openIdConfig,
-        refreshToken,
-        refreshParams,
-      );
+        const tokenset = await openIdClient.refreshTokenGrant(openIdConfig, refreshToken);
         const claims = tokenset.claims();
         const { user, error, migration } = await findOpenIDUser({
           findUser,
@@ -132,10 +128,8 @@ const refreshController = async (req, res) => {
         };
 
         return res.status(200).send({ token, user });
-      } catch (error) {
-        logger.error('[refreshController] OpenID token refresh error', error);
-        // Fall through to standard refresh logic as fallback
-      }
+    } catch (error) {
+      logger.error('[refreshController] OpenID token refresh error', error);
     }
   }
 

api/server/socialLogins.js

@@ -16,36 +16,6 @@ const {
 } = require('~/strategies');
 const { getLogStores } = require('~/cache');
 
-
-/**
- * Configures Solid OpenID Connect for the application.
- * @param {Express.Application} app - The Express application instance.
- * @returns {Promise<void>}
- */
-async function configureSolidOpenId(app) {
-  logger.info('Configuring Solid OpenID Connect...');
-  const sessionOptions = {
-    secret: process.env.SOLID_OPENID_SESSION_SECRET,
-    resave: false,
-    saveUninitialized: false,
-    store: getLogStores(CacheKeys.OPENID_SESSION),
-  };
-  app.use(session(sessionOptions));
-  app.use(passport.session());
-
-  const config = await setupSolidOpenId();
-  if (!config) {
-    logger.error('Solid OpenID Connect configuration failed - strategy not registered.');
-    return;
-  }
-
-  if (isEnabled(process.env.OPENID_REUSE_TOKENS)) {
-    logger.info('Solid OpenID token reuse is enabled.');
-    passport.use('solidJwt', openIdJwtLogin(config));
-  }
-  logger.info('Solid OpenID Connect configured successfully.');
-}
-
 /**
 * Configures Solid OpenID Connect for the application.
  * @param {Express.Application} app - The Express application instance.