refac

Author: tjbck

backend/open_webui/config.py

@@ -469,6 +469,12 @@ def __getattr__(self, key):
     os.environ.get("OPENID_PROVIDER_URL", ""),
 )
 
+OPENID_END_SESSION_ENDPOINT = PersistentConfig(
+    "OPENID_END_SESSION_ENDPOINT",
+    "oauth.oidc.end_session_endpoint",
+    os.environ.get("OPENID_END_SESSION_ENDPOINT", ""),
+)
+
 OPENID_REDIRECT_URI = PersistentConfig(
     "OPENID_REDIRECT_URI",
     "oauth.oidc.redirect_uri",
@@ -844,13 +850,14 @@ def feishu_oauth_register(oauth: OAuth):
     if FEISHU_CLIENT_ID.value:
         configured_providers.append("Feishu")
 
-    if configured_providers and not OPENID_PROVIDER_URL.value:
+    if configured_providers and not OPENID_PROVIDER_URL.value and not OPENID_END_SESSION_ENDPOINT.value:
         provider_list = ", ".join(configured_providers)
         log.warning(
             f"⚠️  OAuth providers configured ({provider_list}) but OPENID_PROVIDER_URL not set - logout will not work!"
         )
         log.warning(
-            f"Set OPENID_PROVIDER_URL to your OAuth provider's OpenID Connect discovery endpoint to fix logout functionality."
+            f"Set OPENID_PROVIDER_URL to your OAuth provider's OpenID Connect discovery endpoint,"
+            f" or set OPENID_END_SESSION_ENDPOINT to a custom logout URL to fix logout functionality."
         )
 
 

backend/open_webui/routers/auths.py

@@ -46,6 +46,7 @@
 from fastapi.responses import RedirectResponse, Response, JSONResponse
 from open_webui.config import (
     OPENID_PROVIDER_URL,
+    OPENID_END_SESSION_ENDPOINT,
     ENABLE_OAUTH_SIGNUP,
     ENABLE_LDAP,
     ENABLE_PASSWORD_AUTH,
@@ -824,6 +825,19 @@ async def signout(
         response.delete_cookie("oauth_session_id")
 
         session = OAuthSessions.get_session_by_id(oauth_session_id, db=db)
+
+        # If a custom end_session_endpoint is configured (e.g. AWS Cognito), redirect
+        # there directly instead of attempting OIDC discovery.
+        if OPENID_END_SESSION_ENDPOINT.value:
+            return JSONResponse(
+                status_code=200,
+                content={
+                    "status": True,
+                    "redirect_url": OPENID_END_SESSION_ENDPOINT.value,
+                },
+                headers=response.headers,
+            )
+
         oauth_server_metadata_url = (
             request.app.state.oauth_manager.get_server_metadata_url(session.provider)
             if session