microsoft · EricDahlvang · Mar 9, 2020 · Mar 7, 2020 · Mar 7, 2020 · Mar 7, 2020
diff --git a/libraries/botbuilder-core/botbuilder/core/bot_framework_adapter.py b/libraries/botbuilder-core/botbuilder/core/bot_framework_adapter.py
@@ -34,6 +34,7 @@
 from botbuilder.schema import (
     Activity,
     ActivityTypes,
+    ChannelAccount,
     ConversationAccount,
     ConversationParameters,
     ConversationReference,
@@ -746,30 +747,59 @@ async def get_conversation_members(self, context: TurnContext):
         :param context: The context object for the turn
         :type context: :class:`botbuilder.core.TurnContext`
 
-        :raises: An exception error
+        :raises: TypeError if missing service_url or conversation.id
 
         :return: List of members of the current conversation
         """
-        try:
-            if not context.activity.service_url:
-                raise TypeError(
-                    "BotFrameworkAdapter.get_conversation_members(): missing service_url"
-                )
-            if (
-                not context.activity.conversation
-                or not context.activity.conversation.id
-            ):
-                raise TypeError(
-                    "BotFrameworkAdapter.get_conversation_members(): missing conversation or "
-                    "conversation.id"
-                )
 
-            client = context.turn_state[BotAdapter.BOT_CONNECTOR_CLIENT_KEY]
-            return await client.conversations.get_conversation_members(
-                context.activity.conversation.id
+        if not context.activity.service_url:
+            raise TypeError(
+                "BotFrameworkAdapter.get_conversation_members(): missing service_url"
             )
-        except Exception as error:
-            raise error
+        if not context.activity.conversation or not context.activity.conversation.id:
+            raise TypeError(
+                "BotFrameworkAdapter.get_conversation_members(): missing conversation or "
+                "conversation.id"
+            )
+
+        client = context.turn_state[BotAdapter.BOT_CONNECTOR_CLIENT_KEY]
+        return await client.conversations.get_conversation_members(
+            context.activity.conversation.id
+        )
+
+    async def get_conversation_member(
+        self, context: TurnContext, member_id: str
+    ) -> ChannelAccount:
+        """
+        Retrieve a member of a current conversation.
+
+        :param context: The context object for the turn
+        :type context: :class:`botbuilder.core.TurnContext`
+        :param member_id: The member Id
+        :type member_id: str
+
+        :raises: A TypeError if missing member_id, service_url, or conversation.id
+
+        :return: A member of the current conversation
+        """
+        if not context.activity.service_url:
+            raise TypeError(
+                "BotFrameworkAdapter.get_conversation_member(): missing service_url"
+            )
+        if not context.activity.conversation or not context.activity.conversation.id:
+            raise TypeError(
+                "BotFrameworkAdapter.get_conversation_member(): missing conversation or "
+                "conversation.id"
+            )
+        if not member_id:
+            raise TypeError(
+                "BotFrameworkAdapter.get_conversation_member(): missing memberId"
+            )
+
+        client = context.turn_state[BotAdapter.BOT_CONNECTOR_CLIENT_KEY]
+        return await client.conversations.get_conversation_member(
+            context.activity.conversation.id, member_id
+        )
 
     async def get_conversations(
         self,

diff --git a/libraries/botbuilder-core/botbuilder/core/channel_service_handler.py b/libraries/botbuilder-core/botbuilder/core/channel_service_handler.py
@@ -104,6 +104,14 @@ async def handle_get_conversation_members(
         claims_identity = await self._authenticate(auth_header)
         return await self.on_get_conversation_members(claims_identity, conversation_id)
 
+    async def handle_get_conversation_member(
+        self, auth_header, conversation_id, member_id
+    ) -> ChannelAccount:
+        claims_identity = await self._authenticate(auth_header)
+        return await self.on_get_conversation_member(
+            claims_identity, conversation_id, member_id
+        )
+
     async def handle_get_conversation_paged_members(
         self,
         auth_header,
@@ -343,6 +351,24 @@ async def on_get_conversation_members(
         """
         raise BotActionNotImplementedError()
 
+    async def on_get_conversation_member(
+        self, claims_identity: ClaimsIdentity, conversation_id: str, member_id: str,
+    ) -> ChannelAccount:
+        """
+        get_conversation_member() API for Skill.
+
+        Enumerate the members of a conversation.
+
+        This REST API takes a ConversationId and returns a list of ChannelAccount
+        objects representing the members of the conversation.
+
+        :param claims_identity:
+        :param conversation_id:
+        :param member_id:
+        :return:
+        """
+        raise BotActionNotImplementedError()
+
     async def on_get_conversation_paged_members(
         self,
         claims_identity: ClaimsIdentity,

diff --git a/libraries/botbuilder-core/botbuilder/core/integration/aiohttp_channel_service.py b/libraries/botbuilder-core/botbuilder/core/integration/aiohttp_channel_service.py
@@ -132,6 +132,15 @@ async def get_conversation_members(request: Request):
 
         return get_serialized_response(result)
 
+    @routes.get(base_url + "/v3/conversations/{conversation_id}/members/{member_id}")
+    async def get_conversation_member(request: Request):
+        result = await handler.handle_get_conversation_member(
+            request.headers.get("Authorization"),
+            request.match_info["conversation_id", "member_id"],
+        )
+
+        return get_serialized_response(result)
+
     @routes.get(base_url + "/v3/conversations/{conversation_id}/pagedmembers")
     async def get_conversation_paged_members(request: Request):
         # TODO: continuation token? page size?

diff --git a/libraries/botbuilder-core/botbuilder/core/teams/teams_info.py b/libraries/botbuilder-core/botbuilder/core/teams/teams_info.py
@@ -9,6 +9,7 @@
     TeamDetails,
     TeamsChannelData,
     TeamsChannelAccount,
+    TeamsPagedMembersResult,
 )
 from botframework.connector.aio import ConnectorClient
 from botframework.connector.teams.teams_connector_client import TeamsConnectorClient
@@ -79,7 +80,9 @@ async def get_team_channels(
         return teams_connector.teams.get_teams_channels(team_id).conversations
 
     @staticmethod
-    async def get_team_members(turn_context: TurnContext, team_id: str = ""):
+    async def get_team_members(
+        turn_context: TurnContext, team_id: str = ""
+    ) -> List[TeamsChannelAccount]:
         if not team_id:
             team_id = TeamsInfo.get_team_id(turn_context)
 
@@ -103,6 +106,78 @@ async def get_members(turn_context: TurnContext) -> List[TeamsChannelAccount]:
 
         return await TeamsInfo.get_team_members(turn_context, team_id)
 
+    @staticmethod
+    async def get_paged_team_members(
+        turn_context: TurnContext,
+        team_id: str = "",
+        continuation_token: str = None,
+        page_size: int = None,
+    ) -> List[TeamsPagedMembersResult]:
+        if not team_id:
+            team_id = TeamsInfo.get_team_id(turn_context)
+
+        if not team_id:
+            raise TypeError(
+                "TeamsInfo.get_team_members: method is only valid within the scope of MS Teams Team."
+            )
+
+        connector_client = await TeamsInfo._get_connector_client(turn_context)
+        return await TeamsInfo._get_paged_members(
+            connector_client,
+            turn_context.activity.conversation.id,
+            continuation_token,
+            page_size,
+        )
+
+    @staticmethod
+    async def get_paged_members(
+        turn_context: TurnContext, continuation_token: str = None, page_size: int = None
+    ) -> List[TeamsPagedMembersResult]:
+
+        team_id = TeamsInfo.get_team_id(turn_context)
+        if not team_id:
+            conversation_id = turn_context.activity.conversation.id
+            connector_client = await TeamsInfo._get_connector_client(turn_context)
+            return await TeamsInfo._get_paged_members(
+                connector_client, conversation_id, continuation_token, page_size
+            )
+
+        return await TeamsInfo.get_paged_team_members(turn_context, team_id, page_size)
+
+    @staticmethod
+    async def get_team_member(
+        turn_context: TurnContext, team_id: str = "", member_id: str = None
+    ) -> TeamsChannelAccount:
+        if not team_id:
+            team_id = TeamsInfo.get_team_id(turn_context)
+
+        if not team_id:
+            raise TypeError(
+                "TeamsInfo.get_team_member: method is only valid within the scope of MS Teams Team."
+            )
+
+        if not member_id:
+            raise TypeError("TeamsInfo.get_team_member: method requires a member_id")
+
+        connector_client = await TeamsInfo._get_connector_client(turn_context)
+        return await TeamsInfo._get_member(
+            connector_client, turn_context.activity.conversation.id, member_id
+        )
+
+    @staticmethod
+    async def get_member(
+        turn_context: TurnContext, member_id: str
+    ) -> TeamsChannelAccount:
+        team_id = TeamsInfo.get_team_id(turn_context)
+        if not team_id:
+            conversation_id = turn_context.activity.conversation.id
+            connector_client = await TeamsInfo._get_connector_client(turn_context)
+            return await TeamsInfo._get_member(
+                connector_client, conversation_id, member_id
+            )
+
+        return await TeamsInfo.get_team_member(turn_context, team_id, member_id)
+
     @staticmethod
     async def get_teams_connector_client(
         turn_context: TurnContext,
@@ -151,3 +226,45 @@ async def _get_members(
             )
 
         return teams_members
+
+    @staticmethod
+    async def _get_paged_members(
+        connector_client: ConnectorClient,
+        conversation_id: str,
+        continuation_token: str = None,
+        page_size: int = None,
+    ) -> List[TeamsPagedMembersResult]:
+        if connector_client is None:
+            raise TypeError(
+                "TeamsInfo._get_paged_members.connector_client: cannot be None."
+            )
+
+        if not conversation_id:
+            raise TypeError(
+                "TeamsInfo._get_paged_members.conversation_id: cannot be empty."
+            )
+
+        return await connector_client.conversations.get_teams_conversation_paged_members(
+            conversation_id, continuation_token, page_size
+        )
+
+    @staticmethod
+    async def _get_member(
+        connector_client: ConnectorClient, conversation_id: str, member_id: str
+    ) -> TeamsChannelAccount:
+        if connector_client is None:
+            raise TypeError("TeamsInfo._get_member.connector_client: cannot be None.")
+
+        if not conversation_id:
+            raise TypeError("TeamsInfo._get_member.conversation_id: cannot be empty.")
+
+        if not member_id:
+            raise TypeError("TeamsInfo._get_member.member_id: cannot be empty.")
+
+        member: TeamsChannelAccount = await connector_client.conversations.get_conversation_member(
+            conversation_id, member_id
+        )
+
+        return TeamsChannelAccount().deserialize(
+            dict(member.serialize(), **member.additional_properties)
+        )
diff --git a/libraries/botbuilder-schema/botbuilder/schema/teams/__init__.py b/libraries/botbuilder-schema/botbuilder/schema/teams/__init__.py
@@ -65,6 +65,7 @@
     from ._models_py3 import TeamInfo
     from ._models_py3 import TeamsChannelAccount
     from ._models_py3 import TeamsChannelData
+    from ._models_py3 import TeamsPagedMembersResult
     from ._models_py3 import TenantInfo
 except (SyntaxError, ImportError):
     from ._models import AppBasedLinkQuery
@@ -122,6 +123,7 @@
     from ._models import TeamInfo
     from ._models import TeamsChannelAccount
     from ._models import TeamsChannelData
+    from ._models import TeamsPagedMembersResult
     from ._models import TenantInfo
 
 __all__ = [
@@ -180,5 +182,6 @@
     "TeamInfo",
     "TeamsChannelAccount",
     "TeamsChannelData",
+    "TeamsPagedMembersResult",
     "TenantInfo",
 ]
diff --git a/libraries/botbuilder-schema/botbuilder/schema/teams/_models.py b/libraries/botbuilder-schema/botbuilder/schema/teams/_models.py
@@ -10,7 +10,7 @@
 # --------------------------------------------------------------------------
 
 from msrest.serialization import Model
-from botbuilder.schema import Activity
+from botbuilder.schema import Activity, PagedMembersResult, TeamsChannelAccount
 
 
 class AppBasedLinkQuery(Model):
@@ -1557,6 +1557,26 @@ def __init__(self, **kwargs):
         self.user_principal_name = kwargs.get("userPrincipalName", None)
 
 
+class TeamsPagedMembersResult(PagedMembersResult):
+    """Page of members for Teams.
+
+    :param continuation_token: Paging token
+    :type continuation_token: str
+    :param members: The Teams Channel Accounts.
+    :type members: list[~botframework.connector.models.TeamsChannelAccount]
+    """
+
+    _attribute_map = {
+        "continuation_token": {"key": "continuationToken", "type": "str"},
+        "members": {"key": "members", "type": "[TeamsChannelAccount]"},
+    }
+
+    def __init__(self, **kwargs):
+        super(TeamsPagedMembersResult, self).__init__(**kwargs)
+        self.continuation_token = kwargs.get("continuation_token", None)
+        self.members = kwargs.get("members", None)
+
+
 class TeamsChannelData(Model):
     """Channel data specific to messages received in Microsoft Teams.
 

diff --git a/libraries/botbuilder-schema/botbuilder/schema/teams/_models_py3.py b/libraries/botbuilder-schema/botbuilder/schema/teams/_models_py3.py
@@ -10,7 +10,7 @@
 # --------------------------------------------------------------------------
 
 from msrest.serialization import Model
-from botbuilder.schema import Activity, Attachment, ChannelAccount
+from botbuilder.schema import Activity, Attachment, ChannelAccount, PagedMembersResult
 
 
 class TaskModuleRequest(Model):
@@ -1834,6 +1834,34 @@ def __init__(
         self.user_principal_name = user_principal_name
 
 
+class TeamsPagedMembersResult(PagedMembersResult):
+    """Page of members for Teams.
+
+    :param continuation_token: Paging token
+    :type continuation_token: str
+    :param members: The Teams Channel Accounts.
+    :type members: list[~botframework.connector.models.TeamsChannelAccount]
+    """
+
+    _attribute_map = {
+        "continuation_token": {"key": "continuationToken", "type": "str"},
+        "members": {"key": "members", "type": "[TeamsChannelAccount]"},
+    }
+
+    def __init__(
+        self,
+        *,
+        continuation_token: str = None,
+        members: [TeamsChannelAccount] = None,
+        **kwargs
+    ) -> None:
+        super(TeamsPagedMembersResult, self).__init__(
+            continuation_token=continuation_token, members=members, **kwargs
+        )
+        self.continuation_token = continuation_token
+        self.members = members
+
+
 class TeamsChannelData(Model):
     """Channel data specific to messages received in Microsoft Teams.