From 1c869c22875a60b9d5ebb85baeaad41a07f2489e Mon Sep 17 00:00:00 2001 From: Rishi Gupta Date: Tue, 8 Nov 2016 16:55:45 -0800 Subject: [PATCH] models.email_allowed_for_realm: Use RealmAlias instead of domain. --- zerver/models.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/zerver/models.py b/zerver/models.py index 77b9338820..d5ad4fb70e 100644 --- a/zerver/models.py +++ b/zerver/models.py @@ -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]