From 660a37edd0e147525c17ceba22113599a91f573f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89mile=20R=C3=A9?= <emile@getprobo.com>
Date: Tue, 10 Feb 2026 15:23:12 +0400
Subject: [PATCH] Pass organizationId to password login page to sign in and
 assume at the same time when possible
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Émile Ré <emile@getprobo.com>
---
 apps/console/src/hooks/iam/useAssume.ts                    | 4 +++-
 .../src/pages/iam/auth/sign-in/PasswordSignInPage.tsx      | 7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/apps/console/src/hooks/iam/useAssume.ts b/apps/console/src/hooks/iam/useAssume.ts
index 89c737644..b9d8fa3b4 100644
--- a/apps/console/src/hooks/iam/useAssume.ts
+++ b/apps/console/src/hooks/iam/useAssume.ts
@@ -65,10 +65,12 @@ export function useAssume(params: UseAssumeParameters) {
         }
 
         const { result } = assumeOrganizationSession;
+        const search = new URLSearchParams();
 
         switch (result.__typename) {
           case "PasswordRequired":
-            void navigate("/auth/login");
+            search.set("organizationId", organizationId);
+            void navigate({ pathname: "/auth/passord-login", search: "?" + search.toString() });
             break;
           case "SAMLAuthenticationRequired":
             window.location.href = result.redirectUrl;
diff --git a/apps/console/src/pages/iam/auth/sign-in/PasswordSignInPage.tsx b/apps/console/src/pages/iam/auth/sign-in/PasswordSignInPage.tsx
index f17368ee0..aca2b92f7 100644
--- a/apps/console/src/pages/iam/auth/sign-in/PasswordSignInPage.tsx
+++ b/apps/console/src/pages/iam/auth/sign-in/PasswordSignInPage.tsx
@@ -3,7 +3,7 @@ import { useTranslate } from "@probo/i18n";
 import { Button, Field, IconChevronLeft, useToast } from "@probo/ui";
 import type { FormEventHandler } from "react";
 import { useMutation } from "react-relay";
-import { Link } from "react-router";
+import { Link, useSearchParams } from "react-router";
 import { graphql } from "relay-runtime";
 
 import type { PasswordSignInPageMutation } from "#/__generated__/iam/PasswordSignInPageMutation.graphql";
@@ -19,8 +19,9 @@ const signInMutation = graphql`
 `;
 
 export default function PasswordSignInPage() {
-  const { __ } = useTranslate();
+  const [searchParams] = useSearchParams();
 
+  const { __ } = useTranslate();
   const { toast } = useToast();
 
   const [signIn, isSigningIn]
@@ -39,6 +40,8 @@ export default function PasswordSignInPage() {
         input: {
           email: emailValue,
           password: passwordValue,
+          // Assume when signing in
+          organizationId: searchParams.get("organizationId"),
         },
       },
       onCompleted: (_, error) => {