From 8920c2af029a930bf904685c606285da17de9e9d Mon Sep 17 00:00:00 2001 From: Niall Sheridan Date: Thu, 21 Apr 2016 21:53:34 +0100 Subject: Some small fixes. Rename 'GoogleOpts' to 'ProviderOpts'. Rename Principals to AdditionalPrincipals to match the config option. --- server/auth/google/google.go | 2 +- server/auth/google/google_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'server/auth') diff --git a/server/auth/google/google.go b/server/auth/google/google.go index d464b14..231312b 100644 --- a/server/auth/google/google.go +++ b/server/auth/google/google.go @@ -35,7 +35,7 @@ func New(c *config.Auth) auth.Provider { Endpoint: google.Endpoint, Scopes: []string{googleapi.UserinfoEmailScope, googleapi.UserinfoProfileScope}, }, - domain: c.GoogleOpts["domain"].(string), + domain: c.ProviderOpts["domain"].(string), } } diff --git a/server/auth/google/google_test.go b/server/auth/google/google_test.go index 489aa1a..3a86610 100644 --- a/server/auth/google/google_test.go +++ b/server/auth/google/google_test.go @@ -44,8 +44,8 @@ func newGoogle() auth.Provider { OauthClientID: oauthClientID, OauthClientSecret: oauthClientSecret, OauthCallbackURL: oauthCallbackURL, - GoogleOpts: make(map[string]interface{}), + ProviderOpts: make(map[string]interface{}), } - c.GoogleOpts["domain"] = domain + c.ProviderOpts["domain"] = domain return New(c) } -- cgit v1.2.3