k-space/dex
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Activity

Merge pull request #1028 from estroz/gitlab-scopes

Browse Source 
connector/gitlab: correct scope strings, better default
This commit is contained in:
Eric Stroczynski 2017-08-15 14:57:05 -07:00 committed by GitHub
commit 48bb61cfe0
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
connector/gitlab/gitlab.go
View File

@ -17,8 +17,9 @@ import (
) )
const ( const (
scopeEmail = "user:email" // https://docs.gitlab.com/ee/integration/oauth_provider.html#authorized-applications
scopeOrgs = "read:org" scopeUser = "read_user"
scopeAPI = "api"
) )
// Config holds configuration options for gilab logins. // Config holds configuration options for gilab logins.
@ -78,7 +79,11 @@ type gitlabConnector struct {
} }
func (c *gitlabConnector) oauth2Config(scopes connector.Scopes) *oauth2.Config { func (c *gitlabConnector) oauth2Config(scopes connector.Scopes) *oauth2.Config {
gitlabScopes := []string{"api"} gitlabScopes := []string{scopeUser}
if scopes.Groups {
gitlabScopes = []string{scopeAPI}
}
gitlabEndpoint := oauth2.Endpoint{AuthURL: c.baseURL + "/oauth/authorize", TokenURL: c.baseURL + "/oauth/token"} gitlabEndpoint := oauth2.Endpoint{AuthURL: c.baseURL + "/oauth/authorize", TokenURL: c.baseURL + "/oauth/token"}
return &oauth2.Config{ return &oauth2.Config{
ClientID: c.clientID, ClientID: c.clientID,
@ -198,7 +203,7 @@ func (c *gitlabConnector) Refresh(ctx context.Context, s connector.Scopes, ident
// a bearer token as part of the request. // a bearer token as part of the request.
func (c *gitlabConnector) user(ctx context.Context, client *http.Client) (gitlabUser, error) { func (c *gitlabConnector) user(ctx context.Context, client *http.Client) (gitlabUser, error) {
var u gitlabUser var u gitlabUser
req, err := http.NewRequest("GET", c.baseURL+"/api/v3/user", nil) req, err := http.NewRequest("GET", c.baseURL+"/api/v4/user", nil)
if err != nil { if err != nil {
return u, fmt.Errorf("gitlab: new req: %v", err) return u, fmt.Errorf("gitlab: new req: %v", err)
} }
@ -229,7 +234,7 @@ func (c *gitlabConnector) user(ctx context.Context, client *http.Client) (gitlab
// which inserts a bearer token as part of the request. // which inserts a bearer token as part of the request.
func (c *gitlabConnector) groups(ctx context.Context, client *http.Client) ([]string, error) { func (c *gitlabConnector) groups(ctx context.Context, client *http.Client) ([]string, error) {
apiURL := c.baseURL + "/api/v3/groups" apiURL := c.baseURL + "/api/v4/groups"
reNext := regexp.MustCompile("<(.*)>; rel=\"next\"") reNext := regexp.MustCompile("<(.*)>; rel=\"next\"")
reLast := regexp.MustCompile("<(.*)>; rel=\"last\"") reLast := regexp.MustCompile("<(.*)>; rel=\"last\"")