microsoft-agents-hosting-core 0.10.0.dev3__tar.gz → 0.10.0.dev5__tar.gz

{microsoft_agents_hosting_core-0.10.0.dev3/microsoft_agents_hosting_core.egg-info → microsoft_agents_hosting_core-0.10.0.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-hosting-core
-Version: 0.10.0.dev3
+Version: 0.10.0.dev5
 Summary: Core library for Microsoft Agents
 Author: Microsoft Corporation
 License-Expression: MIT
@@ -15,7 +15,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: microsoft-agents-activity==0.10.0.dev3
+Requires-Dist: microsoft-agents-activity==0.10.0.dev5
 Requires-Dist: pyjwt>=2.10.1
 Requires-Dist: isodate>=0.6.1
 Requires-Dist: azure-core>=1.30.0

microsoft_agents_hosting_core-0.10.0.dev5/VERSION.txt

@@ -0,0 +1 @@
+0.10.0.dev5

{microsoft_agents_hosting_core-0.10.0.dev3 → microsoft_agents_hosting_core-0.10.0.dev5}/microsoft_agents/hosting/core/_oauth/_flow_state.py

@@ -35,6 +35,7 @@ class _FlowErrorTag(Enum):
     NONE = "none"
     MAGIC_FORMAT = "magic_format"
     MAGIC_CODE_INCORRECT = "magic_code_incorrect"
+    PRECONDITION_FAILED = "precondition_failed"
     OTHER = "other"
 
 

{microsoft_agents_hosting_core-0.10.0.dev3 → microsoft_agents_hosting_core-0.10.0.dev5}/microsoft_agents/hosting/core/_oauth/_oauth_flow.py

@@ -247,16 +247,32 @@ class _OAuthFlow:
 
     async def _continue_from_invoke_token_exchange(
         self, activity: Activity
-    ) -> TokenResponse:
+    ) -> tuple[TokenResponse, _FlowErrorTag]:
         """Handles the continuation of the flow from an invoke activity for token exchange."""
         token_exchange_request = activity.value
