Arsharth/dex
1
0
Fork 0
forked from mystiq/dex
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1037 from estroz/cherry-picked-change

Browse source 
connector/github: fix username used when making API requests for patch release
This commit is contained in:
rithu leena john 2017-08-17 14:58:51 -07:00 committed by GitHub
commit 0d42c34edf
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
connector/github/github.go
View file

@ -247,16 +247,16 @@ func (c *githubConnector) HandleCallback(s connector.Scopes, r *http.Request) (i
if s.Groups { if s.Groups {
var groups []string var groups []string
if len(c.orgs) > 0 { if len(c.orgs) > 0 {
if groups, err = c.listGroups(ctx, client, username); err != nil { if groups, err = c.listGroups(ctx, client, user.Login); err != nil {
return identity, err return identity, err
} }
} else if c.org != "" { } else if c.org != "" {
inOrg, err := c.userInOrg(ctx, client, username, c.org) inOrg, err := c.userInOrg(ctx, client, user.Login, c.org)
if err != nil { if err != nil {
return identity, err return identity, err
} }
if !inOrg { if !inOrg {
return identity, fmt.Errorf("github: user %q not a member of org %q", username, c.org) return identity, fmt.Errorf("github: user %q not a member of org %q", user.Login, c.org)
} }
if groups, err = c.teams(ctx, client, c.org); err != nil { if groups, err = c.teams(ctx, client, c.org); err != nil {
return identity, fmt.Errorf("github: get teams: %v", err) return identity, fmt.Errorf("github: get teams: %v", err)
@ -303,16 +303,16 @@ func (c *githubConnector) Refresh(ctx context.Context, s connector.Scopes, ident
if s.Groups { if s.Groups {
var groups []string var groups []string
if len(c.orgs) > 0 { if len(c.orgs) > 0 {
if groups, err = c.listGroups(ctx, client, username); err != nil { if groups, err = c.listGroups(ctx, client, user.Login); err != nil {
return identity, err return identity, err
} }
} else if c.org != "" { } else if c.org != "" {
inOrg, err := c.userInOrg(ctx, client, username, c.org) inOrg, err := c.userInOrg(ctx, client, user.Login, c.org)
if err != nil { if err != nil {
return identity, err return identity, err
} }
if !inOrg { if !inOrg {
return identity, fmt.Errorf("github: user %q not a member of org %q", username, c.org) return identity, fmt.Errorf("github: user %q not a member of org %q", user.Login, c.org)
} }
if groups, err = c.teams(ctx, client, c.org); err != nil { if groups, err = c.teams(ctx, client, c.org); err != nil {
return identity, fmt.Errorf("github: get teams: %v", err) return identity, fmt.Errorf("github: get teams: %v", err)