From b87cb54d91d79924565b538b1e8ff1e698232ae8 Mon Sep 17 00:00:00 2001 From: Stavros Date: Fri, 24 Jan 2025 19:41:44 +0200 Subject: [PATCH] refactor: rename generic user info url to generic user url --- cmd/root.go | 6 +++--- internal/providers/providers.go | 2 +- internal/types/types.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index d36c637..9d0a0ae 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -67,7 +67,7 @@ var rootCmd = &cobra.Command{ GenericScopes: config.GenericScopes, GenericAuthURL: config.GenericAuthURL, GenericTokenURL: config.GenericTokenURL, - GenericUserInfoURL: config.GenericUserInfoURL, + GenericUserURL: config.GenericUserURL, AppURL: config.AppURL, } @@ -134,7 +134,7 @@ func init() { rootCmd.Flags().String("generic-scopes", "", "Generic OAuth scopes.") rootCmd.Flags().String("generic-auth-url", "", "Generic OAuth auth URL.") rootCmd.Flags().String("generic-token-url", "", "Generic OAuth token URL.") - rootCmd.Flags().String("generic-user-info-url", "", "Generic OAuth user info URL.") + rootCmd.Flags().String("generic-user-url", "", "Generic OAuth user info URL.") rootCmd.Flags().Bool("disable-continue", false, "Disable continue screen and redirect to app directly.") viper.BindEnv("port", "PORT") viper.BindEnv("address", "ADDRESS") @@ -152,7 +152,7 @@ func init() { viper.BindEnv("generic-scopes", "GENERIC_SCOPES") viper.BindEnv("generic-auth-url", "GENERIC_AUTH_URL") viper.BindEnv("generic-token-url", "GENERIC_TOKEN_URL") - viper.BindEnv("generic-user-info-url", "GENERIC_USER_INFO_URL") + viper.BindEnv("generic-user-url", "GENERIC_USER_URL") viper.BindEnv("disable-continue", "DISABLE_CONTINUE") viper.BindPFlags(rootCmd.Flags()) } diff --git a/internal/providers/providers.go b/internal/providers/providers.go index dc6f354..f3f9754 100644 --- a/internal/providers/providers.go +++ b/internal/providers/providers.go @@ -102,7 +102,7 @@ func (providers *Providers) GetUser(provider string) (string, error) { return "", nil } client := providers.Generic.GetClient() - email, emailErr := GetGenericEmail(client, providers.Config.GenericUserInfoURL) + email, emailErr := GetGenericEmail(client, providers.Config.GenericUserURL) if emailErr != nil { return "", emailErr } diff --git a/internal/types/types.go b/internal/types/types.go index 00e65e0..d7ef1bf 100644 --- a/internal/types/types.go +++ b/internal/types/types.go @@ -35,7 +35,7 @@ type Config struct { GenericScopes string `mapstructure:"generic-scopes"` GenericAuthURL string `mapstructure:"generic-auth-url"` GenericTokenURL string `mapstructure:"generic-token-url"` - GenericUserInfoURL string `mapstructure:"generic-user-info-url"` + GenericUserURL string `mapstructure:"generic-user-info-url"` DisableContinue bool `mapstructure:"disable-continue"` } @@ -65,7 +65,7 @@ type OAuthConfig struct { GenericScopes string GenericAuthURL string GenericTokenURL string - GenericUserInfoURL string + GenericUserURL string AppURL string }