public_git/oauth2-proxy
1
0
Fork 0
mirror of https://github.com/oauth2-proxy/oauth2-proxy.git synced 2026-10-18 22:41:04 +02:00
Code Issues Projects Releases Wiki Activity

fix: added conditional so default is not always set and env vars are honored #3303 (#3304)

Browse Source 
Signed-off-by: Drew Foehn <drew@pixelburn.net>
This commit is contained in:
Drew Foehn
2026-01-14 22:18:52 +01:00
committed by GitHub
parent a8e208430e
commit 3c37312f3c
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+1
View File
@@ -10,6 +10,7 @@
- [#3197](https://github.com/oauth2-proxy/oauth2-proxy/pull/3197) fix: NewRemoteKeySet is not using DefaultHTTPClient (@rsrdesarrollo / @tuunit)
- [#3292](https://github.com/oauth2-proxy/oauth2-proxy/pull/3292) chore(deps): upgrade gomod and bump to golang v1.25.5 (@tuunit)
- [#3304](https://github.com/oauth2-proxy/oauth2-proxy/pull/3304) fix: added conditional so default is not always set and env vars are honored fixes 3303 (@pixeldrew)
# V7.13.0
pkg/apis/options/providers.go
+3 -1
View File
@@ -416,7 +416,9 @@ func (a *ADFSOptions) EnsureDefaults() {
// EnsureDefaults sets any default values for GoogleOptions fields.
func (g *GoogleOptions) EnsureDefaults() {
g.UseOrganizationID = ptr.To(DefaultGoogleUseOrganizationID)
if g.UseOrganizationID == nil {
g.UseOrganizationID = ptr.To(DefaultGoogleUseOrganizationID)
}
if g.UseApplicationDefaultCredentials == nil {
g.UseApplicationDefaultCredentials = ptr.To(DefaultUseApplicationDefaultCredentials)