microsoft-agents-authentication-msal 0.1.1__tar.gz → 0.2.0.dev1__tar.gz

{microsoft_agents_authentication_msal-0.1.1 → microsoft_agents_authentication_msal-0.2.0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-authentication-msal
-Version: 0.1.1
+Version: 0.2.0.dev1
 Summary: A msal-based authentication library for Microsoft Agents
 Author: Microsoft Corporation
 Project-URL: Homepage, https://github.com/microsoft/Agents
@@ -8,7 +8,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
-Requires-Dist: microsoft-agents-hosting-core==0.1.1
+Requires-Dist: microsoft-agents-hosting-core==0.2.0.dev1
 Requires-Dist: msal>=1.31.1
 Requires-Dist: requests>=2.32.3
 Requires-Dist: cryptography>=44.0.0

{microsoft_agents_authentication_msal-0.1.1 → microsoft_agents_authentication_msal-0.2.0.dev1}/microsoft/agents/authentication/msal/msal_auth.py

@@ -80,9 +80,18 @@ class MsalAuth(AccessTokenProviderBase):
             )
         elif isinstance(msal_auth_client, ConfidentialClientApplication):
             # TODO: Handling token error / acquisition failed
-            return msal_auth_client.acquire_token_on_behalf_of(
+
+            token = msal_auth_client.acquire_token_on_behalf_of(
                 user_assertion=user_assertion, scopes=scopes
-            )["access_token"]
+            )
+
+            if "access_token" not in token:
+                logger.error(
+                    f"Failed to acquire token on behalf of user: {user_assertion}"
+                )
+                raise ValueError(f"Failed to acquire token. {str(token)}")
+
+            return token["access_token"]
 
         logger.error(
             f"On-behalf-of flow is not supported with the current authentication type: {msal_auth_client.__class__.__name__}"

{microsoft_agents_authentication_msal-0.1.1 → microsoft_agents_authentication_msal-0.2.0.dev1}/microsoft/agents/authentication/msal/msal_connection_manager.py

@@ -1,5 +1,5 @@
 from typing import Dict, List, Optional
-from microsoft.agents.hosting.core.authorization import (
+from microsoft.agents.hosting.core import (
     AgentAuthConfiguration,
     AccessTokenProviderBase,
     ClaimsIdentity,

{microsoft_agents_authentication_msal-0.1.1 → microsoft_agents_authentication_msal-0.2.0.dev1}/microsoft_agents_authentication_msal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-authentication-msal
-Version: 0.1.1
+Version: 0.2.0.dev1
 Summary: A msal-based authentication library for Microsoft Agents
 Author: Microsoft Corporation
 Project-URL: Homepage, https://github.com/microsoft/Agents
@@ -8,7 +8,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
-Requires-Dist: microsoft-agents-hosting-core==0.1.1
+Requires-Dist: microsoft-agents-hosting-core==0.2.0.dev1
 Requires-Dist: msal>=1.31.1
 Requires-Dist: requests>=2.32.3
 Requires-Dist: cryptography>=44.0.0

{microsoft_agents_authentication_msal-0.1.1 → microsoft_agents_authentication_msal-0.2.0.dev1}/microsoft_agents_authentication_msal.egg-info/SOURCES.txt

@@ -7,4 +7,6 @@ microsoft_agents_authentication_msal.egg-info/PKG-INFO
 microsoft_agents_authentication_msal.egg-info/SOURCES.txt
 microsoft_agents_authentication_msal.egg-info/dependency_links.txt
 microsoft_agents_authentication_msal.egg-info/requires.txt
-microsoft_agents_authentication_msal.egg-info/top_level.txt
+microsoft_agents_authentication_msal.egg-info/top_level.txt
+tests/test_msal_auth.py
+tests/test_msal_connection_manager.py

{microsoft_agents_authentication_msal-0.1.1 → microsoft_agents_authentication_msal-0.2.0.dev1}/microsoft_agents_authentication_msal.egg-info/requires.txt

@@ -1,4 +1,4 @@
-microsoft-agents-hosting-core==0.1.1
+microsoft-agents-hosting-core==0.2.0.dev1
 msal>=1.31.1
 requests>=2.32.3
 cryptography>=44.0.0

microsoft_agents_authentication_msal-0.2.0.dev1/tests/test_msal_auth.py

@@ -0,0 +1,83 @@
+import unittest
+from unittest.mock import Mock
+import pytest
+from msal import ManagedIdentityClient, ConfidentialClientApplication
+from microsoft.agents.authentication.msal import MsalAuth
+from microsoft.agents.hosting.core.authorization import AgentAuthConfiguration
+
+
+class TestingMsalAuth(MsalAuth):
+    """
+    Mock object for MsalAuth
+    """
+
+    def __init__(self, client_type):
+        super().__init__(AgentAuthConfiguration())
+        mock_client = Mock(spec=client_type)
+
+        mock_client.acquire_token_for_client = Mock(
+            return_value={"access_token": "token"}
+        )
+        mock_client.acquire_token_on_behalf_of = Mock(
+            return_value={"access_token": "token"}
+        )
+        self.mock_client = mock_client
+
+        self._create_client_application = Mock(return_value=self.mock_client)
+
+
+class TestMsalAuth:
+    """
+    Test suite for testing MsalAuth functionality
+    """
+
+    @pytest.mark.asyncio
+    async def test_get_access_token_managed_identity(self):
+        mock_auth = TestingMsalAuth(ManagedIdentityClient)
+        token = await mock_auth.get_access_token(
+            "https://test.api.botframework.com", scopes=["test-scope"]
+        )
+
+        assert token == "token"
+        mock_auth.mock_client.acquire_token_for_client.assert_called_with(
+            resource="https://test.api.botframework.com"
+        )
+
+    @pytest.mark.asyncio
+    async def test_get_access_token_confidential(self):
+        mock_auth = TestingMsalAuth(ConfidentialClientApplication)
+        token = await mock_auth.get_access_token(
+            "https://test.api.botframework.com", scopes=["test-scope"]
+        )
+
+        assert token == "token"
+        mock_auth.mock_client.acquire_token_for_client.assert_called_with(
+            scopes=["test-scope"]
+        )
+
+    @pytest.mark.asyncio
+    async def test_aquire_token_on_behalf_of_managed_identity(self):
+        mock_auth = TestingMsalAuth(ManagedIdentityClient)
+
+        try:
+            await mock_auth.aquire_token_on_behalf_of(
+                scopes=["test-scope"], user_assertion="test-assertion"
+            )
+        except NotImplementedError:
+            assert True
+        else:
+            assert False
+
+    @pytest.mark.asyncio
+    async def test_aquire_token_on_behalf_of_confidential(self):
+        mock_auth = TestingMsalAuth(ConfidentialClientApplication)
+        mock_auth._create_client_application = Mock(return_value=mock_auth.mock_client)
+
+        token = await mock_auth.aquire_token_on_behalf_of(
+            scopes=["test-scope"], user_assertion="test-assertion"
+        )
+
+        assert token == "token"
+        mock_auth.mock_client.acquire_token_on_behalf_of.assert_called_with(
+            scopes=["test-scope"], user_assertion="test-assertion"
+        )

microsoft_agents_authentication_msal-0.2.0.dev1/tests/test_msal_connection_manager.py

@@ -0,0 +1,35 @@
+from os import environ
+from microsoft.agents.activity import load_configuration_from_env
+from microsoft.agents.hosting.core import AuthTypes
+from microsoft.agents.authentication.msal import MsalConnectionManager
+
+
+class TestMsalConnectionManager:
+    """
+    Test suite for the Msal Connection Manager
+    """
+
+    def test_msal_connection_manager(self):
+        mock_environ = {
+            **environ,
+            "CONNECTIONS__SERVICE_CONNECTION__SETTINGS__TENANTID": "test-tenant-id-SERVICE_CONNECTION",
+            "CONNECTIONS__SERVICE_CONNECTION__SETTINGS__CLIENTID": "test-client-id-SERVICE_CONNECTION",
+            "CONNECTIONS__SERVICE_CONNECTION__SETTINGS__CLIENTSECRET": "test-client-secret-SERVICE_CONNECTION",
+            "CONNECTIONS__MCS__SETTINGS__TENANTID": "test-tenant-id-MCS",
+            "CONNECTIONS__MCS__SETTINGS__CLIENTID": "test-client-id-MCS",
+            "CONNECTIONS__MCS__SETTINGS__CLIENTSECRET": "test-client-secret-MCS",
+        }
+
+        config = load_configuration_from_env(mock_environ)
+        connection_manager = MsalConnectionManager(**config)
+        for key in connection_manager._connections:
+            auth = connection_manager.get_connection(key)._msal_configuration
+            assert auth.AUTH_TYPE == AuthTypes.client_secret
+            assert auth.CLIENT_ID == f"test-client-id-{key}"
+            assert auth.TENANT_ID == f"test-tenant-id-{key}"
+            assert auth.CLIENT_SECRET == f"test-client-secret-{key}"
+            assert auth.ISSUERS == [
+                "https://api.botframework.com",
+                f"https://sts.windows.net/test-tenant-id-{key}/",
+                f"https://login.microsoftonline.com/test-tenant-id-{key}/v2.0",
+            ]