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

rename useLoginAsId -> useLoginAsID

Browse Source
This commit is contained in:
James Nord 2019-02-04 13:53:59 +00:00
parent 5822a5ce9e
commit 9840fccdbb
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/connectors/github.md
View File

@ -69,7 +69,7 @@ connectors:
teamNameField: slug teamNameField: slug
# flag which will switch from using the internal GitHub id to the users handle (@mention) as the user id. # flag which will switch from using the internal GitHub id to the users handle (@mention) as the user id.
# It is possible for a user to change their own user name but it is very rare for them to do so # It is possible for a user to change their own user name but it is very rare for them to do so
useLoginAsId: false useLoginAsID: false
``` ```
## GitHub Enterprise ## GitHub Enterprise

8
connector/github/github.go
View File

@ -48,7 +48,7 @@ type Config struct {
RootCA string `json:"rootCA"` RootCA string `json:"rootCA"`
TeamNameField string `json:"teamNameField"` TeamNameField string `json:"teamNameField"`
LoadAllGroups bool `json:"loadAllGroups"` LoadAllGroups bool `json:"loadAllGroups"`
UseLoginAsId bool `json:"useLoginAsId"` UseLoginAsID bool `json:"useLoginAsID"`
} }
// Org holds org-team filters, in which teams are optional. // Org holds org-team filters, in which teams are optional.
@ -84,7 +84,7 @@ func (c *Config) Open(id string, logger logrus.FieldLogger) (connector.Connector
clientSecret: c.ClientSecret, clientSecret: c.ClientSecret,
apiURL: apiURL, apiURL: apiURL,
logger: logger, logger: logger,
useLoginAsId: c.UseLoginAsId, useLoginAsID: c.UseLoginAsID,
} }
if c.HostName != "" { if c.HostName != "" {
@ -151,7 +151,7 @@ type githubConnector struct {
// if set to true and no orgs are configured then connector loads all user claims (all orgs and team) // if set to true and no orgs are configured then connector loads all user claims (all orgs and team)
loadAllGroups bool loadAllGroups bool
// if set to true will use the users handle rather than their numeric id as the ID // if set to true will use the users handle rather than their numeric id as the ID
useLoginAsId bool useLoginAsID bool
} }
// groupsRequired returns whether dex requires GitHub's 'read:org' scope. Dex // groupsRequired returns whether dex requires GitHub's 'read:org' scope. Dex
@ -271,7 +271,7 @@ func (c *githubConnector) HandleCallback(s connector.Scopes, r *http.Request) (i
Email: user.Email, Email: user.Email,
EmailVerified: true, EmailVerified: true,
} }
if c.useLoginAsId { if c.useLoginAsID {
identity.UserID = user.Login identity.UserID = user.Login
} }

2
connector/github/github_test.go
View File

@ -192,7 +192,7 @@ func TestLoginUsedAsIDWhenConfigured(t *testing.T) {
req, err := http.NewRequest("GET", hostURL.String(), nil) req, err := http.NewRequest("GET", hostURL.String(), nil)
expectNil(t, err) expectNil(t, err)
c := githubConnector{apiURL: s.URL, hostName: hostURL.Host, httpClient: newClient(), useLoginAsId: true} c := githubConnector{apiURL: s.URL, hostName: hostURL.Host, httpClient: newClient(), useLoginAsID: true}
identity, err := c.HandleCallback(connector.Scopes{Groups: true}, req) identity, err := c.HandleCallback(connector.Scopes{Groups: true}, req)
expectNil(t, err) expectNil(t, err)