From 8a048f0c1de51e1988947ecfc5682eab912dcb66 Mon Sep 17 00:00:00 2001
From: Niall Sheridan <nsheridan@gmail.com>
Date: Thu, 21 Apr 2016 22:25:38 +0100
Subject: [PATCH] Just make ProviderOpts a map[string]string.
I have no idea why I made it a map[string]interface{} and it's a pain to deal
with.
---
server/auth/google/google.go | 2 +-
server/config/config.go | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/server/auth/google/google.go b/server/auth/google/google.go
index 231312bb..cf780f3b 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.ProviderOpts["domain"].(string),
+ domain: c.ProviderOpts["domain"],
}
}
diff --git a/server/config/config.go b/server/config/config.go
index 49b0f2e4..e6f1822c 100644
--- a/server/config/config.go
+++ b/server/config/config.go
@@ -20,12 +20,12 @@ type Server struct {
// Auth holds the configuration specific to the OAuth provider.
type Auth struct {
- OauthClientID string `mapstructure:"oauth_client_id"`
- OauthClientSecret string `mapstructure:"oauth_client_secret"`
- OauthCallbackURL string `mapstructure:"oauth_callback_url"`
- Provider string `mapstructure:"provider"`
- ProviderOpts map[string]interface{} `mapstructure:"provider_opts"`
- JWTSigningKey string `mapstructure:"jwt_signing_key"`
+ OauthClientID string `mapstructure:"oauth_client_id"`
+ OauthClientSecret string `mapstructure:"oauth_client_secret"`
+ OauthCallbackURL string `mapstructure:"oauth_callback_url"`
+ Provider string `mapstructure:"provider"`
+ ProviderOpts map[string]string `mapstructure:"provider_opts"`
+ JWTSigningKey string `mapstructure:"jwt_signing_key"`
}
// SSH holds the configuration specific to signing ssh keys.
--
GitLab