Remove associated_client

Author: adamjmcgrath

packages/auth0_api_python/README.md

@@ -98,10 +98,8 @@ async def main():
     api_client = ApiClient(ApiClientOptions(
         domain="<AUTH0_DOMAIN>",
         audience="<AUTH0_AUDIENCE>",
-        associated_client={
-            "client_id": "<AUTH0_CLIENT_ID>",
-            "client_secret": "<AUTH0_CLIENT_SECRET>"
-        }
+        client_id="<AUTH0_CLIENT_ID>",
+        client_secret="<AUTH0_CLIENT_SECRET>",
     ))
     connection = "my-connection" # The Auth0 connection to the upstream idp
     access_token = "..." # The Auth0 access token to exchange

packages/auth0_api_python/src/auth0_api_python/api_client.py

@@ -422,9 +422,10 @@ async def get_access_token_for_connection(self, options: dict[str, Any]) -> dict
         if not access_token:
             raise MissingRequiredArgumentError("access_token")
 
-        associated_client = self.options.associated_client
-        if not associated_client:
-            raise GetAccessTokenForConnectionError("You must configure the SDK with an associated_client to use get_access_token_for_connection.")
+        client_id = self.options.client_id
+        client_secret = self.options.client_secret
+        if not client_id or not client_secret:
+            raise GetAccessTokenForConnectionError("You must configure the SDK with a client_id and client_secret to use get_access_token_for_connection.")
 
         metadata = await self._discover()
 
@@ -437,7 +438,7 @@ async def get_access_token_for_connection(self, options: dict[str, Any]) -> dict
             "connection": connection,
             "requested_token_type": REQUESTED_TOKEN_TYPE_FEDERATED_CONNECTION_ACCESS_TOKEN,
             "grant_type": GRANT_TYPE_FEDERATED_CONNECTION_ACCESS_TOKEN,
-            "client_id": associated_client["client_id"],
+            "client_id": client_id,
             "subject_token": access_token,
             "subject_token_type": SUBJECT_TYPE_ACCESS_TOKEN,
         }
@@ -450,7 +451,7 @@ async def get_access_token_for_connection(self, options: dict[str, Any]) -> dict
             response = await client.post(
                 token_endpoint,
                 data=params,
-                auth=(associated_client["client_id"], associated_client["client_secret"])
+                auth=(client_id, client_secret)
             )
 
             if response.status_code != 200:

packages/auth0_api_python/src/auth0_api_python/config.py

@@ -4,8 +4,6 @@
 
 from typing import Callable, Optional
 
-from auth0_api_python.errors import MissingRequiredArgumentError
-
 
 class ApiClientOptions:
     """
@@ -19,8 +17,8 @@ class ApiClientOptions:
         dpop_required: Whether DPoP is required (default: False, allows both Bearer and DPoP).
         dpop_iat_leeway: Leeway in seconds for DPoP proof iat claim (default: 30).
         dpop_iat_offset: Maximum age in seconds for DPoP proof iat claim (default: 300).
-        associated_client: Optional required if you want to use get_access_token_for_connection.
-            Must be a dict with 'client_id' and 'client_secret' keys.
+        client_id: Optional required if you want to use get_access_token_for_connection.
+        client_secret: Optional required if you want to use get_access_token_for_connection.
     """
     def __init__(
         self,
@@ -31,7 +29,8 @@ def __init__(
         dpop_required: bool = False,
         dpop_iat_leeway: int = 30,
         dpop_iat_offset: int = 300,
-        associated_client: Optional[dict] = None,
+        client_id: Optional[str] = None,
+        client_secret: Optional[str] = None,
     ):
         self.domain = domain
         self.audience = audience
@@ -40,9 +39,5 @@ def __init__(
         self.dpop_required = dpop_required
         self.dpop_iat_leeway = dpop_iat_leeway
         self.dpop_iat_offset = dpop_iat_offset
-        self.associated_client = associated_client
-        if associated_client:
-            if not associated_client.get("client_id"):
-                raise MissingRequiredArgumentError("associated_client.client_id")
-            if not associated_client.get("client_secret"):
-                raise MissingRequiredArgumentError("associated_client.client_secret")
+        self.client_id = client_id
+        self.client_secret = client_secret

packages/auth0_api_python/tests/test_api_client.py

@@ -1609,7 +1609,8 @@ async def test_get_access_token_for_connection_success(httpx_mock: HTTPXMock):
     options = ApiClientOptions(
         domain="auth0.local",
         audience="my-audience",
-        associated_client={"client_id": "cid", "client_secret": "csecret"}
+        client_id="cid",
+        client_secret="csecret",
     )
     api_client = ApiClient(options)
     result = await api_client.get_access_token_for_connection({
@@ -1637,7 +1638,8 @@ async def test_get_access_token_for_connection_with_login_hint(httpx_mock: HTTPX
     options = ApiClientOptions(
         domain="auth0.local",
         audience="my-audience",
-        associated_client={"client_id": "cid", "client_secret": "csecret"}
+        client_id="cid",
+        client_secret="csecret",
     )
     api_client = ApiClient(options)
     result = await api_client.get_access_token_for_connection({
@@ -1658,7 +1660,8 @@ async def test_get_access_token_for_connection_missing_connection():
     options = ApiClientOptions(
         domain="auth0.local",
         audience="my-audience",
-        associated_client={"client_id": "cid", "client_secret": "csecret"}
+        client_id="cid",
+        client_secret="csecret",
     )
     api_client = ApiClient(options)
     with pytest.raises(MissingRequiredArgumentError):
@@ -1672,7 +1675,8 @@ async def test_get_access_token_for_connection_missing_access_token():
     options = ApiClientOptions(
         domain="auth0.local",
         audience="my-audience",
-        associated_client={"client_id": "cid", "client_secret": "csecret"}
+        client_id="cid",
+        client_secret="csecret",
     )
     api_client = ApiClient(options)
     with pytest.raises(MissingRequiredArgumentError):
@@ -1682,19 +1686,21 @@ async def test_get_access_token_for_connection_missing_access_token():
 
 
 @pytest.mark.asyncio
-async def test_get_access_token_for_connection_no_associated_client():
+async def test_get_access_token_for_connection_no_client_id():
     options = ApiClientOptions(
         domain="auth0.local",
         audience="my-audience"
-        # associated_client missing
+        # client_id missing
     )
     api_client = ApiClient(options)
-    with pytest.raises(GetAccessTokenForConnectionError):
+    with pytest.raises(GetAccessTokenForConnectionError) as err:
         await api_client.get_access_token_for_connection({
             "connection": "test-conn",
             "access_token": "user-token"
         })
 
+    assert "You must configure the SDK with a client_id and client_secret to use get_access_token_for_connection." == str(err.value)
+
 
 @pytest.mark.asyncio
 async def test_get_access_token_for_connection_token_endpoint_error(httpx_mock: HTTPXMock):
@@ -1714,7 +1720,8 @@ async def test_get_access_token_for_connection_token_endpoint_error(httpx_mock:
     options = ApiClientOptions(
         domain="auth0.local",
         audience="my-audience",
-        associated_client={"client_id": "cid", "client_secret": "csecret"}
+        client_id="cid",
+        client_secret="csecret",
     )
     api_client = ApiClient(options)
     with pytest.raises(ApiError) as err: