diff options
author | Erik Johnston <erik@matrix.org> | 2014-09-06 18:18:55 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-09-06 18:18:55 +0100 |
commit | d12feed6235ec91e9797a47c98e9da162b6559c9 (patch) | |
tree | 57f47c24ee7a402f210d7cb07f08521dfba6867c /synapse/rest/directory.py | |
parent | Minor spec tweaks. (diff) | |
parent | Center recaptcha dialog. (diff) | |
download | synapse-d12feed6235ec91e9797a47c98e9da162b6559c9.tar.xz |
Merge branch 'release-v0.2.2' of github.com:matrix-org/synapse v0.2.2
Diffstat (limited to 'synapse/rest/directory.py')
-rw-r--r-- | synapse/rest/directory.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/rest/directory.py b/synapse/rest/directory.py index 18df7c8d8b..31849246a1 100644 --- a/synapse/rest/directory.py +++ b/synapse/rest/directory.py @@ -45,6 +45,8 @@ class ClientDirectoryServer(RestServlet): @defer.inlineCallbacks def on_PUT(self, request, room_alias): + user = yield self.auth.get_user_by_req(request) + content = _parse_json(request) if not "room_id" in content: raise SynapseError(400, "Missing room_id key", @@ -69,12 +71,13 @@ class ClientDirectoryServer(RestServlet): try: yield dir_handler.create_association( - room_alias, room_id, servers + user.to_string(), room_alias, room_id, servers ) except SynapseError as e: raise e except: logger.exception("Failed to create association") + raise defer.returnValue((200, {})) |