summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorSteven Hammerton <steven.hammerton@openmarket.com>2015-10-09 11:04:07 +0100
committerSteven Hammerton <steven.hammerton@openmarket.com>2015-10-10 10:54:19 +0100
commite52f4dc5995fccd96a2a4084dc68a05da5a16838 (patch)
tree89b12850b55133328f2b54e7ce3e82445d7341c2 /synapse
parentAdd get_raw method to SimpleHttpClient, use this in CAS auth rather than requ... (diff)
downloadsynapse-e52f4dc5995fccd96a2a4084dc68a05da5a16838.tar.xz
Use UserId to create FQ user id
Diffstat (limited to 'synapse')
-rw-r--r--synapse/rest/client/v1/login.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/login.py b/synapse/rest/client/v1/login.py
index f5cd6a1960..05095e7d6e 100644
--- a/synapse/rest/client/v1/login.py
+++ b/synapse/rest/client/v1/login.py
@@ -133,7 +133,7 @@ class LoginRestServlet(ClientV1RestServlet):
         for child in root[0]:
             if child.tag.endswith("user"):
                 user = child.text
-                user_id = "@%s:%s" % (user, self.servername)
+                user_id = UserID.create(user, self.hs.hostname).to_string()
                 auth_handler = self.handlers.auth_handler
                 user_exists = yield auth_handler.does_user_exist(user_id)
                 if user_exists: