From 8f74d20e74a575cfb0dbbc35bb8310ca1185ae63 Mon Sep 17 00:00:00 2001
From: Tuan Dang <dangtony98@gmail.com>
Date: Mon, 9 Oct 2023 08:31:13 +0100
Subject: [PATCH] Fix redirect to unknown org in login case when user is not
 part of any orgs

---
 frontend/src/views/Login/Login.tsx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/frontend/src/views/Login/Login.tsx b/frontend/src/views/Login/Login.tsx
index 03eb4498b..0db2e76b4 100644
--- a/frontend/src/views/Login/Login.tsx
+++ b/frontend/src/views/Login/Login.tsx
@@ -2,7 +2,6 @@ import { useEffect, useState } from "react";
 import { useRouter } from "next/router";
 import axios from "axios"
 
-import { fetchOrganizations } from "@app/hooks/api/organization/queries";
 import { fetchUserDetails } from "@app/hooks/api/users/queries";
 import { getAuthToken, isLoggedIn } from "@app/reactQuery";
 
@@ -11,6 +10,8 @@ import {
     MFAStep,
     SAMLSSOStep
 } from "./components";
+// import { navigateUserToOrg } from "../../Login.utils";
+import { navigateUserToOrg } from "./Login.utils";
 
 export const Login = () => {
     const router = useRouter();
@@ -24,10 +25,6 @@ export const Login = () => {
     // TODO(akhilmhdh): workspace will be controlled by a workspace context
     const redirectToDashboard = async () => {
       try {
-        const userOrgs = await fetchOrganizations();
-        // userWorkspace = userWorkspaces[0] && userWorkspaces[0]._id;
-        const userOrg = userOrgs[0] && userOrgs[0]._id;
-
         // user details
         const userDetails = await fetchUserDetails()
         // send details back to client
@@ -40,7 +37,8 @@ export const Login = () => {
           const instance = axios.create()
           await instance.post(cliUrl, { email: userDetails.email, privateKey: localStorage.getItem("PRIVATE_KEY"), JTWToken: getAuthToken() })
         }
-        router.push(`/org/${userOrg}/overview`);
+
+        await navigateUserToOrg(router);
       } catch (error) {
         console.log("Error - Not logged in yet");
       }