mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-06 15:27:27 +00:00
Fix redirect to unknown org in login case when user is not part of any orgs
This commit is contained in:
@@ -2,7 +2,6 @@ import { useEffect, useState } from "react";
|
|||||||
import { useRouter } from "next/router";
|
import { useRouter } from "next/router";
|
||||||
import axios from "axios"
|
import axios from "axios"
|
||||||
|
|
||||||
import { fetchOrganizations } from "@app/hooks/api/organization/queries";
|
|
||||||
import { fetchUserDetails } from "@app/hooks/api/users/queries";
|
import { fetchUserDetails } from "@app/hooks/api/users/queries";
|
||||||
import { getAuthToken, isLoggedIn } from "@app/reactQuery";
|
import { getAuthToken, isLoggedIn } from "@app/reactQuery";
|
||||||
|
|
||||||
@@ -11,6 +10,8 @@ import {
|
|||||||
MFAStep,
|
MFAStep,
|
||||||
SAMLSSOStep
|
SAMLSSOStep
|
||||||
} from "./components";
|
} from "./components";
|
||||||
|
// import { navigateUserToOrg } from "../../Login.utils";
|
||||||
|
import { navigateUserToOrg } from "./Login.utils";
|
||||||
|
|
||||||
export const Login = () => {
|
export const Login = () => {
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
@@ -24,10 +25,6 @@ export const Login = () => {
|
|||||||
// TODO(akhilmhdh): workspace will be controlled by a workspace context
|
// TODO(akhilmhdh): workspace will be controlled by a workspace context
|
||||||
const redirectToDashboard = async () => {
|
const redirectToDashboard = async () => {
|
||||||
try {
|
try {
|
||||||
const userOrgs = await fetchOrganizations();
|
|
||||||
// userWorkspace = userWorkspaces[0] && userWorkspaces[0]._id;
|
|
||||||
const userOrg = userOrgs[0] && userOrgs[0]._id;
|
|
||||||
|
|
||||||
// user details
|
// user details
|
||||||
const userDetails = await fetchUserDetails()
|
const userDetails = await fetchUserDetails()
|
||||||
// send details back to client
|
// send details back to client
|
||||||
@@ -40,7 +37,8 @@ export const Login = () => {
|
|||||||
const instance = axios.create()
|
const instance = axios.create()
|
||||||
await instance.post(cliUrl, { email: userDetails.email, privateKey: localStorage.getItem("PRIVATE_KEY"), JTWToken: getAuthToken() })
|
await instance.post(cliUrl, { email: userDetails.email, privateKey: localStorage.getItem("PRIVATE_KEY"), JTWToken: getAuthToken() })
|
||||||
}
|
}
|
||||||
router.push(`/org/${userOrg}/overview`);
|
|
||||||
|
await navigateUserToOrg(router);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log("Error - Not logged in yet");
|
console.log("Error - Not logged in yet");
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user