GitLab provider: honor explicit --scope option when using groups

and default to "openid" instead of "api" when using groups
ploxiln · Apr 29, 2019 · 297362b · 297362b
1 parent 84d761c
commit 297362b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/providers/gitlab.go b/providers/gitlab.go
@@ -38,16 +38,18 @@ func NewGitLabProvider(p *ProviderData) *GitLabProvider {
 			Path:   "/api/v4/user",
 		}
 	}
-	if p.Scope == "" {
-		p.Scope = "read_user"
-	}
 	return &GitLabProvider{ProviderData: p}
 }
 
 func (p *GitLabProvider) SetGroups(groups []string) {
 	p.Groups = groups
-	if len(groups) > 0 {
-		p.Scope = "api"
+
+	if p.Scope == "" {
+		if len(groups) > 0 {
+			p.Scope = "openid"
+		} else {
+			p.Scope = "read_user"
+		}
 	}
 }
 

diff --git a/providers/gitlab_test.go b/providers/gitlab_test.go
@@ -24,6 +24,7 @@ func testGitLabProvider(hostname string) *GitLabProvider {
 		updateURL(p.Data().ProfileURL, hostname)
 		updateURL(p.Data().ValidateURL, hostname)
 	}
+	p.SetGroups([]string{})
 	return p
 }