Merge branch 'custom-github-style-oauth' of https://github.com/kfitzpatrick/grafana into kfitzpatrick-custom-github-style-oauth

2016-09-07 08:15:44 +02:00
parent 2e8d5ca519 f2baa5b210
commit 4646723cbb
5 changed files with 29 additions and 4 deletions
@@ -11,8 +11,9 @@ type OAuthInfo struct {
 }

 type OAuther struct {
-	GitHub, Google, Twitter bool
-	OAuthInfos              map[string]*OAuthInfo
+	GitHub, Google, Twitter, Generic bool
+	OAuthInfos                       map[string]*OAuthInfo
+	OAuthProviderName                string
 }

 var OAuthService *OAuther