mirror of
https://github.com/element-hq/synapse
synced 2024-08-19 08:00:53 +00:00
Merge branch 'client_server_url_rename' into develop
This commit is contained in:
commit
a8774cf351
8 changed files with 59 additions and 119 deletions
|
@ -471,7 +471,7 @@ class SynapseCmd(cmd.Cmd):
|
|||
room_name = args["vis"]
|
||||
body["room_alias_name"] = room_name
|
||||
|
||||
reactor.callFromThread(self._run_and_pprint, "POST", "/rooms", body)
|
||||
reactor.callFromThread(self._run_and_pprint, "POST", "/createRoom", body)
|
||||
|
||||
def do_raw(self, line):
|
||||
"""Directly send a JSON object: "raw <method> <path> <data> <notoken>"
|
||||
|
|
|
@ -68,7 +68,7 @@ class PresenceStatusRestServlet(RestServlet):
|
|||
|
||||
|
||||
class PresenceListRestServlet(RestServlet):
|
||||
PATTERN = client_path_pattern("/presence_list/(?P<user_id>[^/]*)")
|
||||
PATTERN = client_path_pattern("/presence/list/(?P<user_id>[^/]*)")
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def on_GET(self, request, user_id):
|
||||
|
|
|
@ -34,31 +34,28 @@ class RoomCreateRestServlet(RestServlet):
|
|||
# No PATTERN; we have custom dispatch rules here
|
||||
|
||||
def register(self, http_server):
|
||||
# /rooms OR /rooms/<roomid>
|
||||
http_server.register_path("POST",
|
||||
client_path_pattern("/rooms$"),
|
||||
self.on_POST)
|
||||
http_server.register_path("PUT",
|
||||
client_path_pattern(
|
||||
"/rooms/(?P<room_id>[^/]*)$"),
|
||||
self.on_PUT)
|
||||
PATTERN = "/createRoom"
|
||||
register_txn_path(self, PATTERN, http_server)
|
||||
# define CORS for all of /rooms in RoomCreateRestServlet for simplicity
|
||||
http_server.register_path("OPTIONS",
|
||||
client_path_pattern("/rooms(?:/.*)?$"),
|
||||
self.on_OPTIONS)
|
||||
# define CORS for /createRoom[/txnid]
|
||||
http_server.register_path("OPTIONS",
|
||||
client_path_pattern("/createRoom(?:/.*)?$"),
|
||||
self.on_OPTIONS)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def on_PUT(self, request, room_id):
|
||||
room_id = urllib.unquote(room_id)
|
||||
auth_user = yield self.auth.get_user_by_req(request)
|
||||
def on_PUT(self, request, txn_id):
|
||||
try:
|
||||
defer.returnValue(self.txns.get_client_transaction(request, txn_id))
|
||||
except KeyError:
|
||||
pass
|
||||
|
||||
if not room_id:
|
||||
raise SynapseError(400, "PUT must specify a room ID")
|
||||
response = yield self.on_POST(request)
|
||||
|
||||
room_config = self.get_room_config(request)
|
||||
info = yield self.make_room(room_config, auth_user, room_id)
|
||||
room_config.update(info)
|
||||
defer.returnValue((200, info))
|
||||
self.txns.store_client_transaction(request, txn_id, response)
|
||||
defer.returnValue(response)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def on_POST(self, request):
|
||||
|
|
|
@ -178,9 +178,8 @@ class EventStreamPermissionsTestCase(RestTestCase):
|
|||
|
||||
@defer.inlineCallbacks
|
||||
def test_stream_room_permissions(self):
|
||||
room_id = "!rid1:test"
|
||||
yield self.create_room_as(room_id, self.other_user,
|
||||
tok=self.other_token)
|
||||
room_id = yield self.create_room_as(self.other_user,
|
||||
tok=self.other_token)
|
||||
yield self.send(room_id, tok=self.other_token)
|
||||
|
||||
# invited to room (expect no content for room)
|
||||
|
|
|
@ -171,7 +171,7 @@ class PresenceListTestCase(unittest.TestCase):
|
|||
)
|
||||
|
||||
(code, response) = yield self.mock_resource.trigger("GET",
|
||||
"/presence_list/%s" % (myid), None)
|
||||
"/presence/list/%s" % (myid), None)
|
||||
|
||||
self.assertEquals(200, code)
|
||||
self.assertEquals(
|
||||
|
@ -192,7 +192,7 @@ class PresenceListTestCase(unittest.TestCase):
|
|||
)
|
||||
|
||||
(code, response) = yield self.mock_resource.trigger("POST",
|
||||
"/presence_list/%s" % (myid),
|
||||
"/presence/list/%s" % (myid),
|
||||
"""{"invite": ["@banana:test"]}"""
|
||||
)
|
||||
|
||||
|
@ -212,7 +212,7 @@ class PresenceListTestCase(unittest.TestCase):
|
|||
)
|
||||
|
||||
(code, response) = yield self.mock_resource.trigger("POST",
|
||||
"/presence_list/%s" % (myid),
|
||||
"/presence/list/%s" % (myid),
|
||||
"""{"drop": ["@banana:test"]}"""
|
||||
)
|
||||
|
||||
|
|
|
@ -74,13 +74,11 @@ class RoomPermissionsTestCase(RestTestCase):
|
|||
# create some rooms under the name rmcreator_id
|
||||
self.uncreated_rmid = "!aa:test"
|
||||
|
||||
self.created_rmid = "!abc:test"
|
||||
yield self.create_room_as(self.created_rmid, self.rmcreator_id,
|
||||
is_public=False)
|
||||
self.created_rmid = yield self.create_room_as(self.rmcreator_id,
|
||||
is_public=False)
|
||||
|
||||
self.created_public_rmid = "!def1234ghi:test"
|
||||
yield self.create_room_as(self.created_public_rmid, self.rmcreator_id,
|
||||
is_public=True)
|
||||
self.created_public_rmid = yield self.create_room_as(self.rmcreator_id,
|
||||
is_public=True)
|
||||
|
||||
# send a message in one of the rooms
|
||||
self.created_rmid_msg_path = ("/rooms/%s/send/m.room.message/a1" %
|
||||
|
@ -423,8 +421,7 @@ class RoomsMemberListTestCase(RestTestCase):
|
|||
|
||||
@defer.inlineCallbacks
|
||||
def test_get_member_list(self):
|
||||
room_id = "!aa:test"
|
||||
yield self.create_room_as(room_id, self.user_id)
|
||||
room_id = yield self.create_room_as(self.user_id)
|
||||
(code, response) = yield self.mock_resource.trigger_get(
|
||||
"/rooms/%s/members" % room_id)
|
||||
self.assertEquals(200, code, msg=str(response))
|
||||
|
@ -437,18 +434,16 @@ class RoomsMemberListTestCase(RestTestCase):
|
|||
|
||||
@defer.inlineCallbacks
|
||||
def test_get_member_list_no_permission(self):
|
||||
room_id = "!bb:test"
|
||||
yield self.create_room_as(room_id, "@some_other_guy:red")
|
||||
room_id = yield self.create_room_as("@some_other_guy:red")
|
||||
(code, response) = yield self.mock_resource.trigger_get(
|
||||
"/rooms/%s/members" % room_id)
|
||||
self.assertEquals(403, code, msg=str(response))
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def test_get_member_list_mixed_memberships(self):
|
||||
room_id = "!bb:test"
|
||||
room_creator = "@some_other_guy:blue"
|
||||
room_id = yield self.create_room_as(room_creator)
|
||||
room_path = "/rooms/%s/members" % room_id
|
||||
yield self.create_room_as(room_id, room_creator)
|
||||
yield self.invite(room=room_id, src=room_creator,
|
||||
targ=self.user_id)
|
||||
# can't see list if you're just invited.
|
||||
|
@ -503,107 +498,57 @@ class RoomsCreateTestCase(RestTestCase):
|
|||
@defer.inlineCallbacks
|
||||
def test_post_room_no_keys(self):
|
||||
# POST with no config keys, expect new room id
|
||||
(code, response) = yield self.mock_resource.trigger("POST", "/rooms",
|
||||
"{}")
|
||||
(code, response) = yield self.mock_resource.trigger("POST",
|
||||
"/createRoom",
|
||||
"{}")
|
||||
self.assertEquals(200, code, response)
|
||||
self.assertTrue("room_id" in response)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def test_post_room_visibility_key(self):
|
||||
# POST with visibility config key, expect new room id
|
||||
(code, response) = yield self.mock_resource.trigger("POST", "/rooms",
|
||||
'{"visibility":"private"}')
|
||||
(code, response) = yield self.mock_resource.trigger(
|
||||
"POST",
|
||||
"/createRoom",
|
||||
'{"visibility":"private"}')
|
||||
self.assertEquals(200, code)
|
||||
self.assertTrue("room_id" in response)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def test_post_room_custom_key(self):
|
||||
# POST with custom config keys, expect new room id
|
||||
(code, response) = yield self.mock_resource.trigger("POST", "/rooms",
|
||||
'{"custom":"stuff"}')
|
||||
(code, response) = yield self.mock_resource.trigger(
|
||||
"POST",
|
||||
"/createRoom",
|
||||
'{"custom":"stuff"}')
|
||||
self.assertEquals(200, code)
|
||||
self.assertTrue("room_id" in response)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def test_post_room_known_and_unknown_keys(self):
|
||||
# POST with custom + known config keys, expect new room id
|
||||
(code, response) = yield self.mock_resource.trigger("POST", "/rooms",
|
||||
'{"visibility":"private","custom":"things"}')
|
||||
(code, response) = yield self.mock_resource.trigger(
|
||||
"POST",
|
||||
"/createRoom",
|
||||
'{"visibility":"private","custom":"things"}')
|
||||
self.assertEquals(200, code)
|
||||
self.assertTrue("room_id" in response)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def test_post_room_invalid_content(self):
|
||||
# POST with invalid content / paths, expect 400
|
||||
(code, response) = yield self.mock_resource.trigger("POST", "/rooms",
|
||||
'{"visibili')
|
||||
self.assertEquals(400, code)
|
||||
|
||||
(code, response) = yield self.mock_resource.trigger("POST", "/rooms",
|
||||
'["hello"]')
|
||||
self.assertEquals(400, code)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def test_put_room_no_keys(self):
|
||||
# PUT with no config keys, expect new room id
|
||||
(code, response) = yield self.mock_resource.trigger(
|
||||
"PUT", "/rooms/%21aa%3Atest", "{}"
|
||||
)
|
||||
self.assertEquals(200, code)
|
||||
self.assertTrue("room_id" in response)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def test_put_room_visibility_key(self):
|
||||
# PUT with known config keys, expect new room id
|
||||
(code, response) = yield self.mock_resource.trigger(
|
||||
"PUT", "/rooms/%21bb%3Atest", '{"visibility":"private"}'
|
||||
)
|
||||
self.assertEquals(200, code)
|
||||
self.assertTrue("room_id" in response)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def test_put_room_custom_key(self):
|
||||
# PUT with custom config keys, expect new room id
|
||||
(code, response) = yield self.mock_resource.trigger(
|
||||
"PUT", "/rooms/%21cc%3Atest", '{"custom":"stuff"}'
|
||||
)
|
||||
self.assertEquals(200, code)
|
||||
self.assertTrue("room_id" in response)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def test_put_room_known_and_unknown_keys(self):
|
||||
# PUT with custom + known config keys, expect new room id
|
||||
(code, response) = yield self.mock_resource.trigger(
|
||||
"PUT", "/rooms/%21dd%3Atest",
|
||||
'{"visibility":"private","custom":"things"}'
|
||||
)
|
||||
self.assertEquals(200, code)
|
||||
self.assertTrue("room_id" in response)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def test_put_room_invalid_content(self):
|
||||
# PUT with invalid content / room names, expect 400
|
||||
|
||||
(code, response) = yield self.mock_resource.trigger(
|
||||
"PUT", "/rooms/ee", '{"sdf"'
|
||||
)
|
||||
"POST",
|
||||
"/createRoom",
|
||||
'{"visibili')
|
||||
self.assertEquals(400, code)
|
||||
|
||||
(code, response) = yield self.mock_resource.trigger(
|
||||
"PUT", "/rooms/ee", '["hello"]'
|
||||
)
|
||||
"POST",
|
||||
"/createRoom",
|
||||
'["hello"]')
|
||||
self.assertEquals(400, code)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def test_put_room_conflict(self):
|
||||
yield self.create_room_as("!aa:test", self.user_id)
|
||||
|
||||
# PUT with conflicting room ID, expect 409
|
||||
(code, response) = yield self.mock_resource.trigger(
|
||||
"PUT", "/rooms/%21aa%3Atest", "{}"
|
||||
)
|
||||
self.assertEquals(409, code)
|
||||
|
||||
|
||||
class RoomTopicTestCase(RestTestCase):
|
||||
""" Tests /rooms/$room_id/topic REST events. """
|
||||
|
@ -613,8 +558,6 @@ class RoomTopicTestCase(RestTestCase):
|
|||
def setUp(self):
|
||||
self.mock_resource = MockHttpResource(prefix=PATH_PREFIX)
|
||||
self.auth_user_id = self.user_id
|
||||
self.room_id = "!rid1:test"
|
||||
self.path = "/rooms/%s/state/m.room.topic" % self.room_id
|
||||
|
||||
state_handler = Mock(spec=["handle_new_event"])
|
||||
state_handler.handle_new_event.return_value = True
|
||||
|
@ -640,7 +583,8 @@ class RoomTopicTestCase(RestTestCase):
|
|||
synapse.rest.room.register_servlets(hs, self.mock_resource)
|
||||
|
||||
# create the room
|
||||
yield self.create_room_as(self.room_id, self.user_id)
|
||||
self.room_id = yield self.create_room_as(self.user_id)
|
||||
self.path = "/rooms/%s/state/m.room.topic" % self.room_id
|
||||
|
||||
def tearDown(self):
|
||||
pass
|
||||
|
@ -717,7 +661,6 @@ class RoomMemberStateTestCase(RestTestCase):
|
|||
def setUp(self):
|
||||
self.mock_resource = MockHttpResource(prefix=PATH_PREFIX)
|
||||
self.auth_user_id = self.user_id
|
||||
self.room_id = "!rid1:test"
|
||||
|
||||
state_handler = Mock(spec=["handle_new_event"])
|
||||
state_handler.handle_new_event.return_value = True
|
||||
|
@ -742,7 +685,7 @@ class RoomMemberStateTestCase(RestTestCase):
|
|||
|
||||
synapse.rest.room.register_servlets(hs, self.mock_resource)
|
||||
|
||||
yield self.create_room_as(self.room_id, self.user_id)
|
||||
self.room_id = yield self.create_room_as(self.user_id)
|
||||
|
||||
def tearDown(self):
|
||||
pass
|
||||
|
@ -843,7 +786,6 @@ class RoomMessagesTestCase(RestTestCase):
|
|||
def setUp(self):
|
||||
self.mock_resource = MockHttpResource(prefix=PATH_PREFIX)
|
||||
self.auth_user_id = self.user_id
|
||||
self.room_id = "!rid1:test"
|
||||
|
||||
state_handler = Mock(spec=["handle_new_event"])
|
||||
state_handler.handle_new_event.return_value = True
|
||||
|
@ -868,7 +810,7 @@ class RoomMessagesTestCase(RestTestCase):
|
|||
|
||||
synapse.rest.room.register_servlets(hs, self.mock_resource)
|
||||
|
||||
yield self.create_room_as(self.room_id, self.user_id)
|
||||
self.room_id = yield self.create_room_as(self.user_id)
|
||||
|
||||
def tearDown(self):
|
||||
pass
|
||||
|
|
|
@ -24,6 +24,7 @@ from synapse.api.constants import Membership
|
|||
import json
|
||||
import time
|
||||
|
||||
|
||||
class RestTestCase(unittest.TestCase):
|
||||
"""Contains extra helper functions to quickly and clearly perform a given
|
||||
REST action, which isn't the focus of the test.
|
||||
|
@ -40,18 +41,19 @@ class RestTestCase(unittest.TestCase):
|
|||
return self.auth_user_id
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def create_room_as(self, room_id, room_creator, is_public=True, tok=None):
|
||||
def create_room_as(self, room_creator, is_public=True, tok=None):
|
||||
temp_id = self.auth_user_id
|
||||
self.auth_user_id = room_creator
|
||||
path = "/rooms/%s" % room_id
|
||||
path = "/createRoom"
|
||||
content = "{}"
|
||||
if not is_public:
|
||||
content = '{"visibility":"private"}'
|
||||
if tok:
|
||||
path = path + "?access_token=%s" % tok
|
||||
(code, response) = yield self.mock_resource.trigger("PUT", path, content)
|
||||
(code, response) = yield self.mock_resource.trigger("POST", path, content)
|
||||
self.assertEquals(200, code, msg=str(response))
|
||||
self.auth_user_id = temp_id
|
||||
defer.returnValue(response["room_id"])
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def invite(self, room=None, src=None, targ=None, expect_code=200, tok=None):
|
||||
|
|
|
@ -97,7 +97,7 @@ angular.module('matrixService', [])
|
|||
// Create a room
|
||||
create: function(room_id, visibility) {
|
||||
// The REST path spec
|
||||
var path = "/rooms";
|
||||
var path = "/createRoom";
|
||||
|
||||
return doRequest("POST", path, undefined, {
|
||||
visibility: visibility,
|
||||
|
|
Loading…
Reference in a new issue