towk/opaal
1
0
Fork 0
mirror of https://github.com/davidallendj/opaal.git synced 2025-12-20 03:27:02 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed IDP endpoint overrides not working correctly

Browse source
This commit is contained in:
David J. Allen 2024-04-30 11:32:28 -06:00
parent 67683e9fca
commit e940dc2dd9
No known key found for this signature in database
GPG key ID: 717C593FF60A2ACC
5 changed files with 29 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

19
internal/oidc/oidc.go
View file

@ -171,18 +171,19 @@ func (p *IdentityProvider) UpdateEndpoints(other *IdentityProvider) {
func UpdateEndpoints(eps *Endpoints, other *Endpoints) {
// only update endpoints that are not empty
var UpdateIf = func(ep *string, s string) {
var UpdateIfEmpty = func(ep *string, s string) {
if ep != nil {
if *ep != "" {
if *ep == "" {
*ep = s
fmt.Printf("updated %s\n", s)
}
}
}
UpdateIf(&eps.Config, other.Config)
UpdateIf(&eps.Authorization, other.Authorization)
UpdateIf(&eps.Token, other.Token)
UpdateIf(&eps.Revocation, other.Revocation)
UpdateIf(&eps.Introspection, other.Introspection)
UpdateIf(&eps.UserInfo, other.UserInfo)
UpdateIf(&eps.JwksUri, other.JwksUri)
UpdateIfEmpty(&eps.Config, other.Config)
UpdateIfEmpty(&eps.Authorization, other.Authorization)
UpdateIfEmpty(&eps.Token, other.Token)
UpdateIfEmpty(&eps.Revocation, other.Revocation)
UpdateIfEmpty(&eps.Introspection, other.Introspection)
UpdateIfEmpty(&eps.UserInfo, other.UserInfo)
UpdateIfEmpty(&eps.JwksUri, other.JwksUri)
}