refac

Author: tjbck

backend/open_webui/config.py

@@ -687,7 +687,6 @@ def google_oauth_register(oauth: OAuth):
             return client
 
         OAUTH_PROVIDERS['google'] = {
-            'redirect_uri': GOOGLE_REDIRECT_URI.value,
             'register': google_oauth_register,
         }
 
@@ -708,7 +707,6 @@ def microsoft_oauth_register(oauth: OAuth):
             return client
 
         OAUTH_PROVIDERS['microsoft'] = {
-            'redirect_uri': MICROSOFT_REDIRECT_URI.value,
             'picture_url': MICROSOFT_CLIENT_PICTURE_URL.value,
             'register': microsoft_oauth_register,
         }
@@ -733,7 +731,6 @@ def github_oauth_register(oauth: OAuth):
             return client
 
         OAUTH_PROVIDERS['github'] = {
-            'redirect_uri': GITHUB_CLIENT_REDIRECT_URI.value,
             'register': github_oauth_register,
             'sub_claim': 'id',
         }
@@ -775,7 +772,6 @@ def oidc_oauth_register(oauth: OAuth):
 
         OAUTH_PROVIDERS['oidc'] = {
             'name': OAUTH_PROVIDER_NAME.value,
-            'redirect_uri': OPENID_REDIRECT_URI.value,
             'register': oidc_oauth_register,
         }
 

backend/open_webui/utils/oauth.py

@@ -1354,12 +1354,13 @@ async def handle_login(self, request, provider):
         if provider not in OAUTH_PROVIDERS:
             raise HTTPException(404)
         # If the provider has a custom redirect URL, use that, otherwise automatically generate one
-        redirect_uri = OAUTH_PROVIDERS[provider].get('redirect_uri') or request.url_for(
-            'oauth_login_callback', provider=provider
-        )
         client = self.get_client(provider)
         if client is None:
             raise HTTPException(404)
+        redirect_uri = (
+            (client.server_metadata or {}).get('redirect_uri')
+            or request.url_for('oauth_login_callback', provider=provider)
+        )
 
         kwargs = {}
         if auth_manager_config.OAUTH_AUDIENCE: