diff options
author | Niall Sheridan <nsheridan@gmail.com> | 2016-04-21 21:53:34 +0100 |
---|---|---|
committer | Niall Sheridan <nsheridan@gmail.com> | 2016-04-21 22:19:06 +0100 |
commit | 8920c2af029a930bf904685c606285da17de9e9d (patch) | |
tree | a76c33543c230b29d23736a6a4f90e877e599f1a /server/auth/google | |
parent | eb7357b2622942ced3cedf48e796af4dda157576 (diff) |
Some small fixes.
Rename 'GoogleOpts' to 'ProviderOpts'.
Rename Principals to AdditionalPrincipals to match the config option.
Diffstat (limited to 'server/auth/google')
-rw-r--r-- | server/auth/google/google.go | 2 | ||||
-rw-r--r-- | server/auth/google/google_test.go | 4 |
2 files changed, 3 insertions, 3 deletions
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) } |