Users/axsuarez/app authorization

libraries/Authentication/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/__init__.py

@@ -1,9 +1,7 @@
-from .auth_types import AuthTypes
-from .msal_auth_configuration import MsalAuthConfiguration
 from .msal_auth import MsalAuth
+from .msal_connection_manager import MsalConnectionManager
 
 __all__ = [
-    "AuthTypes",
-    "MsalAuthConfiguration",
     "MsalAuth",
+    "MsalConnectionManager",
 ]

libraries/Authentication/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_auth.py

@@ -13,17 +13,19 @@
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import hashes
 
-from microsoft.agents.authorization import AccessTokenProviderBase
+from microsoft.agents.authorization import (
+    AccessTokenProviderBase,
+    AgentAuthConfiguration,
+)
 
-from .auth_types import AuthTypes
-from .msal_auth_configuration import MsalAuthConfiguration
+from microsoft.agents.authorization.auth_types import AuthTypes
 
 
 class MsalAuth(AccessTokenProviderBase):
 
     _client_credential_cache = None
 
-    def __init__(self, msal_configuration: MsalAuthConfiguration):
+    def __init__(self, msal_configuration: AgentAuthConfiguration):
         self._msal_configuration = msal_configuration
 
     async def get_access_token(
@@ -48,6 +50,31 @@ async def get_access_token(
         # TODO: Handling token error / acquisition failed
         return auth_result_payload["access_token"]
 
+    async def aquire_token_on_behalf_of(
+        self, scopes: list[str], user_assertion: str
+    ) -> str:
+        """
+        Acquire a token on behalf of a user.
+        :param scopes: The scopes for which to get the token.
+        :param user_assertion: The user assertion token.
+        :return: The access token as a string.
+        """
+
+        msal_auth_client = self._create_client_application()
+        if isinstance(msal_auth_client, ManagedIdentityClient):
+            raise NotImplementedError(
+                "On-behalf-of flow is not supported with Managed Identity authentication."
+            )
+        elif isinstance(msal_auth_client, ConfidentialClientApplication):
+            # TODO: Handling token error / acquisition failed
+            return msal_auth_client.acquire_token_on_behalf_of(
+                user_assertion=user_assertion, scopes=scopes
+            )["access_token"]
+
+        raise NotImplementedError(
+            f"On-behalf-of flow is not supported with the current authentication type: {msal_auth_client.__class__.__name__}"
+        )
+
     def _create_client_application(
         self,
     ) -> ManagedIdentityClient | ConfidentialClientApplication:

libraries/Authentication/microsoft-agents-authentication-msal/microsoft/agents/authentication/msal/msal_connection_manager.py

@@ -0,0 +1,72 @@
+from typing import Dict, List, Optional
+from microsoft.agents.authorization import (
+    AgentAuthConfiguration,
+    AccessTokenProviderBase,
+    ClaimsIdentity,
+    Connections,
+)
+
+from .msal_auth import MsalAuth
+
+
+class MsalConnectionManager(Connections):
+
+    def __init__(
+        self,
+        connections_configurations: Dict[str, AgentAuthConfiguration] = None,
+        connections_map: List[Dict[str, str]] = None,
+        **kwargs
+    ):
+        self._connections: Dict[str, MsalAuth] = {}
+        self._connections_map = connections_map or kwargs.get("CONNECTIONS_MAP", {})
+        self._service_connection_configuration: AgentAuthConfiguration = None
+
+        if connections_configurations:
+            for (
+                connection_name,
+                connection_settings,
+            ) in connections_configurations.items():
+                self._connections[connection_name] = MsalAuth(
+                    AgentAuthConfiguration(**connection_settings)
+                )
+        else:
+            raw_configurations: Dict[str, Dict] = kwargs.get("CONNECTIONS", {})
+            for connection_name, connection_settings in raw_configurations.items():
+                parsed_configuration = AgentAuthConfiguration(
+                    **connection_settings.get("SETTINGS", {})
+                )
+                self._connections[connection_name] = MsalAuth(parsed_configuration)
+                if connection_name == "SERVICE_CONNECTION":
+                    self._service_connection_configuration = parsed_configuration
+
+        if not self._connections.get("SERVICE_CONNECTION", None):
+            raise ValueError("No service connection configuration provided.")
+
+    def get_connection(self, connection_name: Optional[str]) -> AccessTokenProviderBase:
+        """
+        Get the OAuth connection for the agent.
+        """
+        return self._connections.get(connection_name, None)
+
+    def get_default_connection(self) -> AccessTokenProviderBase:
+        """
+        Get the default OAuth connection for the agent.
+        """
+        return self._connections.get("SERVICE_CONNECTION", None)
+
+    def get_token_provider(
+        self, claims_identity: ClaimsIdentity, service_url: str
+    ) -> AccessTokenProviderBase:
+        """
+        Get the OAuth token provider for the agent.
+        """
+        if not self._connections_map:
+            return self.get_default_connection()
+
+        # TODO: Implement logic to select the appropriate connection based on the connection map
+
+    def get_default_connection_configuration(self) -> AgentAuthConfiguration:
+        """
+        Get the default connection configuration for the agent.
+        """
+        return self._service_connection_configuration

libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/app/__init__.py

@@ -11,7 +11,7 @@
 from .input_file import InputFile, InputFileDownloader
 from .query import Query
 from .route import Route, RouteHandler
-from .typing import Typing
+from .typing_indicator import TypingIndicator
 from .state.conversation_state import ConversationState
 from .state.state import State, StatePropertyAccessor, state
 from .state.temp_state import TempState
@@ -30,7 +30,7 @@
     "Query",
     "Route",
     "RouteHandler",
-    "Typing",
+    "TypingIndicator",
     "StatePropertyAccessor",
     "ConversationState",
     "state",