-        token_response = await self._user_token_client.user_token.exchange_token(
-            user_id=self._user_id,
-            connection_name=self._abs_oauth_connection_name,
-            channel_id=self._channel_id,
-            body=token_exchange_request,
-        )
-        return token_response
+        try:
+            token_response = await self._user_token_client.user_token.exchange_token(
+                user_id=self._user_id,
+                connection_name=self._abs_oauth_connection_name,
+                channel_id=self._channel_id,
+                body=token_exchange_request,
+            )
+            return token_response, _FlowErrorTag.NONE
+        except Exception as e:
+            # A 400 with 'ConsentRequired' means the user hasn't consented yet.
+            # Return None so the caller can send a 412 back to Teams, which will
+            # prompt the user for consent and retry the token exchange.
+            # Any other error is a critical failure and should propagate.
+            if getattr(e, "status", None) == 400 and "Consent Required" in getattr(
+                e, "message", ""
+            ):
+                logger.info(
+                    "Token exchange requires consent for user %s, returning None to trigger consent prompt",
+                    self._user_id,
+                )
+
+                return None, _FlowErrorTag.PRECONDITION_FAILED
+            raise
 
     async def continue_flow(self, activity: Activity) -> _FlowResponse:
         """Continues the OAuth flow based on the incoming activity.
@@ -289,7 +305,15 @@ class _OAuthFlow:
             activity.type == ActivityTypes.invoke
             and activity.name == "signin/tokenExchange"
         ):
-            token_response = await self._continue_from_invoke_token_exchange(activity)
+            token_response, flow_error_tag = (
+                await self._continue_from_invoke_token_exchange(activity)
+            )
+        elif (
+            activity.type == ActivityTypes.invoke and activity.name == "signin/failure"
+        ):
+            logger.debug("Handling signin/failure invoke activity")
+            token_response = None
+            flow_error_tag = _FlowErrorTag.OTHER
         else:
             raise ValueError(f"Unknown activity type {activity.type}")
 
@@ -299,7 +323,8 @@ class _OAuthFlow:
         if flow_error_tag != _FlowErrorTag.NONE:
             logger.debug("Flow error occurred: %s", flow_error_tag)
             self._flow_state.tag = _FlowStateTag.CONTINUE
-            self._use_attempt()
+            if flow_error_tag != _FlowErrorTag.PRECONDITION_FAILED:
+                self._use_attempt()
         else:
             self._flow_state.tag = _FlowStateTag.COMPLETE
             self._flow_state.expiration = (

{microsoft_agents_hosting_core-0.10.0.dev3 → microsoft_agents_hosting_core-0.10.0.dev5}/microsoft_agents/hosting/core/app/oauth/_handlers/_user_authorization.py

@@ -9,6 +9,8 @@ import jwt
 from typing import Optional
 
 from microsoft_agents.activity import (
+    Activity,
+    ActivityTypes,
     Attachment,
     ActionTypes,
     CardAction,
@@ -16,6 +18,14 @@ from microsoft_agents.activity import (
     TokenResponse,
 )
 
+from microsoft_agents.activity.invoke_response import InvokeResponse
+from microsoft_agents.activity.token_exchange_invoke_request import (
+    TokenExchangeInvokeRequest,
+)
+from microsoft_agents.activity.token_exchange_invoke_response import (
+    TokenExchangeInvokeResponse,
+)
+from microsoft_agents.hosting.core._oauth._flow_state import _FlowErrorTag
 from microsoft_agents.hosting.core.card_factory import CardFactory
 from microsoft_agents.hosting.core.message_factory import MessageFactory
 from microsoft_agents.hosting.core.connector.client import UserTokenClient
@@ -201,6 +211,26 @@ class _UserAuthorization(_AuthorizationHandler):
             else:
                 logger.warning("Sign-in flow failed for unknown reasons.")
                 await context.send_activity("Sign-in failed. Please try again.")
+        elif (
+            flow_state.tag == _FlowStateTag.CONTINUE
+            and flow_response.flow_error_tag == _FlowErrorTag.PRECONDITION_FAILED
+        ):
+            token_exchange_request = TokenExchangeInvokeRequest().model_validate(
+                context.activity.value
+            )
+            await context.send_activity(
+                Activity(
+                    type=ActivityTypes.invoke_response,
+                    value=InvokeResponse(
+                        status=412,
+                        body=TokenExchangeInvokeResponse(
+                            id=token_exchange_request.id,
+                            connection_name=flow_state.connection,
+                            failure_detail="The Agent is unable to exchange token. Proceed with regular login.",
+                        ),
+                    ).model_dump(exclude_unset=True),
+                )
+            )
 
     async def _sign_in(
         self,

{microsoft_agents_hosting_core-0.10.0.dev3 → microsoft_agents_hosting_core-0.10.0.dev5}/microsoft_agents/hosting/core/app/oauth/authorization.py

@@ -8,7 +8,8 @@ import logging
 from typing import TypeVar, Optional, Callable, Awaitable, Generic, cast
 import jwt
 
-from microsoft_agents.activity import Activity, TokenResponse
+from microsoft_agents.activity import Activity, Channels, SignInConstants, TokenResponse
+from microsoft_agents.activity.activity_types import ActivityTypes
 
 from ...turn_context import TurnContext
 from ...storage import Storage
@@ -261,9 +262,17 @@ class Authorization:
             await self._delete_sign_in_state(context)
 
         elif sign_in_response.tag in [_FlowStateTag.BEGIN, _FlowStateTag.CONTINUE]:
-            # store continuation activity and wait for next turn
-            sign_in_state.continuation_activity = context.activity
-            await self._save_sign_in_state(context, sign_in_state)
+            # Handling special case for Teams SSO, ConsentRequired
+            if not (
+                context.activity.channel_id.channel == Channels.ms_teams
+                and sign_in_state.continuation_activity
+                and context.activity.type == ActivityTypes.invoke
+                and context.activity.name
+                == SignInConstants.token_exchange_operation_name
+            ):
+                # store continuation activity and wait for next turn
+                sign_in_state.continuation_activity = context.activity
+                await self._save_sign_in_state(context, sign_in_state)
 
         return sign_in_response
 

{microsoft_agents_hosting_core-0.10.0.dev3 → microsoft_agents_hosting_core-0.10.0.dev5}/microsoft_agents/hosting/core/channel_service_adapter.py

@@ -547,7 +547,7 @@ class ChannelServiceAdapter(ChannelAdapter, ABC):
                     self.INVOKE_RESPONSE_KEY
                 )
                 if not activity_invoke_response:
-                    return InvokeResponse(status=HTTPStatus.NOT_IMPLEMENTED)
+                    return InvokeResponse(status=HTTPStatus.OK)
 
                 return InvokeResponse.model_validate(activity_invoke_response.value)
 

{microsoft_agents_hosting_core-0.10.0.dev3 → microsoft_agents_hosting_core-0.10.0.dev5}/microsoft_agents/hosting/core/connector/client/user_token_client.py

@@ -5,7 +5,7 @@
 
 import logging
 from typing import Optional
-from aiohttp import ClientSession
+from aiohttp import ClientResponseError, ClientSession
 
 from microsoft_agents.hosting.core.connector import UserTokenClientBase
 from microsoft_agents.activity import (
@@ -297,8 +297,19 @@ class UserToken(UserTokenBase):
                 span.share(http_method="POST", status_code=response.status)
 
                 if response.status >= 300:
-                    logger.error("Error exchanging token: %s", response.status)
-                    response.raise_for_status()
+                    response_text = await response.text("utf-8")
+                    logger.error(
+                        "Error exchanging token: %s %s",
+                        response.status,
+                        response_text,
+                    )
+                    raise ClientResponseError(
+                        response.request_info,
+                        response.history,
+                        status=response.status,
+                        message=response_text,
+                        headers=response.headers,
+                    )
 
                 data = await response.json()
                 return TokenResponse.model_validate(data)

{microsoft_agents_hosting_core-0.10.0.dev3 → microsoft_agents_hosting_core-0.10.0.dev5/microsoft_agents_hosting_core.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-hosting-core
-Version: 0.10.0.dev3
+Version: 0.10.0.dev5
 Summary: Core library for Microsoft Agents
 Author: Microsoft Corporation
 License-Expression: MIT
@@ -15,7 +15,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: microsoft-agents-activity==0.10.0.dev3
+Requires-Dist: microsoft-agents-activity==0.10.0.dev5
 Requires-Dist: pyjwt>=2.10.1
 Requires-Dist: isodate>=0.6.1
 Requires-Dist: azure-core>=1.30.0

{microsoft_agents_hosting_core-0.10.0.dev3 → microsoft_agents_hosting_core-0.10.0.dev5}/microsoft_agents_hosting_core.egg-info/requires.txt

@@ -1,4 +1,4 @@
-microsoft-agents-activity==0.10.0.dev3
+microsoft-agents-activity==0.10.0.dev5
 pyjwt>=2.10.1
 isodate>=0.6.1
 azure-core>=1.30.0

microsoft_agents_hosting_core-0.10.0.dev3/VERSION.txt

@@ -1 +0,0 @@
-0.10.0.dev3