summary refs log tree commit diff
path: root/synapse/handlers/register.py
diff options
context:
space:
mode:
authorKent Shikama <kent@kentshikama.com>2016-07-03 15:08:15 +0900
committerKent Shikama <kent@kentshikama.com>2016-07-03 15:08:15 +0900
commitfc8007dbec40212ae85285aea600111ce2d06912 (patch)
treeaa732aedaf3a85455e56b0132e6d36033256191d /synapse/handlers/register.py
parentcode_style.rst: add link to sphinx examples (diff)
downloadsynapse-fc8007dbec40212ae85285aea600111ce2d06912.tar.xz
Optionally include password hash in createUser endpoint
Signed-off-by: Kent Shikama <kent@kentshikama.com>
Diffstat (limited to 'synapse/handlers/register.py')
-rw-r--r--synapse/handlers/register.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py
index 0b7517221d..e255f2da81 100644
--- a/synapse/handlers/register.py
+++ b/synapse/handlers/register.py
@@ -358,7 +358,7 @@ class RegistrationHandler(BaseHandler):
         defer.returnValue(data)
 
     @defer.inlineCallbacks
-    def get_or_create_user(self, localpart, displayname, duration_seconds):
+    def get_or_create_user(self, localpart, displayname, duration_seconds, password_hash=None):
         """Creates a new user if the user does not exist,
         else revokes all previous access tokens and generates a new one.
 
@@ -394,7 +394,7 @@ class RegistrationHandler(BaseHandler):
             yield self.store.register(
                 user_id=user_id,
                 token=token,
-                password_hash=None,
+                password_hash=password_hash,
                 create_profile_with_localpart=user.localpart,
             )
         else: