diff options
| author | David Baker <dave@matrix.org> | 2017-11-01 16:20:19 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2017-11-01 16:20:19 +0000 |
| commit | 4f0488b3070b53596bba78a6446ff09a1c50ca16 (patch) | |
| tree | 0eeb49822a2f016e77a54ec77643b33dde0a301b /synapse/rest/client/v2_alpha | |
| parent | Move access token deletion into auth handler (diff) | |
| parent | Merge pull request #2615 from matrix-org/rav/break_auth_device_dep (diff) | |
| download | synapse-4f0488b3070b53596bba78a6446ff09a1c50ca16.tar.xz | |
Merge remote-tracking branch 'origin/develop' into rav/refactor_accesstoken_delete
Diffstat (limited to 'synapse/rest/client/v2_alpha')
| -rw-r--r-- | synapse/rest/client/v2_alpha/groups.py | 4 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/register.py | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/synapse/rest/client/v2_alpha/groups.py b/synapse/rest/client/v2_alpha/groups.py index c97885cfc7..792608cd48 100644 --- a/synapse/rest/client/v2_alpha/groups.py +++ b/synapse/rest/client/v2_alpha/groups.py @@ -451,7 +451,7 @@ class GroupAdminRoomsServlet(RestServlet): requester_user_id = requester.user.to_string() content = parse_json_object_from_request(request) - result = yield self.groups_handler.add_room_to_group( + result = yield self.groups_handler.update_room_group_association( group_id, requester_user_id, room_id, content, ) @@ -462,7 +462,7 @@ class GroupAdminRoomsServlet(RestServlet): requester = yield self.auth.get_user_by_req(request) requester_user_id = requester.user.to_string() - result = yield self.groups_handler.remove_room_from_group( + result = yield self.groups_handler.delete_room_group_association( group_id, requester_user_id, room_id, ) diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py index d9a8cdbbb5..a077146c89 100644 --- a/synapse/rest/client/v2_alpha/register.py +++ b/synapse/rest/client/v2_alpha/register.py @@ -566,7 +566,6 @@ class RegisterRestServlet(RestServlet): access_token = ( yield self.auth_handler.get_access_token_for_user_id( user_id, device_id=device_id, - initial_display_name=params.get("initial_device_display_name") ) ) |