summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorLuke Barnard <lukeb@openmarket.com>2017-10-16 15:31:11 +0100
committerLuke Barnard <lukeb@openmarket.com>2017-10-16 15:31:11 +0100
commit2c5972f87f0541aaeff43846f7050ab91d11cf0e (patch)
tree9d58fc7426e62ed576a4ede3f8a59d9825025dec /synapse/federation
parentLog a warning when no profile for invited member (diff)
downloadsynapse-2c5972f87f0541aaeff43846f7050ab91d11cf0e.tar.xz
Implement GET /groups/$groupId/invited_users
Diffstat (limited to 'synapse/federation')
-rw-r--r--synapse/federation/transport/client.py13
-rw-r--r--synapse/federation/transport/server.py18
2 files changed, 30 insertions, 1 deletions
diff --git a/synapse/federation/transport/client.py b/synapse/federation/transport/client.py
index f96561c1fe..125d8f3598 100644
--- a/synapse/federation/transport/client.py
+++ b/synapse/federation/transport/client.py
@@ -551,6 +551,19 @@ class TransportLayerClient(object):
         )
 
     @log_function
+    def get_invited_users_in_group(self, destination, group_id, requester_user_id):
+        """Get users that have been invited to a group
+        """
+        path = PREFIX + "/groups/%s/invited_users" % (group_id,)
+
+        return self.client.get_json(
+            destination=destination,
+            path=path,
+            args={"requester_user_id": requester_user_id},
+            ignore_backoff=True,
+        )
+
+    @log_function
     def accept_group_invite(self, destination, group_id, user_id, content):
         """Accept a group invite
         """
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py
index c7565e0737..625a2fe27f 100644
--- a/synapse/federation/transport/server.py
+++ b/synapse/federation/transport/server.py
@@ -720,6 +720,22 @@ class FederationGroupsUsersServlet(BaseFederationServlet):
 
         defer.returnValue((200, new_content))
 
+class FederationGroupsInvitedUsersServlet(BaseFederationServlet):
+    """Get the users that have been invited to a group
+    """
+    PATH = "/groups/(?P<group_id>[^/]*)/invited_users$"
+
+    @defer.inlineCallbacks
+    def on_GET(self, origin, content, query, group_id):
+        requester_user_id = parse_string_from_args(query, "requester_user_id")
+        if get_domain_from_id(requester_user_id) != origin:
+            raise SynapseError(403, "requester_user_id doesn't match origin")
+
+        new_content = yield self.handler.get_invited_users_in_group(
+            group_id, requester_user_id
+        )
+
+        defer.returnValue((200, new_content))
 
 class FederationGroupsInviteServlet(BaseFederationServlet):
     """Ask a group server to invite someone to the group
@@ -1109,12 +1125,12 @@ ROOM_LIST_CLASSES = (
     PublicRoomList,
 )
 
-
 GROUP_SERVER_SERVLET_CLASSES = (
     FederationGroupsProfileServlet,
     FederationGroupsSummaryServlet,
     FederationGroupsRoomsServlet,
     FederationGroupsUsersServlet,
+    FederationGroupsInvitedUsersServlet,
     FederationGroupsInviteServlet,
     FederationGroupsAcceptInviteServlet,
     FederationGroupsRemoveUserServlet,