oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-08-01 17:38:37 +00:00
Code Wiki Activity

feat: allow customizing the display name of the OpenID Connect provider

Browse source
This commit is contained in:
Finn 2024-08-12 22:05:15 -07:00 • committed by GitHub
parent ee926e73cb
commit 6feee555ba
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
24 changed files with 74 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

9
internal/config/options.go
View file

@ -69,6 +69,7 @@ const (
defaultOAuth2ClientSecret = ""
defaultOAuth2RedirectURL = ""
defaultOAuth2OidcDiscoveryEndpoint = ""
defaultOauth2OidcProviderName = "OpenID Connect"
defaultOAuth2Provider = ""
defaultDisableLocalAuth = false
defaultPocketConsumerKey = ""
@ -154,6 +155,7 @@ type Options struct {
oauth2ClientSecret string
oauth2RedirectURL string
oidcDiscoveryEndpoint string
oidcProviderName string
oauth2Provider string
disableLocalAuth bool
pocketConsumerKey string
@ -232,6 +234,7 @@ func NewOptions() *Options {
oauth2ClientSecret: defaultOAuth2ClientSecret,
oauth2RedirectURL: defaultOAuth2RedirectURL,
oidcDiscoveryEndpoint: defaultOAuth2OidcDiscoveryEndpoint,
oidcProviderName: defaultOauth2OidcProviderName,
oauth2Provider: defaultOAuth2Provider,
disableLocalAuth: defaultDisableLocalAuth,
pocketConsumerKey: defaultPocketConsumerKey,
@ -454,6 +457,11 @@ func (o *Options) OIDCDiscoveryEndpoint() string {
return o.oidcDiscoveryEndpoint
}
// OIDCProviderName returns the OAuth2 OIDC provider's display name
func (o *Options) OIDCProviderName() string {
return o.oidcProviderName
}
// OAuth2Provider returns the name of the OAuth2 provider configured.
func (o *Options) OAuth2Provider() string {
return o.oauth2Provider
@ -700,6 +708,7 @@ func (o *Options) SortedOptions(redactSecret bool) []*Option {
"OAUTH2_CLIENT_ID": o.oauth2ClientID,
"OAUTH2_CLIENT_SECRET": redactSecretValue(o.oauth2ClientSecret, redactSecret),
"OAUTH2_OIDC_DISCOVERY_ENDPOINT": o.oidcDiscoveryEndpoint,
"OAUTH2_OIDC_PROVIDER_NAME": o.oidcProviderName,
"OAUTH2_PROVIDER": o.oauth2Provider,
"OAUTH2_REDIRECT_URL": o.oauth2RedirectURL,
"OAUTH2_USER_CREATION": o.oauth2UserCreationAllowed,