ClientAssertionCredential constructor fails if kwargs are provided (#33677)

* no need to call ABC.init

* update

* aio cac

* update

* black

* add tests

* update

Author: xiangyan99

sdk/identity/azure-identity/CHANGELOG.md

@@ -8,6 +8,8 @@
 
 ### Bugs Fixed
 
+- Fixed the bug that `ClientAssertionCredential` constructor fails if kwargs are provided. ([#33673](https://github.com/Azure/azure-sdk-for-python/issues/33673))
+
 ### Other Changes
 
 ## 1.15.0 (2023-10-26)

sdk/identity/azure-identity/azure/identity/_credentials/client_assertion.py

@@ -40,7 +40,19 @@ class ClientAssertionCredential(GetTokenMixin):
 
     def __init__(self, tenant_id: str, client_id: str, func: Callable[[], str], **kwargs: Any) -> None:
         self._func = func
-        self._client = AadClient(tenant_id, client_id, **kwargs)
+        authority = kwargs.pop("authority", None)
+        cache = kwargs.pop("cache", None)
+        cae_cache = kwargs.pop("cae_cache", None)
+        additionally_allowed_tenants = kwargs.pop("additionally_allowed_tenants", None)
+        self._client = AadClient(
+            tenant_id,
+            client_id,
+            authority=authority,
+            cache=cache,
+            cae_cache=cae_cache,
+            additionally_allowed_tenants=additionally_allowed_tenants,
+            **kwargs
+        )
         super(ClientAssertionCredential, self).__init__(**kwargs)
 
     def __enter__(self):

sdk/identity/azure-identity/azure/identity/aio/_credentials/client_assertion.py

@@ -40,7 +40,19 @@ class ClientAssertionCredential(AsyncContextManager, GetTokenMixin):
 
     def __init__(self, tenant_id: str, client_id: str, func: Callable[[], str], **kwargs: Any) -> None:
         self._func = func
-        self._client = AadClient(tenant_id, client_id, **kwargs)
+        authority = kwargs.pop("authority", None)
+        cache = kwargs.pop("cache", None)
+        cae_cache = kwargs.pop("cae_cache", None)
+        additionally_allowed_tenants = kwargs.pop("additionally_allowed_tenants", None)
+        self._client = AadClient(
+            tenant_id,
+            client_id,
+            authority=authority,
+            cache=cache,
+            cae_cache=cae_cache,
+            additionally_allowed_tenants=additionally_allowed_tenants,
+            **kwargs
+        )
         super().__init__(**kwargs)
 
     async def __aenter__(self):

sdk/identity/azure-identity/tests/test_client_assertion_credential.py

@@ -0,0 +1,16 @@
+# ------------------------------------
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+# ------------------------------------
+from typing import Callable
+from azure.identity import ClientAssertionCredential
+
+
+def test_init_with_kwargs():
+    tenant_id: str = "TENANT_ID"
+    client_id: str = "CLIENT_ID"
+    func: Callable[[], str] = lambda: "TOKEN"
+
+    credential: ClientAssertionCredential = ClientAssertionCredential(
+        tenant_id=tenant_id, client_id=client_id, func=func, authority="a"
+    )

sdk/identity/azure-identity/tests/test_client_assertion_credential_async.py

@@ -0,0 +1,16 @@
+# ------------------------------------
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+# ------------------------------------
+from typing import Callable
+from azure.identity.aio import ClientAssertionCredential
+
+
+def test_init_with_kwargs():
+    tenant_id: str = "TENANT_ID"
+    client_id: str = "CLIENT_ID"
+    func: Callable[[], str] = lambda: "TOKEN"
+
+    credential: ClientAssertionCredential = ClientAssertionCredential(
+        tenant_id=tenant_id, client_id=client_id, func=func, authority="a"
+    )