awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-10 13:28:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Rebase fixes

Browse Source
This commit is contained in:
Daniel Hougaard
2024-03-17 18:49:29 +01:00
parent c3a56f469a
commit 926f719967
2 changed files with 30 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/services/org/org-service.ts
+1
View File
@@ -33,6 +33,7 @@ import { TOrgRoleDALFactory } from "./org-role-dal";
import { import {
TDeleteOrgMembershipDTO, TDeleteOrgMembershipDTO,
TFindAllWorkspacesDTO, TFindAllWorkspacesDTO,
TFindOrgMembersByEmailDTO,
TInviteUserToOrgDTO, TInviteUserToOrgDTO,
TUpdateOrgDTO, TUpdateOrgDTO,
TUpdateOrgMembershipDTO, TUpdateOrgMembershipDTO,
frontend/src/views/Login/Login.tsx
+29 -38
View File
@@ -5,12 +5,8 @@ import axios from "axios";
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";
import { import { InitialStep, LDAPStep, MFAStep, SAMLSSOStep } from "./components";
InitialStep, import { navigateUserToSelectOrg } from "./Login.utils";
LDAPStep,
MFAStep,
SAMLSSOStep} from "./components";
import { navigateUserToOrg } from "./Login.utils";
export const Login = () => { export const Login = () => {
const router = useRouter(); const router = useRouter();
@@ -52,38 +48,33 @@ export const Login = () => {
} }
}, []); }, []);
const renderView = () => { const renderView = () => {
switch (step) { switch (step) {
case 0: case 0:
return ( return (
<InitialStep <InitialStep
setStep={setStep} setStep={setStep}
email={email} email={email}
setEmail={setEmail} setEmail={setEmail}
password={password} password={password}
setPassword={setPassword} setPassword={setPassword}
/> />
); );
case 1: case 1:
return ( return (
<MFAStep <MFAStep
email={email} email={email}
password={password} password={password}
providerAuthToken={undefined} providerAuthToken={undefined}
callbackPort={queryParams.get("callback_port")} callbackPort={queryParams.get("callback_port")}
/> />
); );
case 2: case 2:
return ( return <SAMLSSOStep setStep={setStep} />;
<SAMLSSOStep setStep={setStep} /> case 3:
); return <LDAPStep setStep={setStep} />;
case 3: default:
return ( return <div />;
<LDAPStep setStep={setStep} />
);
default:
return <div />;
}
} }
}; };