fix retrieve group error: (#614)

- remove hardcoded gitlab provider url
 - update the gitlab identity provider documentation
This commit is contained in:
Ogundele Olumide 2020-04-16 19:51:03 +01:00 committed by GitHub
parent 47f9765a47
commit 53fd215148
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions

View file

@ -25,8 +25,9 @@ Field | Description
------------ | -------------------------------------------- ------------ | --------------------------------------------
Name | The name of your web app Name | The name of your web app
Redirect URI | `https://${authenticate_service_url}/oauth2/callback` Redirect URI | `https://${authenticate_service_url}/oauth2/callback`
Scopes | **Must** select **read_user** and **openid** Scopes | **Must** select **openid**, **read_user** and **api**
If no scopes are set, we will use the following scopes: `openid`, `api`, `read_user`, `profile`, `email`.
Your `Client ID` and `Client Secret` will be displayed like below: Your `Client ID` and `Client Secret` will be displayed like below:

View file

@ -19,8 +19,7 @@ import (
const ( const (
defaultGitLabProviderURL = "https://gitlab.com" defaultGitLabProviderURL = "https://gitlab.com"
revokeURL = "https://gitlab.com/oauth/revoke" groupPath = "/api/v4/groups"
defaultGitLabGroupURL = "https://gitlab.com/api/v4/groups"
) )
// GitLabProvider is an implementation of the OAuth Provider // GitLabProvider is an implementation of the OAuth Provider
@ -57,8 +56,7 @@ func NewGitLabProvider(p *Provider) (*GitLabProvider, error) {
Scopes: p.Scopes, Scopes: p.Scopes,
} }
gp := &GitLabProvider{ gp := &GitLabProvider{
Provider: p, Provider: p,
RevokeURL: revokeURL,
} }
if err := p.provider.Claims(&gp); err != nil { if err := p.provider.Claims(&gp); err != nil {
@ -89,8 +87,9 @@ func (p *GitLabProvider) UserGroups(ctx context.Context, s *sessions.State) ([]s
FullName string `json:"full_name,omitempty"` FullName string `json:"full_name,omitempty"`
FullPath string `json:"full_path,omitempty"` FullPath string `json:"full_path,omitempty"`
} }
userGroupURL := p.ProviderURL + groupPath
headers := map[string]string{"Authorization": fmt.Sprintf("Bearer %s", s.AccessToken.AccessToken)} headers := map[string]string{"Authorization": fmt.Sprintf("Bearer %s", s.AccessToken.AccessToken)}
err := httputil.Client(ctx, http.MethodGet, defaultGitLabGroupURL, version.UserAgent(), headers, nil, &response) err := httputil.Client(ctx, http.MethodGet, userGroupURL, version.UserAgent(), headers, nil, &response)
if err != nil { if err != nil {
return nil, err return nil, err
} }