Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Change user deactivated errcode to USER_DEACTIVATED and use it #5686

Merged
merged 4 commits into from
Jul 31, 2019
Merged

Change user deactivated errcode to USER_DEACTIVATED and use it #5686

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fff89c3
Add USER_DEACTIVATED error code and use it
anoadragon453 Jul 15, 2019
280bfb1
Add changelog
anoadragon453 Jul 15, 2019
50a63d5
Fix bug # in changelog entry
anoadragon453 Jul 24, 2019
6f98bc6
Don't mention other PR
anoadragon453 Jul 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/5686.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Correction of #5686. Use `M_USER_DEACTIVATED` instead of `M_UNKNOWN` for errcode when a deactivated user attempts to login.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correction of #5686

this is 5686?

If we're updating an existing PR whose changes haven't yet been released, just copy the change fragment so that the entries are merged.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's been released in an rc now :)

3 changes: 2 additions & 1 deletion synapse/api/errors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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
)


Expand Down