Fix relative URL getter when host is set

Author: frankie567

fief_client/client.py

@@ -253,7 +253,8 @@ def _get_endpoint_url(
         rather stick to the host specified on the client configuration.
         """
         if not absolute:
-            return openid_configuration[field].split(self.base_url)[1]
+            issuer = openid_configuration["issuer"]
+            return openid_configuration[field].split(issuer)[1]
         return openid_configuration[field]
 
     def _auth_url(

tests/conftest.py

@@ -119,6 +119,7 @@ def _get_api_requests_mock(
             openid_configuration_route.return_value = Response(
                 200,
                 json={
+                    "issuer": f"{hostname}{path_prefix}",
                     "authorization_endpoint": f"{hostname}{path_prefix}/authorize",
                     "token_endpoint": f"{hostname}{path_prefix}/token",
                     "userinfo_endpoint": f"{hostname}{path_prefix}/userinfo",
@@ -132,7 +133,9 @@ def _get_api_requests_mock(
                 json={"keys": [signature_key.export(private_key=False, as_dict=True)]},
             )
 
+            print("YIELD")
             yield respx_mock
+        print("RESET")
 
     return _get_api_requests_mock
 

tests/test_client.py

@@ -242,24 +242,13 @@ async def test_authorization_url_async(
         assert request.url.host == request.headers["Host"]
 
     def test_authorization_url_tenant(
-        self, fief_client_tenant: Fief, mock_api_requests: respx.MockRouter
+        self, fief_client_tenant: Fief, get_api_requests_mock: GetAPIRequestsMock
     ):
-        openid_configuration_route = mock_api_requests.get(
-            "/secondary/.well-known/openid-configuration"
-        )
-        openid_configuration_route.return_value = Response(
-            200,
-            json={
-                "authorization_endpoint": "https://bretagne.fief.dev/secondary/authorize",
-                "token_endpoint": "https://bretagne.fief.dev/secondary/token",
-                "userinfo_endpoint": "https://bretagne.fief.dev/secondary/userinfo",
-                "jwks_uri": "https://bretagne.fief.dev/secondary/.well-known/jwks.json",
-            },
-        )
+        with get_api_requests_mock(path_prefix="/secondary"):
+            authorize_url = fief_client_tenant.auth_url(
+                "https://www.bretagne.duchy/callback"
+            )
 
-        authorize_url = fief_client_tenant.auth_url(
-            "https://www.bretagne.duchy/callback"
-        )
         assert (
             authorize_url
             == "https://bretagne.fief.dev/secondary/authorize?response_type=code&client_id=CLIENT_ID&redirect_uri=https%3A%2F%2Fwww.bretagne.duchy%2Fcallback"