summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-08-14 16:03:04 +0100
committerKegan Dougal <kegan@matrix.org>2014-08-14 16:03:04 +0100
commitfb93e14e530d6dfddf22d77eb42be5758f2d50f5 (patch)
treea47f61c4000586458d65e72b1d2521b206d5ce53 /synapse/storage
parentFinish up room controller too. May have missed one or two, but testing didn't... (diff)
downloadsynapse-fb93e14e530d6dfddf22d77eb42be5758f2d50f5.tar.xz
Be more helpful when failing to register/login, stating why (communication error, user in user, wrong credentials, etc). Make the HS send M_USER_IN_USE.
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/registration.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py
index 68cdfbb4ca..b1e4196435 100644
--- a/synapse/storage/registration.py
+++ b/synapse/storage/registration.py
@@ -17,7 +17,7 @@ from twisted.internet import defer
 
 from sqlite3 import IntegrityError
 
-from synapse.api.errors import StoreError
+from synapse.api.errors import StoreError, Codes
 
 from ._base import SQLBaseStore
 
@@ -73,7 +73,7 @@ class RegistrationStore(SQLBaseStore):
                         "VALUES (?,?,?)",
                         [user_id, password_hash, now])
         except IntegrityError:
-            raise StoreError(400, "User ID already taken.")
+            raise StoreError(400, "User ID already taken.", errcode=Codes.USER_IN_USE)
 
         # it's possible for this to get a conflict, but only for a single user
         # since tokens are namespaced based on their user ID