refactor: change OIDCScopes to GetCommaSepEnv

This commit is contained in:
yusing 2025-04-26 03:30:22 +08:00
parent 0534bc38b2
commit be257b0532
2 changed files with 2 additions and 3 deletions

View file

@ -16,7 +16,6 @@ import (
"github.com/yusing/go-proxy/internal/logging" "github.com/yusing/go-proxy/internal/logging"
"github.com/yusing/go-proxy/internal/net/gphttp" "github.com/yusing/go-proxy/internal/net/gphttp"
"github.com/yusing/go-proxy/internal/utils" "github.com/yusing/go-proxy/internal/utils"
"github.com/yusing/go-proxy/internal/utils/strutils"
"golang.org/x/oauth2" "golang.org/x/oauth2"
) )
@ -84,7 +83,7 @@ func NewOIDCProvider(issuerURL, clientID, clientSecret string, allowedUsers, all
ClientSecret: clientSecret, ClientSecret: clientSecret,
RedirectURL: "", RedirectURL: "",
Endpoint: provider.Endpoint(), Endpoint: provider.Endpoint(),
Scopes: strutils.CommaSeperatedList(common.OIDCScopes), Scopes: common.OIDCScopes,
}, },
oidcProvider: provider, oidcProvider: provider,
oidcVerifier: provider.Verifier(&oidc.Config{ oidcVerifier: provider.Verifier(&oidc.Config{

View file

@ -48,7 +48,7 @@ var (
OIDCIssuerURL = GetEnvString("OIDC_ISSUER_URL", "") OIDCIssuerURL = GetEnvString("OIDC_ISSUER_URL", "")
OIDCClientID = GetEnvString("OIDC_CLIENT_ID", "") OIDCClientID = GetEnvString("OIDC_CLIENT_ID", "")
OIDCClientSecret = GetEnvString("OIDC_CLIENT_SECRET", "") OIDCClientSecret = GetEnvString("OIDC_CLIENT_SECRET", "")
OIDCScopes = GetEnvString("OIDC_SCOPES", "openid, profile, email") OIDCScopes = GetCommaSepEnv("OIDC_SCOPES", "openid, profile, email")
OIDCAllowedUsers = GetCommaSepEnv("OIDC_ALLOWED_USERS", "") OIDCAllowedUsers = GetCommaSepEnv("OIDC_ALLOWED_USERS", "")
OIDCAllowedGroups = GetCommaSepEnv("OIDC_ALLOWED_GROUPS", "") OIDCAllowedGroups = GetCommaSepEnv("OIDC_ALLOWED_GROUPS", "")