Added support for AAD auth

Azure · Jan 7, 2021 · 5ca5c4b · 5ca5c4b
1 parent 0d70f57
commit 5ca5c4b
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 7 deletions.
diff --git a/...-administration/azure/communication/administration/_phone_number_administration_client.py b/...-administration/azure/communication/administration/_phone_number_administration_client.py
@@ -31,8 +31,7 @@
     UpdatePhoneNumberCapabilitiesResponse
 )
 
-from ._shared.utils import parse_connection_str
-from ._shared.policy import HMACCredentialsPolicy
+from ._shared.utils import parse_connection_str, get_authentication_policy
 from ._version import SDK_MONIKER
 
 class PhoneNumberAdministrationClient(object):
@@ -64,7 +63,7 @@ def __init__(
         self._endpoint = endpoint
         self._phone_number_administration_client = PhoneNumberAdministrationClientGen(
             self._endpoint,
-            authentication_policy=HMACCredentialsPolicy(endpoint, credential),
+            authentication_policy=get_authentication_policy(endpoint, credential),
             sdk_moniker=SDK_MONIKER,
             **kwargs)
 

diff --git a/...ation/azure/communication/administration/aio/_phone_number_administration_client_async.py b/...ation/azure/communication/administration/aio/_phone_number_administration_client_async.py
@@ -38,8 +38,7 @@
     UpdatePhoneNumberCapabilitiesResponse
 )
 
-from .._shared.utils import parse_connection_str
-from .._shared.policy import HMACCredentialsPolicy
+from .._shared.utils import parse_connection_str, get_authentication_policy
 
 class PhoneNumberAdministrationClient(object):
     """Azure Communication Services Phone Number Management client.
@@ -70,7 +69,7 @@ def __init__(
         self._endpoint = endpoint
         self._phone_number_administration_client = PhoneNumberAdministrationClientGen(
             self._endpoint,
-            authentication_policy=HMACCredentialsPolicy(endpoint, credential),
+            authentication_policy=get_authentication_policy(endpoint, credential),
             sdk_moniker=SDK_MONIKER,
             **kwargs)
 

diff --git a/...ation/azure-communication-administration/tests/test_phone_number_administration_client.py b/...ation/azure-communication-administration/tests/test_phone_number_administration_client.py
@@ -12,15 +12,23 @@
     NumberUpdateCapabilities,
     CreateSearchOptions
 )
+from azure.core.credentials import AccessToken
 from phone_number_helper import PhoneNumberUriReplacer
 from phone_number_testcase import PhoneNumberCommunicationTestCase
 from _shared.testcase import BodyReplacerProcessor
+from azure.identity import DefaultAzureCredential
+from azure.communication.administration._shared.utils import parse_connection_str
 
 SKIP_PHONE_NUMBER_TESTS = True
 PHONE_NUMBER_TEST_SKIP_REASON= "Phone Number Administration live tests infra not ready yet"
 
-class PhoneNumberAdministrationClientTest(PhoneNumberCommunicationTestCase):
+class FakeTokenCredential(object):
+    def __init__(self):
+        self.token = AccessToken("Fake Token", 0)
 
+    def get_token(self, *args):
+        return self.token
+class PhoneNumberAdministrationClientTest(PhoneNumberCommunicationTestCase):
     def setUp(self):
         super(PhoneNumberAdministrationClientTest, self).setUp()
         self.recording_processors.extend([
@@ -125,6 +133,20 @@ def setUp(self):
             self.capabilities_id = "capabilities_id"
             self.release_id = "release_id"
 
+    @pytest.mark.live_test_only
+    @pytest.mark.skipif(SKIP_PHONE_NUMBER_TESTS, reason=PHONE_NUMBER_TEST_SKIP_REASON)
+    def test_list_all_phone_numbers_from_managed_identity(self, connection_string):
+        endpoint, access_key = parse_connection_str(connection_string)
+        from devtools_testutils import is_live
+        if not is_live():
+            credential = FakeTokenCredential()
+        else:
+            credential = DefaultAzureCredential()
+        phone_number_client = PhoneNumberAdministrationClient(endpoint, credential)
+        user = identity_client.create_user()
+
+        assert user.identifier is not None
+
     @pytest.mark.live_test_only
     @pytest.mark.skipif(SKIP_PHONE_NUMBER_TESTS, reason=PHONE_NUMBER_TEST_SKIP_REASON)
     def test_list_all_phone_numbers(self):

diff --git a/...azure-communication-administration/tests/test_phone_number_administration_client_async.py b/...azure-communication-administration/tests/test_phone_number_administration_client_async.py
@@ -5,7 +5,9 @@
 # license information.
 # --------------------------------------------------------------------------
 import pytest
+from azure.core.credentials import AccessToken
 from azure.communication.administration.aio import PhoneNumberAdministrationClient
+from azure.communication.administration._shared.utils import parse_connection_str
 from azure.communication.administration import (
     PstnConfiguration,
     NumberUpdateCapabilities,
@@ -14,11 +16,18 @@
 from phone_number_helper import PhoneNumberUriReplacer
 from phone_number_testcase_async import AsyncPhoneNumberCommunicationTestCase
 from _shared.testcase import BodyReplacerProcessor, ResponseReplacerProcessor
+from azure.identity import DefaultAzureCredential
 import os
 
 SKIP_PHONE_NUMBER_TESTS = True
 PHONE_NUMBER_TEST_SKIP_REASON= "Phone Number Administration live tests infra not ready yet"
 
+class FakeTokenCredential(object):
+    def __init__(self):
+        self.token = AccessToken("Fake Token", 0)
+
+    def get_token(self, *args):
+        return self.token
 class PhoneNumberAdministrationClientTestAsync(AsyncPhoneNumberCommunicationTestCase):
 
     def setUp(self):
@@ -126,6 +135,22 @@ def setUp(self):
             self.capabilities_id = "capabilities_id"
             self.release_id = "release_id"
 
+    @AsyncPhoneNumberCommunicationTestCase.await_prepared_test
+    @pytest.mark.live_test_only
+    @pytest.mark.skipif(SKIP_PHONE_NUMBER_TESTS, reason=PHONE_NUMBER_TEST_SKIP_REASON)
+    async def test_create_user_from_managed_identity(self, connection_string):
+        endpoint, access_key = parse_connection_str(connection_string)
+        from devtools_testutils import is_live
+        if not is_live():
+            credential = FakeTokenCredential()
+        else:
+            credential = DefaultAzureCredential()
+        identity_client = CommunicationIdentityClient(endpoint, credential)
+        async with identity_client:
+            user = await identity_client.create_user()
+
+        assert user.identifier is not None
+
     @AsyncPhoneNumberCommunicationTestCase.await_prepared_test
     @pytest.mark.live_test_only
     @pytest.mark.skipif(SKIP_PHONE_NUMBER_TESTS, reason=PHONE_NUMBER_TEST_SKIP_REASON)