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

Worked a little on anonymous access, needs more work

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-01-07 16:37:24 +01:00
parent 9d629f2780
commit 35326e1d92
6 changed files with 52 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/social/social.go
View File

@@ -33,24 +33,19 @@ var (
)
func NewOAuthService() {
if !setting.Cfg.MustBool("oauth", "enabled") {
return
}
setting.OAuthService = &setting.OAuther{}
setting.OAuthService.OAuthInfos = make(map[string]*setting.OAuthInfo)
allOauthes := []string{"github", "google", "twitter"}
allOauthes := []string{"github", "google"}
// Load all OAuth config data.
for _, name := range allOauthes {
info := &setting.OAuthInfo{
ClientId: setting.Cfg.MustValue("oauth."+name, "client_id"),
ClientSecret: setting.Cfg.MustValue("oauth."+name, "client_secret"),
Scopes: setting.Cfg.MustValueArray("oauth."+name, "scopes", " "),
AuthUrl: setting.Cfg.MustValue("oauth."+name, "auth_url"),
TokenUrl: setting.Cfg.MustValue("oauth."+name, "token_url"),
Enabled: setting.Cfg.MustBool("oauth."+name, "enabled"),
ClientId: setting.Cfg.MustValue("auth."+name, "client_id"),
ClientSecret: setting.Cfg.MustValue("auth."+name, "client_secret"),
Scopes: setting.Cfg.MustValueArray("auth."+name, "scopes", " "),
AuthUrl: setting.Cfg.MustValue("auth."+name, "auth_url"),
TokenUrl: setting.Cfg.MustValue("auth."+name, "token_url"),
Enabled: setting.Cfg.MustBool("auth."+name, "enabled"),
}
if !info.Enabled {