Просмотр исходного кода

Add team_ids configuration option

Garrett Bjerkhoel 10 лет назад
Родитель
Сommit
7ea579bb71
2 измененных файлов с 4 добавлено и 1 удалено
  1. 1 0
      conf/defaults.ini
  2. 3 1
      pkg/social/social.go

+ 1 - 0
conf/defaults.ini

@@ -140,6 +140,7 @@ enabled = false
 client_id = some_id
 client_secret = some_secret
 scopes = user:email
+team_ids =
 auth_url = https://github.com/login/oauth/authorize
 token_url = https://github.com/login/oauth/access_token
 api_url = https://api.github.com/user

+ 3 - 1
pkg/social/social.go

@@ -75,7 +75,8 @@ func NewOAuthService() {
 		// GitHub.
 		if name == "github" {
 			setting.OAuthService.GitHub = true
-			SocialMap["github"] = &SocialGithub{Config: &config, allowedDomains: info.AllowedDomains, ApiUrl: info.ApiUrl, allowSignup: info.AllowSignup}
+			teamIds := sec.Key("team_ids").Ints(",")
+			SocialMap["github"] = &SocialGithub{Config: &config, allowedDomains: info.AllowedDomains, ApiUrl: info.ApiUrl, allowSignup: info.AllowSignup, teamIds: teamIds}
 		}
 
 		// Google.
@@ -105,6 +106,7 @@ type SocialGithub struct {
 	allowedDomains []string
 	ApiUrl         string
 	allowSignup    bool
+	teamIds        []int
 }
 
 func (s *SocialGithub) Type() int {