3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-07-31 07:19:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix retrieve group error: (#614)

Browse source 
- 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
Download patch file Download diff file Expand all files Collapse all files

9
internal/identity/gitlab.go
View file

@ -19,8 +19,7 @@ import (
const (
defaultGitLabProviderURL = "https://gitlab.com"
revokeURL = "https://gitlab.com/oauth/revoke"
defaultGitLabGroupURL = "https://gitlab.com/api/v4/groups"
groupPath = "/api/v4/groups"
)
// GitLabProvider is an implementation of the OAuth Provider
@ -57,8 +56,7 @@ func NewGitLabProvider(p *Provider) (*GitLabProvider, error) {
Scopes: p.Scopes,
}
gp := &GitLabProvider{
Provider: p,
RevokeURL: revokeURL,
Provider: p,
}
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"`
FullPath string `json:"full_path,omitempty"`
}
userGroupURL := p.ProviderURL + groupPath
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 {
return nil, err
}