synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-03 16:13:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: apply default ExtraTokenKeys to oauth (#10155)

Browse Source
This commit is contained in:
Kyle Carberry
2023-10-09 22:11:05 -05:00
committed by GitHub
parent 863c2e7b64
commit a61f8ee45c
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coderd/externalauth/externalauth.go
View File

@ -469,6 +469,7 @@ func ConvertConfig(entries []codersdk.ExternalAuthConfig, accessURL *url.URL) ([
AppInstallURL: entry.AppInstallURL,
DisplayName: entry.DisplayName,
DisplayIcon: entry.DisplayIcon,
ExtraTokenKeys: entry.ExtraTokenKeys,
}
if entry.DeviceFlow {
@ -521,6 +522,9 @@ func applyDefaultsToConfig(config *codersdk.ExternalAuthConfig) {
if config.DisplayIcon == "" {
config.DisplayIcon = defaults.DisplayIcon
}
if config.ExtraTokenKeys == nil || len(config.ExtraTokenKeys) == 0 {
config.ExtraTokenKeys = defaults.ExtraTokenKeys
}
// Apply defaults if it's still empty...
if config.ID == "" {