NotificationsYou must be signed in to change notification settings
Fork1.1k
Star11.4k

Commit847058c

authored

fix: set default values forRevokeURL property in external auth configs (#20270)

This PR adds logic that sets default values for `RevokeURL` in externalauth configs.

1 parent5ab72cc commit847058cCopy full SHA for 847058c

File tree

2 files changed

-0

lines changed

coderd/externalauth
- externalauth.go
- externalauth_internal_test.go

2 files changed

-0

lines changed

`‎coderd/externalauth/externalauth.go‎`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -814,6 +814,9 @@ func copyDefaultSettings(config *codersdk.ExternalAuthConfig, defaults codersdk.`
`814`	`814`	`ifconfig.ValidateURL=="" {`
`815`	`815`	`config.ValidateURL=defaults.ValidateURL`
`816`	`816`	`}`
	`817`	`+ifconfig.RevokeURL=="" {`
	`818`	`+config.RevokeURL=defaults.RevokeURL`
	`819`	`+}`
`817`	`820`	`ifconfig.AppInstallURL=="" {`
`818`	`821`	`config.AppInstallURL=defaults.AppInstallURL`
`819`	`822`	`}`

`‎coderd/externalauth/externalauth_internal_test.go‎`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ func TestGitlabDefaults(t *testing.T) {`
`19`	`19`	`AuthURL:"https://gitlab.com/oauth/authorize",`
`20`	`20`	`TokenURL:"https://gitlab.com/oauth/token",`
`21`	`21`	`ValidateURL:"https://gitlab.com/oauth/token/info",`
	`22`	`+RevokeURL:"https://gitlab.com/oauth/revoke",`
`22`	`23`	`DisplayName:"GitLab",`
`23`	`24`	`DisplayIcon:"/icon/gitlab.svg",`
`24`	`25`	Regex:`^(https?://)?gitlab\.com(/.*)?$`,
`@@ -79,6 +80,7 @@ func TestGitlabDefaults(t *testing.T) {`
`79`	`80`	`config.AuthURL="https://gitlab.company.org/oauth/authorize?foo=bar"`
`80`	`81`	`config.ValidateURL="https://gitlab.company.org/oauth/token/info"`
`81`	`82`	`config.TokenURL="https://gitlab.company.org/oauth/token"`
	`83`	`+config.RevokeURL="https://gitlab.company.org/oauth/revoke"`
`82`	`84`	config.Regex=`^(https?://)?gitlab\.company\.org(/.*)?$`
`83`	`85`	`},`
`84`	`86`	`},`
`@@ -90,13 +92,15 @@ func TestGitlabDefaults(t *testing.T) {`
`90`	`92`	`AuthURL:"https://auth.com/auth",`
`91`	`93`	`ValidateURL:"https://validate.com/validate",`
`92`	`94`	`TokenURL:"https://token.com/token",`
	`95`	`+RevokeURL:"https://token.com/revoke",`
`93`	`96`	`Regex:"random",`
`94`	`97`	`},`
`95`	`98`	`expected:cloud,`
`96`	`99`	`mutateExpected:func(config*codersdk.ExternalAuthConfig) {`
`97`	`100`	`config.AuthURL="https://auth.com/auth"`
`98`	`101`	`config.ValidateURL="https://validate.com/validate"`
`99`	`102`	`config.TokenURL="https://token.com/token"`
	`103`	`+config.RevokeURL="https://token.com/revoke"`
`100`	`104`	config.Regex=`random`
`101`	`105`	`},`
`102`	`106`	`},`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit847058c

File tree

2 files changed

2 files changed

`‎coderd/externalauth/externalauth.go‎`

`‎coderd/externalauth/externalauth_internal_test.go‎`

0 commit comments