Merge pull request #197 from ruta-goomba/enterprise-github

use Github provider with GitHub enterprise
This commit is contained in:
Jehiah Czebotar 2016-02-06 13:24:48 -06:00
commit 36128e971f
2 changed files with 9 additions and 3 deletions

View File

@ -97,6 +97,12 @@ The GitHub auth provider supports two additional parameters to restrict authenti
-github-org="": restrict logins to members of this organisation -github-org="": restrict logins to members of this organisation
-github-team="": restrict logins to members of this team -github-team="": restrict logins to members of this team
If you are using github enterprise, make sure you set the following to the appropriate url:
-login-url="<enterprise github url>/login/oauth/authorize"
-redeem-url="<enterprise github url>/login/oauth/access_token"
-validate-url="<enterprise github api url>/user/emails"
### LinkedIn Auth Provider ### LinkedIn Auth Provider

View File

@ -63,7 +63,7 @@ func (p *GitHubProvider) hasOrg(accessToken string) (bool, error) {
"limit": {"100"}, "limit": {"100"},
} }
endpoint := "https://api.github.com/user/orgs?" + params.Encode() endpoint := p.ValidateURL.Scheme + "://" + p.ValidateURL.Host + "/user/orgs?" + params.Encode()
req, _ := http.NewRequest("GET", endpoint, nil) req, _ := http.NewRequest("GET", endpoint, nil)
req.Header.Set("Accept", "application/vnd.github.v3+json") req.Header.Set("Accept", "application/vnd.github.v3+json")
resp, err := http.DefaultClient.Do(req) resp, err := http.DefaultClient.Do(req)
@ -113,7 +113,7 @@ func (p *GitHubProvider) hasOrgAndTeam(accessToken string) (bool, error) {
"limit": {"100"}, "limit": {"100"},
} }
endpoint := "https://api.github.com/user/teams?" + params.Encode() endpoint := p.ValidateURL.Scheme + "://" + p.ValidateURL.Host + "/user/teams?" + params.Encode()
req, _ := http.NewRequest("GET", endpoint, nil) req, _ := http.NewRequest("GET", endpoint, nil)
req.Header.Set("Accept", "application/vnd.github.v3+json") req.Header.Set("Accept", "application/vnd.github.v3+json")
resp, err := http.DefaultClient.Do(req) resp, err := http.DefaultClient.Do(req)
@ -183,7 +183,7 @@ func (p *GitHubProvider) GetEmailAddress(s *SessionState) (string, error) {
params := url.Values{ params := url.Values{
"access_token": {s.AccessToken}, "access_token": {s.AccessToken},
} }
endpoint := "https://api.github.com/user/emails?" + params.Encode() endpoint := p.ValidateURL.Scheme + "://" + p.ValidateURL.Host + p.ValidateURL.Path + "?" + params.Encode()
resp, err := http.DefaultClient.Get(endpoint) resp, err := http.DefaultClient.Get(endpoint)
if err != nil { if err != nil {
return "", err return "", err