Implement GET /groups/$groupId/invited_users

This commit is contained in:
Luke Barnard 2017-10-16 15:31:11 +01:00
parent 6079d0027a
commit 2c5972f87f
6 changed files with 115 additions and 1 deletions

View File

@ -550,6 +550,19 @@ class TransportLayerClient(object):
ignore_backoff=True, ignore_backoff=True,
) )
@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 @log_function
def accept_group_invite(self, destination, group_id, user_id, content): def accept_group_invite(self, destination, group_id, user_id, content):
"""Accept a group invite """Accept a group invite

View File

@ -720,6 +720,22 @@ class FederationGroupsUsersServlet(BaseFederationServlet):
defer.returnValue((200, new_content)) 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): class FederationGroupsInviteServlet(BaseFederationServlet):
"""Ask a group server to invite someone to the group """Ask a group server to invite someone to the group
@ -1109,12 +1125,12 @@ ROOM_LIST_CLASSES = (
PublicRoomList, PublicRoomList,
) )
GROUP_SERVER_SERVLET_CLASSES = ( GROUP_SERVER_SERVLET_CLASSES = (
FederationGroupsProfileServlet, FederationGroupsProfileServlet,
FederationGroupsSummaryServlet, FederationGroupsSummaryServlet,
FederationGroupsRoomsServlet, FederationGroupsRoomsServlet,
FederationGroupsUsersServlet, FederationGroupsUsersServlet,
FederationGroupsInvitedUsersServlet,
FederationGroupsInviteServlet, FederationGroupsInviteServlet,
FederationGroupsAcceptInviteServlet, FederationGroupsAcceptInviteServlet,
FederationGroupsRemoveUserServlet, FederationGroupsRemoveUserServlet,

View File

@ -420,6 +420,41 @@ class GroupsServerHandler(object):
"total_user_count_estimate": len(user_results), "total_user_count_estimate": len(user_results),
}) })
@defer.inlineCallbacks
def get_invited_users_in_group(self, group_id, requester_user_id):
"""Get the users that have been invited to a group as seen by requester_user_id.
The ordering is arbitrary at the moment
"""
yield self.check_group_is_ours(group_id, and_exists=True)
is_user_in_group = yield self.store.is_user_in_group(requester_user_id, group_id)
if not is_user_in_group:
raise SynapseError(403, "User not in group")
invited_users = yield self.store.get_invited_users_in_group(group_id)
user_profiles = []
for user_id in invited_users:
user_profile = {
"user_id": user_id
}
try:
profile = yield self.profile_handler.get_profile_from_cache(user)
user_profile.update(profile)
except Exception as e:
pass
user_profiles.append(user_profile)
defer.returnValue({
"chunk": user_profiles,
"total_user_count_estimate": len(invited_users),
})
@defer.inlineCallbacks @defer.inlineCallbacks
def get_rooms_in_group(self, group_id, requester_user_id): def get_rooms_in_group(self, group_id, requester_user_id):
"""Get the rooms in group as seen by requester_user_id """Get the rooms in group as seen by requester_user_id

View File

@ -219,6 +219,23 @@ class GroupsLocalHandler(object):
defer.returnValue(res) defer.returnValue(res)
@defer.inlineCallbacks
def get_invited_users_in_group(self, group_id, requester_user_id):
"""Get users invited to a group
"""
if self.is_mine_id(group_id):
res = yield self.groups_server_handler.get_invited_users_in_group(
group_id, requester_user_id
)
defer.returnValue(res)
group_server_name = get_domain_from_id(group_id)
res = yield self.transport_client.get_users_in_group(
get_domain_from_id(group_id), group_id, requester_user_id,
)
defer.returnValue(res)
@defer.inlineCallbacks @defer.inlineCallbacks
def join_group(self, group_id, user_id, content): def join_group(self, group_id, user_id, content):
"""Request to join a group """Request to join a group

View File

@ -370,6 +370,26 @@ class GroupUsersServlet(RestServlet):
defer.returnValue((200, result)) defer.returnValue((200, result))
class GroupInvitedUsersServlet(RestServlet):
"""Get users invited to a group
"""
PATTERNS = client_v2_patterns("/groups/(?P<group_id>[^/]*)/invited_users$")
def __init__(self, hs):
super(GroupInvitedUsersServlet, self).__init__()
self.auth = hs.get_auth()
self.clock = hs.get_clock()
self.groups_handler = hs.get_groups_local_handler()
@defer.inlineCallbacks
def on_GET(self, request, group_id):
requester = yield self.auth.get_user_by_req(request)
user_id = requester.user.to_string()
result = yield self.groups_handler.get_invited_users_in_group(group_id, user_id)
defer.returnValue((200, result))
class GroupCreateServlet(RestServlet): class GroupCreateServlet(RestServlet):
"""Create a group """Create a group
@ -674,6 +694,7 @@ class GroupsForUserServlet(RestServlet):
def register_servlets(hs, http_server): def register_servlets(hs, http_server):
GroupServlet(hs).register(http_server) GroupServlet(hs).register(http_server)
GroupSummaryServlet(hs).register(http_server) GroupSummaryServlet(hs).register(http_server)
GroupInvitedUsersServlet(hs).register(http_server)
GroupUsersServlet(hs).register(http_server) GroupUsersServlet(hs).register(http_server)
GroupRoomServlet(hs).register(http_server) GroupRoomServlet(hs).register(http_server)
GroupCreateServlet(hs).register(http_server) GroupCreateServlet(hs).register(http_server)

View File

@ -56,6 +56,18 @@ class GroupServerStore(SQLBaseStore):
desc="get_users_in_group", desc="get_users_in_group",
) )
def get_invited_users_in_group(self, group_id):
# TODO: Pagination
return self._simple_select_onecol(
table="group_invites",
keyvalues={
"group_id": group_id,
},
retcol="user_id",
desc="get_invited_users_in_group",
)
def get_rooms_in_group(self, group_id, include_private=False): def get_rooms_in_group(self, group_id, include_private=False):
# TODO: Pagination # TODO: Pagination