summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2016-03-10 15:58:22 +0000
committerreview.rocks <nobody@review.rocks>2016-03-10 15:58:22 +0000
commit465605d616c991760ce021932f0453fc6bc477ef (patch)
treebb7164c248e8a103eca1ee4f2c2d75a29e7800f9 /synapse/handlers
parentMerge pull request #639 from matrix-org/erikj/as_user_update_batch (diff)
downloadsynapse-465605d616c991760ce021932f0453fc6bc477ef.tar.xz
Store appservice ID on register
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/register.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py
index e2ace6a4e5..6ffb8c0da6 100644
--- a/synapse/handlers/register.py
+++ b/synapse/handlers/register.py
@@ -182,6 +182,8 @@ class RegistrationHandler(BaseHandler):
                 errcode=Codes.EXCLUSIVE
             )
 
+        service_id = service.id if service.is_exclusive_user(user_id) else None
+
         yield self.check_user_id_not_appservice_exclusive(
             user_id, allowed_appservice=service
         )
@@ -190,7 +192,8 @@ class RegistrationHandler(BaseHandler):
         yield self.store.register(
             user_id=user_id,
             token=token,
-            password_hash=""
+            password_hash="",
+            appservice_id=service_id,
         )
         yield registered_user(self.distributor, user)
         defer.returnValue((user_id, token))