From fff89c33d8e88397a135eefba90cb33188ace8a0 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Mon, 15 Jul 2019 13:25:52 +0100 Subject: [PATCH 1/4] Add USER_DEACTIVATED error code and use it --- synapse/api/errors.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/synapse/api/errors.py b/synapse/api/errors.py index ad3e262041df..cf1ebf1af231 100644 --- a/synapse/api/errors.py +++ b/synapse/api/errors.py @@ -61,6 +61,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" class CodeMessageException(RuntimeError): @@ -151,7 +152,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 ) From 280bfb15ce91bf5abf6232679b04ae708808b061 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Mon, 15 Jul 2019 13:30:35 +0100 Subject: [PATCH 2/4] Add changelog --- changelog.d/5686.feature | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/5686.feature diff --git a/changelog.d/5686.feature b/changelog.d/5686.feature new file mode 100644 index 000000000000..343d4f525836 --- /dev/null +++ b/changelog.d/5686.feature @@ -0,0 +1 @@ +Correction of #5686. Use `M_USER_DEACTIVATED` instead of `M_UNKNOWN` for errcode when a deactivated user attempts to login. From 50a63d5fdadf697f61b0fee16f959fd2cabf8487 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Wed, 24 Jul 2019 15:16:51 +0100 Subject: [PATCH 3/4] Fix bug # in changelog entry --- changelog.d/5686.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/5686.feature b/changelog.d/5686.feature index 343d4f525836..90a9f17deb23 100644 --- a/changelog.d/5686.feature +++ b/changelog.d/5686.feature @@ -1 +1 @@ -Correction of #5686. Use `M_USER_DEACTIVATED` instead of `M_UNKNOWN` for errcode when a deactivated user attempts to login. +Correction of #5674. Use `M_USER_DEACTIVATED` instead of `M_UNKNOWN` for errcode when a deactivated user attempts to login. From 6f98bc65121f1d01d08e44aff5b9dda81cbde6c8 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Wed, 31 Jul 2019 14:51:04 +0100 Subject: [PATCH 4/4] Don't mention other PR --- changelog.d/5686.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/5686.feature b/changelog.d/5686.feature index 90a9f17deb23..367aa1eca251 100644 --- a/changelog.d/5686.feature +++ b/changelog.d/5686.feature @@ -1 +1 @@ -Correction of #5674. Use `M_USER_DEACTIVATED` instead of `M_UNKNOWN` for errcode when a deactivated user attempts to login. +Use `M_USER_DEACTIVATED` instead of `M_UNKNOWN` for errcode when a deactivated user attempts to login.