diff --git a/CHANGELOG.md b/CHANGELOG.md index ddcde8c6..9a7fd8f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ - [#3072](https://github.com/oauth2-proxy/oauth2-proxy/pull/3072) feat: support for multiple github orgs #3072 (@daniel-mersch) - [#3116](https://github.com/oauth2-proxy/oauth2-proxy/pull/3116) feat: bump to go1.24.5 and full dependency update (@wardviaene / @dolmen) - [#3097](https://github.com/oauth2-proxy/oauth2-proxy/pull/3097) chore(deps): update alpine base image to v3.22.0 -- [#2273](https://github.com/oauth2-proxy/oauth2-proxy/pull/2273) feat: add Cidaas provider (@Bibob7) +- [#2273](https://github.com/oauth2-proxy/oauth2-proxy/pull/2273) feat: add Cidaas provider (@Bibob7, @Teko012) # V7.9.0 diff --git a/pkg/apis/options/providers.go b/pkg/apis/options/providers.go index 7ecf63ae..212341c9 100644 --- a/pkg/apis/options/providers.go +++ b/pkg/apis/options/providers.go @@ -115,6 +115,9 @@ const ( // BitbucketProvider is the provider type for Bitbucket BitbucketProvider ProviderType = "bitbucket" + // CidaasProvider is the provider type for Cidaas IDP + CidaasProvider ProviderType = "cidaas" + // DigitalOceanProvider is the provider type for DigitalOcean DigitalOceanProvider ProviderType = "digitalocean" @@ -147,9 +150,6 @@ const ( // OIDCProvider is the provider type for OIDC OIDCProvider ProviderType = "oidc" - - // CidaasProvider is the provider type for Cidaas IDP - CidaasProvider ProviderType = "cidaas" ) type KeycloakOptions struct { diff --git a/providers/providers.go b/providers/providers.go index 52aaad8e..610d574d 100644 --- a/providers/providers.go +++ b/providers/providers.go @@ -45,6 +45,8 @@ func NewProvider(providerConfig options.Provider) (Provider, error) { return NewMicrosoftEntraIDProvider(providerData, providerConfig), nil case options.BitbucketProvider: return NewBitbucketProvider(providerData, providerConfig.BitbucketConfig), nil + case options.CidaasProvider: + return NewCIDAASProvider(providerData), nil case options.DigitalOceanProvider: return NewDigitalOceanProvider(providerData), nil case options.FacebookProvider: @@ -67,8 +69,6 @@ func NewProvider(providerConfig options.Provider) (Provider, error) { return NewNextcloudProvider(providerData), nil case options.OIDCProvider: return NewOIDCProvider(providerData, providerConfig.OIDCConfig), nil - case options.CidaasProvider: - return NewCIDAASProvider(providerData), nil default: return nil, fmt.Errorf("unknown provider type %q", providerConfig.Type) } @@ -187,8 +187,8 @@ func providerRequiresOIDCProviderVerifier(providerType options.ProviderType) (bo case options.BitbucketProvider, options.DigitalOceanProvider, options.FacebookProvider, options.GitHubProvider, options.GoogleProvider, options.KeycloakProvider, options.LinkedInProvider, options.LoginGovProvider, options.NextCloudProvider: return false, nil - case options.OIDCProvider, options.ADFSProvider, options.AzureProvider, options.GitLabProvider, - options.KeycloakOIDCProvider, options.MicrosoftEntraIDProvider, options.CidaasProvider: + case options.OIDCProvider, options.ADFSProvider, options.AzureProvider, options.CidaasProvider, + options.GitLabProvider, options.KeycloakOIDCProvider, options.MicrosoftEntraIDProvider: return true, nil default: return false, fmt.Errorf("unknown provider type: %s", providerType)