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

email_validation: Rename to validate_is_not_disposable.

Browse Source 
This clarifies what we are asserting -- namely, that the email is
_not_ disposable.
This commit is contained in:
Alex Vandiver
2024-02-27 15:14:43 +00:00
committed by Tim Abbott
parent c1aadbe52e
commit 4b512b3409
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zerver/lib/email_validation.py
View File

@@ -17,7 +17,7 @@ from zerver.models.realms import (
from zerver.models.users import get_users_by_delivery_email, is_cross_realm_bot_email from zerver.models.users import get_users_by_delivery_email, is_cross_realm_bot_email
def validate_disposable(email: str) -> None: def validate_is_not_disposable(email: str) -> None:
if is_disposable_domain(Address(addr_spec=email).domain): if is_disposable_domain(Address(addr_spec=email).domain):
raise DisposableEmailError raise DisposableEmailError
@@ -26,7 +26,7 @@ def get_realm_email_validator(realm: Realm) -> Callable[[str], None]:
if not realm.emails_restricted_to_domains: if not realm.emails_restricted_to_domains:
# Should we also do '+' check for non-restricted realms? # Should we also do '+' check for non-restricted realms?
if realm.disallow_disposable_email_addresses: if realm.disallow_disposable_email_addresses:
return validate_disposable return validate_is_not_disposable
# allow any email through # allow any email through
return lambda email: None return lambda email: None

4
zilencer/views.py
View File

@@ -38,7 +38,7 @@ from corporate.models import (
get_customer_by_remote_realm, get_customer_by_remote_realm,
) )
from zerver.decorator import require_post from zerver.decorator import require_post
from zerver.lib.email_validation import validate_disposable from zerver.lib.email_validation import validate_is_not_disposable
from zerver.lib.exceptions import ( from zerver.lib.exceptions import (
ErrorCode, ErrorCode,
JsonableError, JsonableError,
@@ -143,7 +143,7 @@ def register_remote_server(
# We don't want to allow disposable domains for contact_email either # We don't want to allow disposable domains for contact_email either
try: try:
validate_disposable(contact_email) validate_is_not_disposable(contact_email)
except DisposableEmailError: except DisposableEmailError:
raise JsonableError(_("Please use your real email address.")) raise JsonableError(_("Please use your real email address."))