From 617575803cdb81c38c04d72fb2fa08bbe1d6695c Mon Sep 17 00:00:00 2001
From: Johan Siebens <johan.siebens@gmail.com>
Date: Thu, 22 Sep 2022 18:05:03 +0200
Subject: [PATCH] chore: remove auth provider config from flags and env
 variables

---
 internal/cmd/server.go    |  8 --------
 internal/config/config.go | 18 +++++++++---------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/internal/cmd/server.go b/internal/cmd/server.go
index 4bc902e..2bdc207 100644
--- a/internal/cmd/server.go
+++ b/internal/cmd/server.go
@@ -61,14 +61,6 @@ func (c *configByFlags) prepareCommand(cmd *coral.Command) {
 	cmd.Flags().StringVar(&c.c.Database.Type, "database-type", "", "")
 	cmd.Flags().StringVar(&c.c.Database.Url, "database-url", "", "")
 
-	cmd.Flags().StringVar(&c.c.AuthProvider.Issuer, "auth-provider-issuer", "", "")
-	cmd.Flags().StringVar(&c.c.AuthProvider.ClientID, "auth-provider-client-id", "", "")
-	cmd.Flags().StringVar(&c.c.AuthProvider.ClientSecret, "auth-provider-client-secret", "", "")
-	cmd.Flags().StringSliceVar(&c.c.AuthProvider.Scopes, "auth-provider-additional-scopes", []string{}, "")
-	cmd.Flags().StringSliceVar(&c.c.AuthProvider.SystemAdminPolicy.Subs, "auth-provider-system-admins-subs", []string{}, "")
-	cmd.Flags().StringSliceVar(&c.c.AuthProvider.SystemAdminPolicy.Emails, "auth-provider-system-admins-emails", []string{}, "")
-	cmd.Flags().StringSliceVar(&c.c.AuthProvider.SystemAdminPolicy.Filters, "auth-provider-system-admins-filters", []string{}, "")
-
 	cmd.Flags().StringVar(&c.c.Logging.Level, "logging-level", "", "")
 	cmd.Flags().StringVar(&c.c.Logging.Format, "logging-format", "", "")
 	cmd.Flags().StringVar(&c.c.Logging.File, "logging-file", "", "")
diff --git a/internal/config/config.go b/internal/config/config.go
index 7b3cf76..01e7c51 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -99,7 +99,7 @@ type Config struct {
 	PollNet           PollNet      `yaml:"poll_net,omitempty" envPrefix:"POLL_NET_"`
 	Keys              Keys         `yaml:"keys,omitempty" envPrefix:"KEYS_"`
 	Database          Database     `yaml:"database,omitempty" envPrefix:"DB_"`
-	AuthProvider      AuthProvider `yaml:"auth_provider,omitempty" envPrefix:"AUTH_PROVIDER_"`
+	AuthProvider      AuthProvider `yaml:"auth_provider,omitempty"`
 	Logging           Logging      `yaml:"logging,omitempty" envPrefix:"LOGGING_"`
 }
 
@@ -136,17 +136,17 @@ type Keys struct {
 }
 
 type AuthProvider struct {
-	Issuer            string            `yaml:"issuer" env:"ISSUER"`
-	ClientID          string            `yaml:"client_id" env:"CLIENT_ID"`
-	ClientSecret      string            `yaml:"client_secret" env:"CLIENT_SECRET"`
-	Scopes            []string          `yaml:"additional_scopes" env:"ADDITIONAL_SCOPES"`
-	SystemAdminPolicy SystemAdminPolicy `yaml:"system_admins" envPrefix:"SYSTEM_ADMINS_"`
+	Issuer            string            `yaml:"issuer"`
+	ClientID          string            `yaml:"client_id"`
+	ClientSecret      string            `yaml:"client_secret"`
+	Scopes            []string          `yaml:"additional_scopes"`
+	SystemAdminPolicy SystemAdminPolicy `yaml:"system_admins"`
 }
 
 type SystemAdminPolicy struct {
-	Subs    []string `json:"subs,omitempty" env:"SUBS"`
-	Emails  []string `json:"emails,omitempty" env:"EMAILS"`
-	Filters []string `json:"filters,omitempty" env:"FILTERS"`
+	Subs    []string `json:"subs,omitempty"`
+	Emails  []string `json:"emails,omitempty"`
+	Filters []string `json:"filters,omitempty"`
 }
 
 func (c *Config) CreateUrl(format string, a ...interface{}) string {