Skip to content

N
nexpie-grafana-theme
Commit a09044a4 by Dan Cech
Options

go fmt

parent 04e17c14
Showing with 13 additions and 13 deletions
pkg/social/generic_oauth.go
...@@ -225,7 +225,7 @@ func (s *SocialGenericOAuth) UserInfo(client *http.Client, token *oauth2.Token) ...@@ -225,7 +225,7 @@ func (s *SocialGenericOAuth) UserInfo(client *http.Client, token *oauth2.Token)
return userInfo, nil return userInfo, nil
} }
func (s *SocialGenericOAuth) extractToken(data *UserInfoJson, token *oauth2.Token) (bool) { func (s *SocialGenericOAuth) extractToken(data *UserInfoJson, token *oauth2.Token) bool {
idToken := token.Extra("id_token") idToken := token.Extra("id_token")
if idToken == nil { if idToken == nil {
s.log.Debug("No id_token found", "token", token) s.log.Debug("No id_token found", "token", token)
......
pkg/social/social.go
...@@ -102,9 +102,9 @@ func NewOAuthService() { ...@@ -102,9 +102,9 @@ func NewOAuthService() {
// GitHub. // GitHub.
if name == "github" { if name == "github" {
SocialMap["github"] = &SocialGithub{ SocialMap["github"] = &SocialGithub{
SocialBase: &SocialBase{ SocialBase: &SocialBase{
Config: &config, Config: &config,
log: logger, log: logger,
}, },
allowedDomains: info.AllowedDomains, allowedDomains: info.AllowedDomains,
apiUrl: info.ApiUrl, apiUrl: info.ApiUrl,
...@@ -117,9 +117,9 @@ func NewOAuthService() { ...@@ -117,9 +117,9 @@ func NewOAuthService() {
// Google. // Google.
if name == "google" { if name == "google" {
SocialMap["google"] = &SocialGoogle{ SocialMap["google"] = &SocialGoogle{
SocialBase: &SocialBase{ SocialBase: &SocialBase{
Config: &config, Config: &config,
log: logger, log: logger,
}, },
allowedDomains: info.AllowedDomains, allowedDomains: info.AllowedDomains,
hostedDomain: info.HostedDomain, hostedDomain: info.HostedDomain,
...@@ -131,9 +131,9 @@ func NewOAuthService() { ...@@ -131,9 +131,9 @@ func NewOAuthService() {
// Generic - Uses the same scheme as Github. // Generic - Uses the same scheme as Github.
if name == "generic_oauth" { if name == "generic_oauth" {
SocialMap["generic_oauth"] = &SocialGenericOAuth{ SocialMap["generic_oauth"] = &SocialGenericOAuth{
SocialBase: &SocialBase{ SocialBase: &SocialBase{
Config: &config, Config: &config,
log: logger, log: logger,
}, },
allowedDomains: info.AllowedDomains, allowedDomains: info.AllowedDomains,
apiUrl: info.ApiUrl, apiUrl: info.ApiUrl,
...@@ -156,9 +156,9 @@ func NewOAuthService() { ...@@ -156,9 +156,9 @@ func NewOAuthService() {
} }
SocialMap["grafana_com"] = &SocialGrafanaCom{ SocialMap["grafana_com"] = &SocialGrafanaCom{
SocialBase: &SocialBase{ SocialBase: &SocialBase{
Config: &config, Config: &config,
log: logger, log: logger,
}, },
url: setting.GrafanaComUrl, url: setting.GrafanaComUrl,
allowSignup: info.AllowSignup, allowSignup: info.AllowSignup,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment