Skip to content

fix(gitlab): drop openid scope requirement if there are no groups presented #4810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nabokihms merged 1 commit into from
May 27, 2026
Merged

fix(gitlab): drop openid scope requirement if there are no groups presented #4810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion connector/gitlab/gitlab.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,9 @@ type gitlabConnector struct {

// oauth2Config builds the OAuth2 client configuration and scopes for this connector.
func (c *gitlabConnector) oauth2Config(scopes connector.Scopes) *oauth2.Config {
gitlabScopes := []string{scopeUser, scopeOpenID}
gitlabScopes := []string{scopeUser}
if c.groupsRequired(scopes.Groups) {
gitlabScopes = append(gitlabScopes, scopeOpenID)
if c.inheritedGroups {
gitlabScopes = append(gitlabScopes, scopeReadAPI)
}
Expand Down
2 changes: 1 addition & 1 deletion connector/gitlab/gitlab_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ func TestOAuth2ConfigScopesForInheritedGroups(t *testing.T) {
c := gitlabConnector{inheritedGroups: true}

cfg := c.oauth2Config(connector.Scopes{})
expectEquals(t, cfg.Scopes, []string{scopeUser, scopeOpenID})
expectEquals(t, cfg.Scopes, []string{scopeUser})

cfg = c.oauth2Config(connector.Scopes{Groups: true})
expectEquals(t, cfg.Scopes, []string{scopeUser, scopeOpenID, scopeReadAPI})
Expand Down
Loading