barbercollie/tinyauth
1
0
Fork 1
mirror of https://github.com/steveiliop56/tinyauth.git synced 2025-10-28 04:35:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: rename generic user info url to generic user url

Browse Source
This commit is contained in:
Stavros
2025-01-24 19:41:44 +02:00
parent f61b6dbad4
commit b87cb54d91
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/root.go
View File

@@ -67,7 +67,7 @@ var rootCmd = &cobra.Command{
GenericScopes: config.GenericScopes, GenericScopes: config.GenericScopes,
GenericAuthURL: config.GenericAuthURL, GenericAuthURL: config.GenericAuthURL,
GenericTokenURL: config.GenericTokenURL, GenericTokenURL: config.GenericTokenURL,
GenericUserInfoURL: config.GenericUserInfoURL, GenericUserURL: config.GenericUserURL,
AppURL: config.AppURL, AppURL: config.AppURL,
} }
@@ -134,7 +134,7 @@ func init() {
rootCmd.Flags().String("generic-scopes", "", "Generic OAuth scopes.") rootCmd.Flags().String("generic-scopes", "", "Generic OAuth scopes.")
rootCmd.Flags().String("generic-auth-url", "", "Generic OAuth auth URL.") rootCmd.Flags().String("generic-auth-url", "", "Generic OAuth auth URL.")
rootCmd.Flags().String("generic-token-url", "", "Generic OAuth token 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.") rootCmd.Flags().Bool("disable-continue", false, "Disable continue screen and redirect to app directly.")
viper.BindEnv("port", "PORT") viper.BindEnv("port", "PORT")
viper.BindEnv("address", "ADDRESS") viper.BindEnv("address", "ADDRESS")
@@ -152,7 +152,7 @@ func init() {
viper.BindEnv("generic-scopes", "GENERIC_SCOPES") viper.BindEnv("generic-scopes", "GENERIC_SCOPES")
viper.BindEnv("generic-auth-url", "GENERIC_AUTH_URL") viper.BindEnv("generic-auth-url", "GENERIC_AUTH_URL")
viper.BindEnv("generic-token-url", "GENERIC_TOKEN_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.BindEnv("disable-continue", "DISABLE_CONTINUE")
viper.BindPFlags(rootCmd.Flags()) viper.BindPFlags(rootCmd.Flags())
} }

2
internal/providers/providers.go
View File

@@ -102,7 +102,7 @@ func (providers *Providers) GetUser(provider string) (string, error) {
return "", nil return "", nil
} }
client := providers.Generic.GetClient() client := providers.Generic.GetClient()
email, emailErr := GetGenericEmail(client, providers.Config.GenericUserInfoURL) email, emailErr := GetGenericEmail(client, providers.Config.GenericUserURL)
if emailErr != nil { if emailErr != nil {
return "", emailErr return "", emailErr
} }

4
internal/types/types.go
View File

@@ -35,7 +35,7 @@ type Config struct {
GenericScopes string `mapstructure:"generic-scopes"` GenericScopes string `mapstructure:"generic-scopes"`
GenericAuthURL string `mapstructure:"generic-auth-url"` GenericAuthURL string `mapstructure:"generic-auth-url"`
GenericTokenURL string `mapstructure:"generic-token-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"` DisableContinue bool `mapstructure:"disable-continue"`
} }
@@ -65,7 +65,7 @@ type OAuthConfig struct {
GenericScopes string GenericScopes string
GenericAuthURL string GenericAuthURL string
GenericTokenURL string GenericTokenURL string
GenericUserInfoURL string GenericUserURL string
AppURL string AppURL string
} }