ti.sil/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui.git synced 2025-12-12 04:15:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

refac

Browse source
This commit is contained in:
Timothy Jaeryang Baek 2025-06-28 00:48:24 +04:00
parent bfd92ec4af
commit ff639a20d0
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
backend/open_webui/config.py
View file

@ -434,7 +434,7 @@ OAUTH_SCOPES = PersistentConfig(
OAUTH_TIMEOUT = PersistentConfig( OAUTH_TIMEOUT = PersistentConfig(
"OAUTH_TIMEOUT", "OAUTH_TIMEOUT",
"oauth.oidc.oauth_timeout", "oauth.oidc.oauth_timeout",
os.environ.get("OAUTH_TIMEOUT", 5), os.environ.get("OAUTH_TIMEOUT", ""),
) )
OAUTH_CODE_CHALLENGE_METHOD = PersistentConfig( OAUTH_CODE_CHALLENGE_METHOD = PersistentConfig(
@ -548,8 +548,12 @@ def load_oauth_providers():
server_metadata_url="https://accounts.google.com/.well-known/openid-configuration", server_metadata_url="https://accounts.google.com/.well-known/openid-configuration",
client_kwargs={ client_kwargs={
"scope": GOOGLE_OAUTH_SCOPE.value, "scope": GOOGLE_OAUTH_SCOPE.value,
"timeout": OAUTH_TIMEOUT.value **(
}, {"timeout": int(OAUTH_TIMEOUT.value)}
if OAUTH_TIMEOUT.value
else {}
),
},
redirect_uri=GOOGLE_REDIRECT_URI.value, redirect_uri=GOOGLE_REDIRECT_URI.value,
) )
@ -572,7 +576,11 @@ def load_oauth_providers():
server_metadata_url=f"{MICROSOFT_CLIENT_LOGIN_BASE_URL.value}/{MICROSOFT_CLIENT_TENANT_ID.value}/v2.0/.well-known/openid-configuration?appid={MICROSOFT_CLIENT_ID.value}", server_metadata_url=f"{MICROSOFT_CLIENT_LOGIN_BASE_URL.value}/{MICROSOFT_CLIENT_TENANT_ID.value}/v2.0/.well-known/openid-configuration?appid={MICROSOFT_CLIENT_ID.value}",
client_kwargs={ client_kwargs={
"scope": MICROSOFT_OAUTH_SCOPE.value, "scope": MICROSOFT_OAUTH_SCOPE.value,
"timeout": OAUTH_TIMEOUT.value **(
{"timeout": int(OAUTH_TIMEOUT.value)}
if OAUTH_TIMEOUT.value
else {}
),
}, },
redirect_uri=MICROSOFT_REDIRECT_URI.value, redirect_uri=MICROSOFT_REDIRECT_URI.value,
) )
@ -596,7 +604,11 @@ def load_oauth_providers():
userinfo_endpoint="https://api.github.com/user", userinfo_endpoint="https://api.github.com/user",
client_kwargs={ client_kwargs={
"scope": GITHUB_CLIENT_SCOPE.value, "scope": GITHUB_CLIENT_SCOPE.value,
"timeout": OAUTH_TIMEOUT.value **(
{"timeout": int(OAUTH_TIMEOUT.value)}
if OAUTH_TIMEOUT.value
else {}
),
}, },
redirect_uri=GITHUB_CLIENT_REDIRECT_URI.value, redirect_uri=GITHUB_CLIENT_REDIRECT_URI.value,
) )
@ -616,7 +628,9 @@ def load_oauth_providers():
def oidc_oauth_register(client): def oidc_oauth_register(client):
client_kwargs = { client_kwargs = {
"scope": OAUTH_SCOPES.value, "scope": OAUTH_SCOPES.value,
"timeout": OAUTH_TIMEOUT.value **(
{"timeout": int(OAUTH_TIMEOUT.value)} if OAUTH_TIMEOUT.value else {}
),
} }
if ( if (