CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-07-12 21:04:41 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

decorator: Check for deactivated realm before deactivated user.

Browse Source 
Structurally, this is the right order-of-access for data.
This commit is contained in:
Tim Abbott 2018-08-09 15:57:18 -07:00
parent aaedec1fdb
commit a124db5f7b
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zerver/decorator.py
View File

@ -231,11 +231,10 @@ def validate_api_key(request: HttpRequest, role: Optional[str],
return user_profile
def validate_account_and_subdomain(request: HttpRequest, user_profile: UserProfile) -> None:
if not user_profile.is_active:
raise JsonableError(_("Account not active"))
if user_profile.realm.deactivated:
raise JsonableError(_("This organization has been deactivated"))
if not user_profile.is_active:
raise JsonableError(_("Account not active"))
# Either the subdomain matches, or processing a websockets message
# in the message_sender worker (which will have already had the