authrequest param for /login

apps/login/src/app/(login)/otp/[method]/set/page.tsx

@@ -69,9 +69,6 @@ export default async function Page({
   if (sessionId) {
     paramsToContinue.append("sessionId", sessionId);
   }
-  if (authRequestId) {
-    paramsToContinue.append("authRequestId", authRequestId);
-  }
   if (loginName) {
     paramsToContinue.append("loginName", loginName);
   }
@@ -80,14 +77,23 @@ export default async function Page({
   }
 
   if (checkAfter) {
+    if (authRequestId) {
+      paramsToContinue.append("authRequestId", authRequestId);
+    }
     urlToContinue = `/otp/${method}?` + paramsToContinue;
     // immediately check the OTP on the next page if sms or email was set up
     if (["email", "sms"].includes(method)) {
       return redirect(urlToContinue);
     }
   } else if (authRequestId && sessionId) {
+    if (authRequestId) {
+      paramsToContinue.append("authRequest", authRequestId);
+    }
     urlToContinue = `/login?` + paramsToContinue;
   } else if (loginName) {
+    if (authRequestId) {
+      paramsToContinue.append("authRequestId", authRequestId);
+    }
     urlToContinue = `/signedin?` + paramsToContinue;
   }
 

apps/login/src/ui/LoginOTP.tsx

@@ -158,6 +158,14 @@ export default function LoginOTP({
           params.append("organization", organization);
         }
 
+        if (authRequestId) {
+          params.append("authRequest", authRequestId);
+        }
+
+        if (sessionId) {
+          params.append("sessionId", sessionId);
+        }
+
         return router.push(`/login?` + params);
       } else {
         const params = new URLSearchParams();

apps/login/src/ui/RegisterU2F.tsx

@@ -150,9 +150,7 @@ export default function RegisterU2F({
       if (sessionId) {
         paramsToContinue.append("sessionId", sessionId);
       }
-      if (authRequestId) {
-        paramsToContinue.append("authRequestId", authRequestId);
-      }
+
       if (loginName) {
         paramsToContinue.append("loginName", loginName);
       }
@@ -161,10 +159,19 @@ export default function RegisterU2F({
       }
 
       if (checkAfter) {
+        if (authRequestId) {
+          paramsToContinue.append("authRequestId", authRequestId);
+        }
         urlToContinue = `/u2f?` + paramsToContinue;
       } else if (authRequestId && sessionId) {
+        if (authRequestId) {
+          paramsToContinue.append("authRequest", authRequestId);
+        }
         urlToContinue = `/login?` + paramsToContinue;
       } else if (loginName) {
+        if (authRequestId) {
+          paramsToContinue.append("authRequestId", authRequestId);
+        }
         urlToContinue = `/signedin?` + paramsToContinue;
       }
 

apps/login/src/ui/SetPasswordForm.tsx

@@ -88,9 +88,6 @@ export default function SetPasswordForm({
     if (userResponse.factors?.user?.loginName) {
       params.append("loginName", userResponse.factors.user.loginName);
     }
-    if (authRequestId) {
-      params.append("authRequestId", authRequestId);
-    }
     if (organization) {
       params.append("organization", organization);
     }
@@ -102,8 +99,14 @@ export default function SetPasswordForm({
     // return router.push(`/verify?` + params);
 
     if (authRequestId && userResponse.sessionId) {
+      if (authRequestId) {
+        params.append("authRequest", authRequestId);
+      }
       return router.push(`/login?` + params);
     } else {
+      if (authRequestId) {
+        params.append("authRequestId", authRequestId);
+      }
       return router.push(`/signedin?` + params);
     }
   }