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

Updated "defaultOrgId" and "defaultOrgSlug" to "defaultAuthOrgId" and "defaultAuthOrgSlug"

Browse Source
This commit is contained in:
Daniel Hougaard
2024-06-20 18:53:07 +02:00
parent 91bdd7ea6a
commit 2d98560255
11 changed files with 33 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/hooks/api/admin/types.ts
View File

@@ -7,8 +7,8 @@ export type TServerConfig = {
trustLdapEmails: boolean;
trustOidcEmails: boolean;
isSecretScanningDisabled: boolean;
defaultOrgSlug: string | null;
defaultOrgId: string | null;
defaultAuthOrgSlug: string | null;
defaultAuthOrgId: string | null;
};
export type TCreateAdminUserDTO = {

6
frontend/src/views/Login/Login.utils.tsx
View File

@@ -35,12 +35,12 @@ export const useNavigateToSelectOrganization = () => {
const router = useRouter();
const navigate = async (cliCallbackPort?: string) => {
if (config.defaultOrgId) {
if (config.defaultAuthOrgId) {
await selectOrganization.mutateAsync({
organizationId: config.defaultOrgId
organizationId: config.defaultAuthOrgId
});
await navigateUserToOrg(router, config.defaultOrgId);
await navigateUserToOrg(router, config.defaultAuthOrgId);
}
queryClient.invalidateQueries(userKeys.getUser);

4
frontend/src/views/Login/LoginLDAP.tsx
View File

@@ -15,7 +15,7 @@ export const LoginLDAP = () => {
const passedUsername = queryParams.get("username");
const [organizationSlug, setOrganizationSlug] = useState(
config.defaultOrgSlug || passedOrgSlug || ""
config.defaultAuthOrgSlug || passedOrgSlug || ""
);
const [username, setUsername] = useState(passedUsername || "");
const [password, setPassword] = useState("");
@@ -67,7 +67,7 @@ export const LoginLDAP = () => {
What's your LDAP Login?
</p>
<form onSubmit={handleSubmission}>
{!config.defaultOrgSlug && !passedOrgSlug && (
{!config.defaultAuthOrgSlug && !passedOrgSlug && (
<div className="relative mx-auto flex max-h-24 w-1/4 w-full min-w-[20rem] items-center justify-center rounded-lg md:max-h-28 md:min-w-[22rem] lg:w-1/6">
<div className="flex max-h-24 w-full items-center justify-center rounded-lg md:max-h-28">
<Input

4
frontend/src/views/Login/components/InitialStep/InitialStep.tsx
View File

@@ -54,8 +54,8 @@ export const InitialStep = ({ setStep, email, setEmail, password, setPassword }:
}, [serverDetails?.samlDefaultOrgSlug]);
const handleSaml = useCallback((step: number) => {
if (config.defaultOrgSlug) {
redirectToSaml(config.defaultOrgSlug);
if (config.defaultAuthOrgSlug) {
redirectToSaml(config.defaultAuthOrgSlug);
} else {
setStep(step);
}

3
frontend/src/views/admin/DashboardPage/DashboardPage.tsx
View File

@@ -41,7 +41,6 @@ const formSchema = z.object({
trustSamlEmails: z.boolean(),
trustLdapEmails: z.boolean(),
trustOidcEmails: z.boolean(),
defaultOrgSlug: z.string().optional().nullable(),
defaultAuthOrgSlug: z.string().optional().nullable()
});
@@ -65,7 +64,6 @@ export const AdminDashboardPage = () => {
trustSamlEmails: config.trustSamlEmails,
trustLdapEmails: config.trustLdapEmails,
trustOidcEmails: config.trustOidcEmails,
defaultOrgSlug: config.defaultOrgSlug,
defaultAuthOrgSlug: config.defaultAuthOrgSlug
}
});
@@ -96,7 +94,6 @@ export const AdminDashboardPage = () => {
trustSamlEmails,
trustLdapEmails,
trustOidcEmails,
defaultOrgSlug,
defaultAuthOrgSlug
} = formData;