fix: split generic scopes string to array

This commit is contained in:
Stavros
2025-01-25 10:25:20 +02:00
parent 96a373a794
commit c7ec788ce1
4 changed files with 7 additions and 7 deletions

View File

@@ -57,7 +57,7 @@ var rootCmd = &cobra.Command{
HandleError(parseErr, "Failed to parse users")
// Create whitelist
whitelist := utils.ParseWhitelist(config.Whitelist)
whitelist := utils.ParseCommaString(config.Whitelist)
// Create OAuth config
oauthConfig := types.OAuthConfig{
@@ -67,7 +67,7 @@ var rootCmd = &cobra.Command{
GoogleClientSecret: config.GoogleClientSecret,
GenericClientId: config.GenericClientId,
GenericClientSecret: config.GenericClientSecret,
GenericScopes: config.GenericScopes,
GenericScopes: utils.ParseCommaString(config.GenericScopes),
GenericAuthURL: config.GenericAuthURL,
GenericTokenURL: config.GenericTokenURL,
GenericUserURL: config.GenericUserURL,

View File

@@ -52,7 +52,7 @@ func (providers *Providers) Init() {
ClientID: providers.Config.GenericClientId,
ClientSecret: providers.Config.GenericClientSecret,
RedirectURL: fmt.Sprintf("%s/api/oauth/callback/generic", providers.Config.AppURL),
Scopes: []string{providers.Config.GenericScopes},
Scopes: providers.Config.GenericScopes,
Endpoint: oauth2.Endpoint{
AuthURL: providers.Config.GenericAuthURL,
TokenURL: providers.Config.GenericTokenURL,

View File

@@ -63,7 +63,7 @@ type OAuthConfig struct {
GoogleClientSecret string
GenericClientId string
GenericClientSecret string
GenericScopes string
GenericScopes []string
GenericAuthURL string
GenericTokenURL string
GenericUserURL string

View File

@@ -75,9 +75,9 @@ func ParseFileToLine(content string) string {
return strings.Join(users, ",")
}
func ParseWhitelist(whitelist string) []string {
if whitelist == "" {
func ParseCommaString(str string) []string {
if str == "" {
return []string{}
}
return strings.Split(whitelist, ",")
return strings.Split(str, ",")
}