Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-02-23 00:22:19 +01:00
Code Issues Projects Releases Wiki Activity

fix: disable SCIM for OIDC, nothing to test it on (#6937)

Browse Source 
disable SCIM for OIDC, nothing to test it on
Also checks scim enabled before saving
This commit is contained in:
David Leek 2024-04-29 13:14:39 +02:00 committed by GitHub
parent b6865a5a9d
commit c048156e19
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
frontend/src/component/admin/auth/OidcAuth/OidcAuth.tsx
View File

@ -21,10 +21,6 @@ import { formatUnknownError } from 'utils/formatUnknownError';
import { removeEmptyStringFields } from 'utils/removeEmptyStringFields';
import { SsoGroupSettings } from '../SsoGroupSettings';
import type { IRole } from 'interfaces/role';
import { useUiFlag } from 'hooks/useUiFlag';
import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender';
import { useScim } from 'hooks/useScim';
import { ScimConfigSettings } from '../ScimSettings/ScimSettings';
const initialState = {
enabled: false,
@ -89,22 +85,6 @@ export const OidcAuth = () => {
});
};
const {
settings,
enabled,
setEnabled,
assumeControlOfExisting,
setAssumeControlOfExisting,
newToken,
tokenGenerationDialog,
setTokenGenerationDialog,
tokenDialog,
setTokenDialog,
loading: scimLoading,
saveScimSettings,
onGenerateNewTokenConfirm,
} = useScim();
const onSubmit = async (event: React.SyntheticEvent) => {
event.preventDefault();
@ -114,14 +94,11 @@ export const OidcAuth = () => {
title: 'Settings stored',
type: 'success',
});
saveScimSettings();
} catch (error: unknown) {
setToastApiError(formatUnknownError(error));
}
};
const scimEnabled = useUiFlag('scimApi');
return (
<>
<Grid container sx={{ mb: 3 }}>
@ -279,31 +256,6 @@ export const OidcAuth = () => {
setValue={setValue}
/>
<ConditionallyRender
condition={scimEnabled}
show={
<ScimConfigSettings
disabled={!data.enabled}
settings={settings}
enabled={enabled}
setEnabled={setEnabled}
assumeControlOfExisting={assumeControlOfExisting}
setAssumeControlOfExisting={
setAssumeControlOfExisting
}
newToken={newToken}
tokenGenerationDialog={tokenGenerationDialog}
setTokenGenerationDialog={setTokenGenerationDialog}
tokenDialog={tokenDialog}
setTokenDialog={setTokenDialog}
loading={scimLoading}
onGenerateNewTokenConfirm={
onGenerateNewTokenConfirm
}
/>
}
/>
<AutoCreateForm
data={data}
setValue={setValue}

8
frontend/src/component/admin/auth/SamlAuth/SamlAuth.tsx
View File

@ -80,6 +80,8 @@ export const SamlAuth = () => {
});
};
const scimEnabled = useUiFlag('scimApi');
const {
settings,
enabled,
@ -105,14 +107,14 @@ export const SamlAuth = () => {
title: 'Settings stored',
type: 'success',
});
saveScimSettings();
if (scimEnabled) {
saveScimSettings();
}
} catch (error: unknown) {
setToastApiError(formatUnknownError(error));
}
};
const scimEnabled = useUiFlag('scimApi');
return (
<>
<Grid container sx={{ mb: 3 }}>