From be257b053263191be32f2977af0c4afc266ae4c9 Mon Sep 17 00:00:00 2001 From: yusing Date: Sat, 26 Apr 2025 03:30:22 +0800 Subject: [PATCH] refactor: change OIDCScopes to GetCommaSepEnv --- internal/auth/oidc.go | 3 +-- internal/common/env.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/internal/auth/oidc.go b/internal/auth/oidc.go index 115b793..abdba41 100644 --- a/internal/auth/oidc.go +++ b/internal/auth/oidc.go @@ -16,7 +16,6 @@ import ( "github.com/yusing/go-proxy/internal/logging" "github.com/yusing/go-proxy/internal/net/gphttp" "github.com/yusing/go-proxy/internal/utils" - "github.com/yusing/go-proxy/internal/utils/strutils" "golang.org/x/oauth2" ) @@ -84,7 +83,7 @@ func NewOIDCProvider(issuerURL, clientID, clientSecret string, allowedUsers, all ClientSecret: clientSecret, RedirectURL: "", Endpoint: provider.Endpoint(), - Scopes: strutils.CommaSeperatedList(common.OIDCScopes), + Scopes: common.OIDCScopes, }, oidcProvider: provider, oidcVerifier: provider.Verifier(&oidc.Config{ diff --git a/internal/common/env.go b/internal/common/env.go index 2274676..4b05841 100644 --- a/internal/common/env.go +++ b/internal/common/env.go @@ -48,7 +48,7 @@ var ( OIDCIssuerURL = GetEnvString("OIDC_ISSUER_URL", "") OIDCClientID = GetEnvString("OIDC_CLIENT_ID", "") OIDCClientSecret = GetEnvString("OIDC_CLIENT_SECRET", "") - OIDCScopes = GetEnvString("OIDC_SCOPES", "openid, profile, email") + OIDCScopes = GetCommaSepEnv("OIDC_SCOPES", "openid, profile, email") OIDCAllowedUsers = GetCommaSepEnv("OIDC_ALLOWED_USERS", "") OIDCAllowedGroups = GetCommaSepEnv("OIDC_ALLOWED_GROUPS", "")