From 3cf1163d057e063ed3bf4944f47628cf43069166 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Tue, 21 Nov 2023 06:19:50 +0100 Subject: [PATCH] revert: don't make loadUserInfo configurable because web disabled it Refs: 3eb1f18 --- services/web/pkg/config/config.go | 1 - services/web/pkg/config/defaults/defaultconfig.go | 1 - 2 files changed, 2 deletions(-) diff --git a/services/web/pkg/config/config.go b/services/web/pkg/config/config.go index b62ca4041..a244fb553 100644 --- a/services/web/pkg/config/config.go +++ b/services/web/pkg/config/config.go @@ -71,7 +71,6 @@ type OIDC struct { ResponseType string `json:"response_type,omitempty" yaml:"response_type" env:"WEB_OIDC_RESPONSE_TYPE" desc:"The OIDC response type to use for authentication."` Scope string `json:"scope,omitempty" yaml:"scope" env:"WEB_OIDC_SCOPE" desc:"OIDC scopes to request during authentication to authorize access to user details. Defaults to 'openid profile email'. Values are separated by blank. More example values but not limited to are 'address' or 'phone' etc."` PostLogoutRedirectURI string `json:"post_logout_redirect_uri,omitempty" yaml:"post_logout_redirect_uri" env:"WEB_OIDC_POST_LOGOUT_REDIRECT_URI" desc:"This value needs to point to a valid and reachable web page. The web client will trigger a redirect to that page directly after the logout action. The default value is empty and redirects to the login page."` - LoadUserInfo bool `json:"loadUserInfo" yaml:"load_userinfo" env:"WEB_OIDC_LOAD_USERINFO" desc:"Make a call to the oidc userinfo endpoint of the idp. For on premise AD FS this must be set to 'false'. The default is 'true'."` } // Application defines an application for the Web app switcher. diff --git a/services/web/pkg/config/defaults/defaultconfig.go b/services/web/pkg/config/defaults/defaultconfig.go index b186507c8..ad50ca93a 100644 --- a/services/web/pkg/config/defaults/defaultconfig.go +++ b/services/web/pkg/config/defaults/defaultconfig.go @@ -95,7 +95,6 @@ func DefaultConfig() *config.Config { ClientID: "web", ResponseType: "code", Scope: "openid profile email", - LoadUserInfo: true, }, Apps: []string{"files", "search", "text-editor", "pdf-viewer", "external", "admin-settings"}, ExternalApps: []config.ExternalApp{