From 6e36288ba7e0dc4ef1203a35e240d172f34521d7 Mon Sep 17 00:00:00 2001 From: viehlieb Date: Wed, 7 Dec 2022 16:13:57 +0100 Subject: [PATCH] wip add logout url to config and deliver to frontend --- pkg/modules/auth/openid/openid.go | 1 + pkg/modules/auth/openid/providers.go | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/modules/auth/openid/openid.go b/pkg/modules/auth/openid/openid.go index c282bea8f..e8202195e 100644 --- a/pkg/modules/auth/openid/openid.go +++ b/pkg/modules/auth/openid/openid.go @@ -51,6 +51,7 @@ type Provider struct { Key string `json:"key"` OriginalAuthURL string `json:"-"` AuthURL string `json:"auth_url"` + LogoutURL string `json:"logout_url"` ClientID string `json:"client_id"` ClientSecret string `json:"-"` openIDProvider *oidc.Provider diff --git a/pkg/modules/auth/openid/providers.go b/pkg/modules/auth/openid/providers.go index 149f8b8f7..267e62b69 100644 --- a/pkg/modules/auth/openid/providers.go +++ b/pkg/modules/auth/openid/providers.go @@ -60,6 +60,7 @@ func GetAllProviders() (providers []*Provider, err error) { } provider, err := getProviderFromMap(pi) + if err != nil { if provider != nil { log.Errorf("Error while getting openid provider %s: %s", provider.Name, err) @@ -125,6 +126,7 @@ func getProviderFromMap(pi map[string]interface{}) (provider *Provider, err erro AuthURL: pi["authurl"].(string), OriginalAuthURL: pi["authurl"].(string), ClientSecret: pi["clientsecret"].(string), + LogoutURL: pi["logouturl"].(string), } cl, is := pi["clientid"].(int) @@ -143,7 +145,7 @@ func getProviderFromMap(pi map[string]interface{}) (provider *Provider, err erro ClientID: provider.ClientID, ClientSecret: provider.ClientSecret, RedirectURL: config.AuthOpenIDRedirectURL.GetString() + k, - + LogoutURL: provider.LogoutURL, // Discovery returns the OAuth2 endpoints. Endpoint: provider.openIDProvider.Endpoint(),