From 652d16692d1c3589d09e6ca8b342846a53ae088e Mon Sep 17 00:00:00 2001 From: Kevin Kreitner Date: Sun, 12 Jan 2025 17:38:58 +0100 Subject: [PATCH] Pass provider options to Cidaas provider Co-authored-by: Jan Larwig --- providers/cidaas.go | 10 +++++----- providers/providers.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/providers/cidaas.go b/providers/cidaas.go index b0573429..0e0582a6 100644 --- a/providers/cidaas.go +++ b/providers/cidaas.go @@ -33,17 +33,16 @@ const ( ) // NewCIDAASProvider initiates a new CIDAASProvider -func NewCIDAASProvider(p *ProviderData) *CIDAASProvider { +func NewCIDAASProvider(p *ProviderData, opts options.Provider) *CIDAASProvider { p.setProviderDefaults(providerDefaults{ name: CidaasProviderName, scope: CidaasDefaultScope, }) + opts.InsecureSkipNonce = true // Should this be configurable or not?! Do you need to skip the nonce for Cidaas? + return &CIDAASProvider{ - OIDCProvider: &OIDCProvider{ - ProviderData: p, - SkipNonce: true, - }, + OIDCProvider: NewOIDCProvider(p, opts.OIDCConfig), } } @@ -116,6 +115,7 @@ func (p *CIDAASProvider) extractGroups(respJSON *simplejson.Json) ([]string, err if err != nil { return nil, err } + var groupsClaimList GroupsClaimList err = json.Unmarshal(rawGroupsClaim, &groupsClaimList) if err != nil { diff --git a/providers/providers.go b/providers/providers.go index 610d574d..c4f7c96c 100644 --- a/providers/providers.go +++ b/providers/providers.go @@ -46,7 +46,7 @@ func NewProvider(providerConfig options.Provider) (Provider, error) { case options.BitbucketProvider: return NewBitbucketProvider(providerData, providerConfig.BitbucketConfig), nil case options.CidaasProvider: - return NewCIDAASProvider(providerData), nil + return NewCIDAASProvider(providerData, providerConfig), nil case options.DigitalOceanProvider: return NewDigitalOceanProvider(providerData), nil case options.FacebookProvider: