IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-30 20:54:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

grafana/grafana#1781 add oauth api url as config

Browse Source 
read github api from config file instead of using public github:
http://api.github.com/user

this would be useful when you are using github enterprise edition
This commit is contained in:
William Wei 2015-04-15 14:18:10 +08:00
parent d048e39cde
commit 4fd2622e55
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/social/social.go
View File

@ -73,7 +73,7 @@ func NewOAuthService() {
// GitHub. // GitHub.
if name == "github" { if name == "github" {
setting.OAuthService.GitHub = true setting.OAuthService.GitHub = true
SocialMap["github"] = &SocialGithub{Config: &config, allowedDomains: info.AllowedDomains} SocialMap["github"] = &SocialGithub{Config: &config, allowedDomains: info.AllowedDomains, APIUrl: info.APIUrl}
} }
// Google. // Google.
@ -101,6 +101,7 @@ func isEmailAllowed(email string, allowedDomains []string) bool {
type SocialGithub struct { type SocialGithub struct {
*oauth2.Config *oauth2.Config
allowedDomains []string allowedDomains []string
APIUrl []string
} }
func (s *SocialGithub) Type() int { func (s *SocialGithub) Type() int {
@ -120,7 +121,7 @@ func (s *SocialGithub) UserInfo(token *oauth2.Token) (*BasicUserInfo, error) {
var err error var err error
client := s.Client(oauth2.NoContext, token) client := s.Client(oauth2.NoContext, token)
r, err := client.Get("https://api.github.com/user") r, err := client.Get(s.APIUrl)
if err != nil { if err != nil {
return nil, err return nil, err
} }