diff --git a/CHANGELOG.md b/CHANGELOG.md index 5dfc03e4..cb496b3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,11 +26,10 @@ ## Changes since v6.1.1 - [#825](https://github.com/oauth2-proxy/oauth2-proxy/pull/825) Fix code coverage reporting on GitHub actions(@JoelSpeed) -- [#767](https://github.com/oauth2-proxy/oauth2-proxy/pull/796) Deprecate GetUserName & GetEmailAdress for EnrichSessionState (@NickMeves) +- [#796](https://github.com/oauth2-proxy/oauth2-proxy/pull/796) Deprecate GetUserName & GetEmailAdress for EnrichSessionState (@NickMeves) - [#705](https://github.com/oauth2-proxy/oauth2-proxy/pull/705) Add generic Header injectors for upstream request and response headers (@JoelSpeed) - [#753](https://github.com/oauth2-proxy/oauth2-proxy/pull/753) Pass resource parameter in login url (@codablock) - [#789](https://github.com/oauth2-proxy/oauth2-proxy/pull/789) Add `--skip-auth-route` configuration option for `METHOD=pathRegex` based allowlists (@NickMeves) -- [#767](https://github.com/oauth2-proxy/oauth2-proxy/pull/796) Deprecate GetUserName & GetEmailAdress for EnrichSessionState (@NickMeves) - [#575](https://github.com/oauth2-proxy/oauth2-proxy/pull/575) Stop accepting legacy SHA1 signed cookies (@NickMeves) - [#722](https://github.com/oauth2-proxy/oauth2-proxy/pull/722) Validate Redis configuration options at startup (@NickMeves) - [#791](https://github.com/oauth2-proxy/oauth2-proxy/pull/791) Remove GetPreferredUsername method from provider interface (@NickMeves) diff --git a/pkg/validation/options.go b/pkg/validation/options.go index 2ea35f9f..b54df330 100644 --- a/pkg/validation/options.go +++ b/pkg/validation/options.go @@ -273,7 +273,6 @@ func parseProviderInfo(o *options.Options, msgs []string) []string { case *providers.GitLabProvider: p.AllowUnverifiedEmail = o.InsecureOIDCAllowUnverifiedEmail p.Groups = o.GitLabGroup - p.EmailDomains = o.EmailDomains if o.GetOIDCVerifier() != nil { p.Verifier = o.GetOIDCVerifier() diff --git a/providers/gitlab.go b/providers/gitlab.go index eb673a3d..a04beca6 100644 --- a/providers/gitlab.go +++ b/providers/gitlab.go @@ -15,9 +15,7 @@ import ( type GitLabProvider struct { *ProviderData - Groups []string - EmailDomains []string - + Groups []string Verifier *oidc.IDTokenVerifier AllowUnverifiedEmail bool }