Added support for params in logout URL and encoded post redirect URL

OCA · Jun 13, 2024 · 29e295b · 29e295b
1 parent b7e96b9
commit 29e295b
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/auth_oidc/controllers/main.py b/auth_oidc/controllers/main.py
@@ -62,7 +62,15 @@ def logout(self, redirect="/web/login"):
             p = request.env["auth.oauth.provider"].sudo().browse(user.oauth_provider_id.id)
             if p.logout_endpoint:
                 r = request.env['ir.config_parameter'].sudo().get_param('web.base.url') + redirect
-                logout_url = p.logout_endpoint + "?client_id=" + p.client_id + "&post_logout_redirect_uri=" + r
+                logout_base_url = p.logout_endpoint
+                params = {}
+                if '?' in p.logout_endpoint:
+                    url_parts = p.logout_endpoint.split("?")
+                    logout_base_url = url_parts[0]
+                    params = url_decode(url_parts[1])
+                params["client_id"] = p.client_id
+                params["post_logout_redirect_uri"] = r
+                logout_url = f"{logout_base_url}?{url_encode(params)}"
                 return super().logout(redirect=logout_url)
         # User has no account with any provider or no logout URL is configured for the provider
         return super().logout(redirect=redirect)