Skip to content

feat: allow configuring OIDC email claim and OIDC auth url parameters #6867

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 7 commits into from
Mar 30, 2023
Merged

feat: allow configuring OIDC email claim and OIDC auth url parameters #6867

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bad9588
feat: allow customizing OAuth2 email claim name and auth url options
johnstcn Mar 29, 2023
8664b8e
chore: update unit test to ensure deployment config values are set
johnstcn Mar 29, 2023
779c8d2
chore: update docs
johnstcn Mar 29, 2023
2b32008
chore: add unit test to assert correct OIDC config
johnstcn Mar 29, 2023
01d7b13
fixup! chore: add unit test to assert correct OIDC config
johnstcn Mar 29, 2023
1684eb6
fixup! fixup! chore: add unit test to assert correct OIDC config
johnstcn Mar 29, 2023
998b0c0
fixup! chore: update docs
johnstcn Mar 29, 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
Prev Previous commit
Next Next commit
chore: update unit test to ensure deployment config values are set
  • Loading branch information
@johnstcn
johnstcn committed Mar 29, 2023
commit 8664b8e146ba66a32baabf80dd4fb8ba4ee35f6a
6 changes: 6 additions & 0 deletions coderd/deployment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ func TestDeploymentValues(t *testing.T) {
// values should not be returned
cfg.OAuth2.Github.ClientSecret.Set(hi)
cfg.OIDC.ClientSecret.Set(hi)
cfg.OIDC.AuthURLParams.Set(`{"foo":"bar"}`)
cfg.OIDC.EmailField.Set("some_random_field_you_never_expected")
cfg.PostgresURL.Set(hi)
cfg.SCIMAPIKey.Set(hi)

Expand All @@ -32,6 +34,10 @@ func TestDeploymentValues(t *testing.T) {
require.NoError(t, err)
// ensure normal values pass through
require.EqualValues(t, true, scrubbed.Values.BrowserOnly.Value())
require.NotEmpty(t, cfg.OIDC.AuthURLParams)
require.EqualValues(t, cfg.OIDC.AuthURLParams, scrubbed.Values.OIDC.AuthURLParams)
require.NotEmpty(t, cfg.OIDC.EmailField)
require.EqualValues(t, cfg.OIDC.EmailField, scrubbed.Values.OIDC.EmailField)
// ensure secrets are removed
require.Empty(t, scrubbed.Values.OAuth2.Github.ClientSecret.Value())
require.Empty(t, scrubbed.Values.OIDC.ClientSecret.Value())
Expand Down