Skip to content

fix: hide OIDC and Github auth settings when they are disabled #9447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 30, 2023
Merged

fix: hide OIDC and Github auth settings when they are disabled #9447

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8e4e66
fix: hide OIDC and Github auth settings when they are disabled
aslilac Aug 30, 2023
d37e6cf
🧼
aslilac Aug 30, 2023
bbd1341
tweak security settings too
aslilac Aug 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix: hide OIDC and Github auth settings when they are disabled
  • Loading branch information
@aslilac
aslilac committed Aug 30, 2023
commit f8e4e667d5a8237b280d408230cb6821ec51e4a5
2 changes: 1 addition & 1 deletion site/src/components/DeploySettingsLayout/OptionsTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const OptionsTable: FC<{
const styles = useStyles()

if (options.length === 0) {
return <DisabledBadge></DisabledBadge>
return <p>No options to configure</p>
}

return (
Expand Down
93 changes: 48 additions & 45 deletions site/src/pages/DeploySettingsPage/UserAuthSettingsPage/UserAuthSettingsPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,56 +19,59 @@ export type UserAuthSettingsPageViewProps = {

export const UserAuthSettingsPageView = ({
options,
}: UserAuthSettingsPageViewProps): JSX.Element => (
<>
<Stack direction="column" spacing={6}>
<div>
<Header title="User Authentication" />
}: UserAuthSettingsPageViewProps): JSX.Element => {
const oidcEnabled = Boolean(
useDeploymentOptions(options, "OIDC Client ID")[0].value,
)
const githubEnabled = Boolean(
useDeploymentOptions(options, "OAuth2 GitHub Client ID")[0].value,
)

<Header
title="Login with OpenID Connect"
secondary
description="Set up authentication to login with OpenID Connect."
docsHref={docs("/admin/auth#openid-connect-with-google")}
/>
return (
<>
<Stack direction="column" spacing={6}>
<div>
<Header title="User Authentication" />

<Badges>
{useDeploymentOptions(options, "OIDC Client ID")[0].value ? (
<EnabledBadge />
) : (
<DisabledBadge />
)}
</Badges>
<Header
title="Login with OpenID Connect"
secondary
description="Set up authentication to login with OpenID Connect."
docsHref={docs("/admin/auth#openid-connect-with-google")}
/>

<Badges>{oidcEnabled ? <EnabledBadge /> : <DisabledBadge />}</Badges>

<OptionsTable
options={options.filter((o) =>
deploymentGroupHasParent(o.group, "OIDC"),
{oidcEnabled && (
<OptionsTable
options={options.filter((o) =>
deploymentGroupHasParent(o.group, "OIDC"),
)}
/>
)}
/>
</div>
</div>

<div>
<Header
title="Login with GitHub"
secondary
description="Set up authentication to login with GitHub."
docsHref={docs("/admin/auth#github")}
/>
<div>
<Header
title="Login with GitHub"
secondary
description="Set up authentication to login with GitHub."
docsHref={docs("/admin/auth#github")}
/>

<Badges>
{useDeploymentOptions(options, "OAuth2 GitHub Client ID")[0].value ? (
<EnabledBadge />
) : (
<DisabledBadge />
)}
</Badges>
<Badges>
{githubEnabled ? <EnabledBadge /> : <DisabledBadge />}
</Badges>

<OptionsTable
options={options.filter((o) =>
deploymentGroupHasParent(o.group, "GitHub"),
{githubEnabled && (
<OptionsTable
options={options.filter((o) =>
deploymentGroupHasParent(o.group, "GitHub"),
)}
/>
)}
/>
</div>
</Stack>
</>
)
</div>
</Stack>
</>
)
}