paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

models.email_allowed_for_realm: Use RealmAlias instead of domain.

Browse Source
This commit is contained in:
Rishi Gupta
2016-11-08 16:55:45 -08:00
committed by Tim Abbott
parent 70ab79d056
commit 1c869c2287
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
zerver/models.py
View File

@@ -315,13 +315,10 @@ def resolve_email_to_domain(email):
# not whether the user can sign up currently.)
def email_allowed_for_realm(email, realm):
# type: (text_type, Realm) -> bool
# Anyone can be in an open realm
if not realm.restricted_to_domain:
return True
# Otherwise, domains must match (case-insensitively)
email_domain = resolve_email_to_domain(email)
return email_domain == realm.domain.lower()
domain = split_email_to_domain(email)
return RealmAlias.objects.filter(realm = realm, domain = domain).exists()
def alias_for_realm(domain):
# type: (text_type) -> Optional[RealmAlias]