Change user deactivated errcode to USER_DEACTIVATED and use it (#5686)

matrix-org · Feb 20, 2020 · 83ff056 · 83ff056
2 parents d3e927b + 72167fb
commit 83ff056
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/changelog.d/5686.feature b/changelog.d/5686.feature
@@ -0,0 +1 @@
+Use `M_USER_DEACTIVATED` instead of `M_UNKNOWN` for errcode when a deactivated user attempts to login.
diff --git a/synapse/api/errors.py b/synapse/api/errors.py
@@ -62,6 +62,7 @@ class Codes(object):
     INCOMPATIBLE_ROOM_VERSION = "M_INCOMPATIBLE_ROOM_VERSION"
     WRONG_ROOM_KEYS_VERSION = "M_WRONG_ROOM_KEYS_VERSION"
     EXPIRED_ACCOUNT = "ORG_MATRIX_EXPIRED_ACCOUNT"
+    USER_DEACTIVATED = "M_USER_DEACTIVATED"
     PASSWORD_TOO_SHORT = "M_PASSWORD_TOO_SHORT"
     PASSWORD_NO_DIGIT = "M_PASSWORD_NO_DIGIT"
     PASSWORD_NO_UPPERCASE = "M_PASSWORD_NO_UPPERCASE"
@@ -159,7 +160,7 @@ def __init__(self, msg):
             msg (str): The human-readable error message
         """
         super(UserDeactivatedError, self).__init__(
-            code=http_client.FORBIDDEN, msg=msg, errcode=Codes.UNKNOWN
+            code=http_client.FORBIDDEN, msg=msg, errcode=Codes.USER_DEACTIVATED
         )
 
 

diff --git a/synapse/handlers/directory.py b/synapse/handlers/directory.py
@@ -278,7 +278,6 @@ def get_association(self, room_alias):
             servers = list(servers)
 
         return {"room_id": room_id, "servers": servers}
-        return
 
     @defer.inlineCallbacks
     def on_directory_query(self, args):
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Use `M_USER_DEACTIVATED` instead of `M_UNKNOWN` for errcode when a deactivated user attempts to login.