Explorar el Código

grafana/grafana#1781 add oauth api url as config

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
William Wei hace 10 años
padre
commit
4fd2622e55
Se han modificado 1 ficheros con 3 adiciones y 2 borrados
  1. 3 2
      pkg/social/social.go

+ 3 - 2
pkg/social/social.go

@@ -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
 	}
 	}