IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Updated changelog with, Github OAuth: Now works with Github for Enterprise, thanks @williamjoy

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-04-15 10:31:56 +02:00
parent aefbcb7049
commit e9afd30b47
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/social/social.go
View File

@@ -49,7 +49,7 @@ func NewOAuthService() {
Scopes: sec.Key("scopes").Strings(" "),
AuthUrl: sec.Key("auth_url").String(),
TokenUrl: sec.Key("token_url").String(),
APIUrl: sec.Key("api_url").String(),
ApiUrl: sec.Key("api_url").String(),
Enabled: sec.Key("enabled").MustBool(),
AllowedDomains: sec.Key("allowed_domains").Strings(" "),
}
@@ -73,7 +73,7 @@ func NewOAuthService() {
// GitHub.
if name == "github" {
setting.OAuthService.GitHub = true
SocialMap["github"] = &SocialGithub{Config: &config, allowedDomains: info.AllowedDomains, APIUrl: info.APIUrl}
SocialMap["github"] = &SocialGithub{Config: &config, allowedDomains: info.AllowedDomains, ApiUrl: info.ApiUrl}
}
// Google.
@@ -101,7 +101,7 @@ func isEmailAllowed(email string, allowedDomains []string) bool {
type SocialGithub struct {
*oauth2.Config
allowedDomains []string
APIUrl []string
ApiUrl string
}
func (s *SocialGithub) Type() int {
@@ -121,7 +121,7 @@ func (s *SocialGithub) UserInfo(token *oauth2.Token) (*BasicUserInfo, error) {
var err error
client := s.Client(oauth2.NoContext, token)
r, err := client.Get(s.APIUrl)
r, err := client.Get(s.ApiUrl)
if err != nil {
return nil, err
}