awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Skip org selection when user only has one org

Browse Source
This commit is contained in:
Daniel Hougaard
2024-08-22 08:14:03 +04:00
parent 9f6a6a7b7c
commit c8248ef4e9
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
frontend/src/pages/login/select-organization.tsx
View File

@@ -38,6 +38,7 @@ export default function LoginPage() {
const { user, isLoading: userLoading } = useUser(); const { user, isLoading: userLoading } = useUser();
const queryParams = new URLSearchParams(window.location.search); const queryParams = new URLSearchParams(window.location.search);
const callbackPort = queryParams.get("callback_port");
const logout = useLogoutUser(true); const logout = useLogoutUser(true);
const handleLogout = useCallback(async () => { const handleLogout = useCallback(async () => {
@@ -52,8 +53,6 @@ export default function LoginPage() {
const handleSelectOrganization = useCallback( const handleSelectOrganization = useCallback(
async (organization: Organization) => { async (organization: Organization) => {
const callbackPort = queryParams.get("callback_port");
if (organization.authEnforced) { if (organization.authEnforced) {
// org has an org-level auth method enabled (e.g. SAML) // org has an org-level auth method enabled (e.g. SAML)
// -> logout + redirect to SAML SSO // -> logout + redirect to SAML SSO
@@ -116,9 +115,8 @@ export default function LoginPage() {
[selectOrg] [selectOrg]
); );
useEffect(() => { const handleCliRedirect = useCallback(() => {
const authToken = getAuthToken(); const authToken = getAuthToken();
const callbackPort = queryParams.get("callback_port");
if (authToken && !callbackPort) { if (authToken && !callbackPort) {
const decodedJwt = jwt_decode(authToken) as any; const decodedJwt = jwt_decode(authToken) as any;
@@ -131,13 +129,27 @@ export default function LoginPage() {
if (!isLoggedIn()) { if (!isLoggedIn()) {
router.push("/login"); router.push("/login");
} }
}, []);
useEffect(() => {
if (callbackPort) {
handleCliRedirect();
}
}, [router]); }, [router]);
// Case: User has no organizations. // Case: User has no organizations.
// This can happen if the user was previously a member, but the organization was deleted or the user was removed. // This can happen if the user was previously a member, but the organization was deleted or the user was removed.
useEffect(() => { useEffect(() => {
if (!organizations.isLoading && organizations.data?.length === 0) { if (organizations.isLoading || !organizations.data) return;
if (organizations.data.length === 0) {
router.push("/org/none"); router.push("/org/none");
} else if (organizations.data.length === 1) {
if (callbackPort) {
handleCliRedirect();
} else {
handleSelectOrganization(organizations.data[0]);
}
} }
}, [organizations.isLoading, organizations.data]); }, [organizations.isLoading, organizations.data]);