misc: moved authenticate to preValidation

backend/src/ee/routes/v1/oidc-router.ts

@@ -60,7 +60,8 @@ export const registerOidcRouter = async (server: FastifyZodProvider) => {
         callbackPort: z.string().trim().optional()
       })
     },
-    handler: async (req, res) => {
+    preValidation: [
+      async (req, res) => {
         const { orgSlug, callbackPort } = req.query;
 
         // ensure fresh session state per login attempt
@@ -73,31 +74,36 @@ export const registerOidcRouter = async (server: FastifyZodProvider) => {
         }
 
         const oidcStrategy = await server.services.oidc.getOrgAuthStrategy(orgSlug, callbackPort);
-      (
+        return (
           passport.authenticate(oidcStrategy as Strategy, {
             scope: "profile email openid"
           }) as any
         )(req, res);
       }
+    ],
+    handler: () => {}
   });
 
   // callback route after login from IDP
   server.route({
     url: "/callback",
     method: "GET",
-    handler: async (req, res) => {
+    preValidation: [
+      async (req, res) => {
         const oidcOrgSlug = req.session.get<any>("oidcOrgSlug");
         const callbackPort = req.session.get<any>("callbackPort");
         const oidcStrategy = await server.services.oidc.getOrgAuthStrategy(oidcOrgSlug, callbackPort);
 
-      await (
+        return (
           passport.authenticate(oidcStrategy as Strategy, {
             failureRedirect: "/api/v1/sso/oidc/login/error",
             session: false,
             failureMessage: true
           }) as any
         )(req, res);
-
+      }
+    ],
+    handler: async (req, res) => {
       await req.session.destroy();
 
       if (req.passportUser.isUserCompleted) {