Select organization checkpoint

frontend/src/pages/auth/SelectOrgPage/route.tsx

@@ -7,7 +7,8 @@ import { SelectOrganizationPage } from "./SelectOrgPage";
 export const SelectOrganizationPageQueryParams = z.object({
   org_id: z.string().optional().catch(""),
   callback_port: z.coerce.number().optional().catch(undefined),
-  is_admin_login: z.boolean().optional().catch(false)
+  is_admin_login: z.boolean().optional().catch(false),
+  force: z.boolean().optional()
 });
 
 export const Route = createFileRoute("/_restrict-login-signup/login/select-organization")({

frontend/src/pages/auth/SignUpInvitePage/SignUpInvitePage.tsx

@@ -243,7 +243,7 @@ export const SignupInvitePage = () => {
                   SecurityClient.setSignupToken(response.token);
                   setStep(2);
                 } else {
-                  navigate({ to: "/login" });
+                  navigate({ to: "/login/select-organization", search: { force: true } });
 
                   // TODO: Redirect user to the newly joined org. The commented code does not work due to auth issues.
                   // const redirectExistingUser = async () => {