pull/2582/head
Luke Barnard 2017-10-26 17:20:24 +01:00
parent 9b2feef9eb
commit 595fe67f01
2 changed files with 67 additions and 15 deletions

View File

@ -49,7 +49,8 @@ class GroupsServerHandler(object):
hs.get_groups_attestation_renewer() hs.get_groups_attestation_renewer()
@defer.inlineCallbacks @defer.inlineCallbacks
def check_group_is_ours(self, group_id, requester_user_id, and_exists=False, and_is_admin=None): def check_group_is_ours(self, group_id, requester_user_id,
and_exists=False, and_is_admin=None):
"""Check that the group is ours, and optionally if it exists. """Check that the group is ours, and optionally if it exists.
If group does exist then return group. If group does exist then return group.
@ -157,10 +158,16 @@ class GroupsServerHandler(object):
}) })
@defer.inlineCallbacks @defer.inlineCallbacks
def update_group_summary_room(self, group_id, requester_user_id, room_id, category_id, content): def update_group_summary_room(self, group_id, requester_user_id,
room_id, category_id, content):
"""Add/update a room to the group summary """Add/update a room to the group summary
""" """
yield self.check_group_is_ours(group_id, requester_user_id, and_exists=True, and_is_admin=requester_user_id) yield self.check_group_is_ours(
group_id,
requester_user_id,
and_exists=True,
and_is_admin=requester_user_id,
)
RoomID.from_string(room_id) # Ensure valid room id RoomID.from_string(room_id) # Ensure valid room id
@ -179,10 +186,16 @@ class GroupsServerHandler(object):
defer.returnValue({}) defer.returnValue({})
@defer.inlineCallbacks @defer.inlineCallbacks
def delete_group_summary_room(self, group_id, requester_user_id, room_id, category_id): def delete_group_summary_room(self, group_id, requester_user_id,
room_id, category_id):
"""Remove a room from the summary """Remove a room from the summary
""" """
yield self.check_group_is_ours(group_id, requester_user_id, and_exists=True, and_is_admin=requester_user_id) yield self.check_group_is_ours(
group_id,
requester_user_id,
and_exists=True,
and_is_admin=requester_user_id,
)
yield self.store.remove_room_from_summary( yield self.store.remove_room_from_summary(
group_id=group_id, group_id=group_id,
@ -220,7 +233,12 @@ class GroupsServerHandler(object):
def update_group_category(self, group_id, requester_user_id, category_id, content): def update_group_category(self, group_id, requester_user_id, category_id, content):
"""Add/Update a group category """Add/Update a group category
""" """
yield self.check_group_is_ours(group_id, requester_user_id, and_exists=True, and_is_admin=requester_user_id) yield self.check_group_is_ours(
group_id,
requester_user_id,
and_exists=True,
and_is_admin=requester_user_id,
)
is_public = _parse_visibility_from_contents(content) is_public = _parse_visibility_from_contents(content)
profile = content.get("profile") profile = content.get("profile")
@ -238,7 +256,12 @@ class GroupsServerHandler(object):
def delete_group_category(self, group_id, requester_user_id, category_id): def delete_group_category(self, group_id, requester_user_id, category_id):
"""Delete a group category """Delete a group category
""" """
yield self.check_group_is_ours(group_id, requester_user_id, and_exists=True, and_is_admin=requester_user_id) yield self.check_group_is_ours(
group_id,
requester_user_id,
and_exists=True,
and_is_admin=requester_user_id
)
yield self.store.remove_group_category( yield self.store.remove_group_category(
group_id=group_id, group_id=group_id,
@ -274,7 +297,12 @@ class GroupsServerHandler(object):
def update_group_role(self, group_id, requester_user_id, role_id, content): def update_group_role(self, group_id, requester_user_id, role_id, content):
"""Add/update a role in a group """Add/update a role in a group
""" """
yield self.check_group_is_ours(group_id, requester_user_id, and_exists=True, and_is_admin=requester_user_id) yield self.check_group_is_ours(
group_id,
requester_user_id,
and_exists=True,
and_is_admin=requester_user_id,
)
is_public = _parse_visibility_from_contents(content) is_public = _parse_visibility_from_contents(content)
@ -293,7 +321,12 @@ class GroupsServerHandler(object):
def delete_group_role(self, group_id, requester_user_id, role_id): def delete_group_role(self, group_id, requester_user_id, role_id):
"""Remove role from group """Remove role from group
""" """
yield self.check_group_is_ours(group_id, requester_user_id, and_exists=True, and_is_admin=requester_user_id) yield self.check_group_is_ours(
group_id,
requester_user_id,
and_exists=True,
and_is_admin=requester_user_id,
)
yield self.store.remove_group_role( yield self.store.remove_group_role(
group_id=group_id, group_id=group_id,
@ -623,7 +656,10 @@ class GroupsServerHandler(object):
else: else:
remote_attestation = None remote_attestation = None
local_attestation = self.attestations.create_attestation(group_id, requester_user_id) local_attestation = self.attestations.create_attestation(
group_id,
requester_user_id,
)
is_public = _parse_visibility_from_contents(content) is_public = _parse_visibility_from_contents(content)
@ -747,7 +783,10 @@ class GroupsServerHandler(object):
group_id=group_id, group_id=group_id,
) )
local_attestation = self.attestations.create_attestation(group_id, requester_user_id) local_attestation = self.attestations.create_attestation(
group_id,
requester_user_id,
)
else: else:
local_attestation = None local_attestation = None
remote_attestation = None remote_attestation = None

View File

@ -41,7 +41,10 @@ class GroupServlet(RestServlet):
requester = yield self.auth.get_user_by_req(request) requester = yield self.auth.get_user_by_req(request)
requester_user_id = requester.user.to_string() requester_user_id = requester.user.to_string()
group_description = yield self.groups_handler.get_group_profile(group_id, requester_user_id) group_description = yield self.groups_handler.get_group_profile(
group_id,
requester_user_id,
)
defer.returnValue((200, group_description)) defer.returnValue((200, group_description))
@ -74,7 +77,10 @@ class GroupSummaryServlet(RestServlet):
requester = yield self.auth.get_user_by_req(request) requester = yield self.auth.get_user_by_req(request)
requester_user_id = requester.user.to_string() requester_user_id = requester.user.to_string()
get_group_summary = yield self.groups_handler.get_group_summary(group_id, requester_user_id) get_group_summary = yield self.groups_handler.get_group_summary(
group_id,
requester_user_id,
)
defer.returnValue((200, get_group_summary)) defer.returnValue((200, get_group_summary))
@ -387,7 +393,10 @@ class GroupInvitedUsersServlet(RestServlet):
requester = yield self.auth.get_user_by_req(request) requester = yield self.auth.get_user_by_req(request)
requester_user_id = requester.user.to_string() requester_user_id = requester.user.to_string()
result = yield self.groups_handler.get_invited_users_in_group(group_id, requester_user_id) result = yield self.groups_handler.get_invited_users_in_group(
group_id,
requester_user_id,
)
defer.returnValue((200, result)) defer.returnValue((200, result))
@ -414,7 +423,11 @@ class GroupCreateServlet(RestServlet):
localpart = content.pop("localpart") localpart = content.pop("localpart")
group_id = GroupID(localpart, self.server_name).to_string() group_id = GroupID(localpart, self.server_name).to_string()
result = yield self.groups_handler.create_group(group_id, requester_user_id, content) result = yield self.groups_handler.create_group(
group_id,
requester_user_id,
content,
)
defer.returnValue((200, result)) defer.returnValue((200, result))