ti.sil/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui.git synced 2025-12-12 20:35:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refac/fix: oauth

Browse source
This commit is contained in:
Timothy Jaeryang Baek 2025-10-05 14:22:00 -05:00
parent 713f0ef9ce
commit 062264c7f6
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
backend/open_webui/config.py
View file

@ -606,7 +606,7 @@ def load_oauth_providers():
if GOOGLE_CLIENT_ID.value and GOOGLE_CLIENT_SECRET.value: if GOOGLE_CLIENT_ID.value and GOOGLE_CLIENT_SECRET.value:
def google_oauth_register(oauth: OAuth): def google_oauth_register(oauth: OAuth):
return oauth.register( client = oauth.register(
name="google", name="google",
client_id=GOOGLE_CLIENT_ID.value, client_id=GOOGLE_CLIENT_ID.value,
client_secret=GOOGLE_CLIENT_SECRET.value, client_secret=GOOGLE_CLIENT_SECRET.value,
@ -621,6 +621,7 @@ def load_oauth_providers():
}, },
redirect_uri=GOOGLE_REDIRECT_URI.value, redirect_uri=GOOGLE_REDIRECT_URI.value,
) )
return client
OAUTH_PROVIDERS["google"] = { OAUTH_PROVIDERS["google"] = {
"redirect_uri": GOOGLE_REDIRECT_URI.value, "redirect_uri": GOOGLE_REDIRECT_URI.value,
@ -634,7 +635,7 @@ def load_oauth_providers():
): ):
def microsoft_oauth_register(oauth: OAuth): def microsoft_oauth_register(oauth: OAuth):
return oauth.register( client = oauth.register(
name="microsoft", name="microsoft",
client_id=MICROSOFT_CLIENT_ID.value, client_id=MICROSOFT_CLIENT_ID.value,
client_secret=MICROSOFT_CLIENT_SECRET.value, client_secret=MICROSOFT_CLIENT_SECRET.value,
@ -649,6 +650,7 @@ def load_oauth_providers():
}, },
redirect_uri=MICROSOFT_REDIRECT_URI.value, redirect_uri=MICROSOFT_REDIRECT_URI.value,
) )
return client
OAUTH_PROVIDERS["microsoft"] = { OAUTH_PROVIDERS["microsoft"] = {
"redirect_uri": MICROSOFT_REDIRECT_URI.value, "redirect_uri": MICROSOFT_REDIRECT_URI.value,
@ -659,7 +661,7 @@ def load_oauth_providers():
if GITHUB_CLIENT_ID.value and GITHUB_CLIENT_SECRET.value: if GITHUB_CLIENT_ID.value and GITHUB_CLIENT_SECRET.value:
def github_oauth_register(oauth: OAuth): def github_oauth_register(oauth: OAuth):
return oauth.register( client = oauth.register(
name="github", name="github",
client_id=GITHUB_CLIENT_ID.value, client_id=GITHUB_CLIENT_ID.value,
client_secret=GITHUB_CLIENT_SECRET.value, client_secret=GITHUB_CLIENT_SECRET.value,
@ -677,6 +679,7 @@ def load_oauth_providers():
}, },
redirect_uri=GITHUB_CLIENT_REDIRECT_URI.value, redirect_uri=GITHUB_CLIENT_REDIRECT_URI.value,
) )
return client
OAUTH_PROVIDERS["github"] = { OAUTH_PROVIDERS["github"] = {
"redirect_uri": GITHUB_CLIENT_REDIRECT_URI.value, "redirect_uri": GITHUB_CLIENT_REDIRECT_URI.value,
@ -716,7 +719,7 @@ def load_oauth_providers():
% ("S256", OAUTH_CODE_CHALLENGE_METHOD.value) % ("S256", OAUTH_CODE_CHALLENGE_METHOD.value)
) )
return oauth.register( client = oauth.register(
name="oidc", name="oidc",
client_id=OAUTH_CLIENT_ID.value, client_id=OAUTH_CLIENT_ID.value,
client_secret=OAUTH_CLIENT_SECRET.value, client_secret=OAUTH_CLIENT_SECRET.value,
@ -724,6 +727,7 @@ def load_oauth_providers():
client_kwargs=client_kwargs, client_kwargs=client_kwargs,
redirect_uri=OPENID_REDIRECT_URI.value, redirect_uri=OPENID_REDIRECT_URI.value,
) )
return client
OAUTH_PROVIDERS["oidc"] = { OAUTH_PROVIDERS["oidc"] = {
"name": OAUTH_PROVIDER_NAME.value, "name": OAUTH_PROVIDER_NAME.value,
@ -734,7 +738,7 @@ def load_oauth_providers():
if FEISHU_CLIENT_ID.value and FEISHU_CLIENT_SECRET.value: if FEISHU_CLIENT_ID.value and FEISHU_CLIENT_SECRET.value:
def feishu_oauth_register(oauth: OAuth): def feishu_oauth_register(oauth: OAuth):
return oauth.register( client = oauth.register(
name="feishu", name="feishu",
client_id=FEISHU_CLIENT_ID.value, client_id=FEISHU_CLIENT_ID.value,
client_secret=FEISHU_CLIENT_SECRET.value, client_secret=FEISHU_CLIENT_SECRET.value,
@ -752,6 +756,7 @@ def load_oauth_providers():
}, },
redirect_uri=FEISHU_REDIRECT_URI.value, redirect_uri=FEISHU_REDIRECT_URI.value,
) )
return client
OAUTH_PROVIDERS["feishu"] = { OAUTH_PROVIDERS["feishu"] = {
"register": feishu_oauth_register, "register": feishu_oauth_register,

8
backend/open_webui/utils/oauth.py
View file

@ -367,8 +367,8 @@ class OAuthClientManager:
if client_id in self.clients: if client_id in self.clients:
client = self.clients[client_id] client = self.clients[client_id]
return ( return (
client.server_metadata_url client._server_metadata_url
if hasattr(client, "server_metadata_url") if hasattr(client, "_server_metadata_url")
else None else None
) )
return None return None
@ -633,8 +633,8 @@ class OAuthManager:
if provider_name in self._clients: if provider_name in self._clients:
client = self._clients[provider_name] client = self._clients[provider_name]
return ( return (
client.server_metadata_url client._server_metadata_url
if hasattr(client, "server_metadata_url") if hasattr(client, "_server_metadata_url")
else None else None
) )
return None return None