From cde72dab71671645e119564ca9747ce25dd590ad Mon Sep 17 00:00:00 2001
From: Timothy Jaeryang Baek <tim@openwebui.com>
Date: Sat, 9 May 2026 02:54:09 +0900
Subject: [PATCH] refac

---
 backend/open_webui/config.py      | 6 ++++++
 backend/open_webui/utils/oauth.py | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/backend/open_webui/config.py b/backend/open_webui/config.py
index 3cfb4ce21d..3cba80a9d4 100644
--- a/backend/open_webui/config.py
+++ b/backend/open_webui/config.py
@@ -1209,6 +1209,12 @@ TOOL_SERVER_CONNECTIONS = PersistentConfig(
     tool_server_connections,
 )
 
+OAUTH_CLIENT_TIMEOUT = PersistentConfig(
+    'OAUTH_CLIENT_TIMEOUT',
+    'oauth.client.timeout',
+    os.environ.get('OAUTH_CLIENT_TIMEOUT', ''),
+)
+
 ####################################
 # TERMINAL_SERVER
 ####################################
diff --git a/backend/open_webui/utils/oauth.py b/backend/open_webui/utils/oauth.py
index 4a7d79d87c..ddc5bed74c 100644
--- a/backend/open_webui/utils/oauth.py
+++ b/backend/open_webui/utils/oauth.py
@@ -37,6 +37,7 @@ from open_webui.models.groups import Groups, GroupModel, GroupUpdateForm, GroupF
 from open_webui.config import (
     DEFAULT_USER_ROLE,
     ENABLE_OAUTH_SIGNUP,
+    OAUTH_CLIENT_TIMEOUT,
     OAUTH_REFRESH_TOKEN_INCLUDE_SCOPE,
     OAUTH_MERGE_ACCOUNTS_BY_EMAIL,
     OAUTH_PROVIDERS,
@@ -597,6 +598,7 @@ class OAuthClientManager:
             'client_secret': oauth_client_info.client_secret,
             'client_kwargs': {
                 'follow_redirects': True,
+                **({'timeout': int(OAUTH_CLIENT_TIMEOUT.value)} if OAUTH_CLIENT_TIMEOUT.value else {}),
                 **({'scope': oauth_client_info.scope} if oauth_client_info.scope else {}),
                 **(
                     {'token_endpoint_auth_method': oauth_client_info.token_endpoint_auth_method}