paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-18 21:06:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Extract get_existing_user_errors.

Browse Source 
This is a prep commit that will allow us
to more efficiently validate a bunch of
emails in the invite UI.

This commit does not yet change any
behavior or performance.

A secondary goal of this commit is to
prepare us to eliminate some hackiness
related to how we construct
`ValidationError` exceptions.

It preserves some quirks of the prior
implementation:

   - the strings we decided to translate
     here appear haphazard (and often
     get ignored anyway)

   - we use `msg` in most codepaths,
     but use `code` for invites

Right now we never actually call this with
more than one email, but that will change
soon.

Note that part of the rationale for the inner
method here is to avoid a test coverage bug
with `continue` in loops.
This commit is contained in:
Steve Howell
2020-03-02 15:07:19 +00:00
committed by Tim Abbott
parent ad85e286de
commit 6f62c993a6
2 changed files with 75 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
zerver/lib/actions.py
View File

@@ -116,7 +116,8 @@ from zerver.models import Realm, RealmEmoji, Stream, UserProfile, UserActivity,
from zerver.lib.alert_words import get_alert_word_automaton
from zerver.lib.avatar import avatar_url, avatar_url_from_dict
from zerver.lib.email_validation import get_realm_email_validator, \
validate_email_is_valid
validate_email_is_valid, get_existing_user_errors, \
email_reserved_for_system_bots_error
from zerver.lib.stream_recipient import StreamRecipientMap
from zerver.lib.validator import check_widget_content
from zerver.lib.widget import do_widget_post_save_actions
@@ -5027,7 +5028,7 @@ def do_send_confirmation_email(invitee: PreregistrationUser,
def email_not_system_bot(email: str) -> None:
if is_cross_realm_bot_email(email):
msg = '%s is reserved for system bots' % (email,)
msg = email_reserved_for_system_bots_error(email)
code = msg
raise ValidationError(
msg,
@@ -5036,22 +5037,22 @@ def email_not_system_bot(email: str) -> None:
)
def validate_email_not_already_in_realm(target_realm: Realm, email: str) -> None:
email_not_system_bot(email)
'''
NOTE:
Only use this to validate that a single email
is not already used in the realm.
try:
existing_user_profile = get_user_by_delivery_email(email, target_realm)
except UserProfile.DoesNotExist:
return
We should start using bulk_check_new_emails()
for any endpoint that takes multiple emails,
such as the "invite" interface.
'''
error_dict = get_existing_user_errors(target_realm, {email})
if existing_user_profile.is_active:
if existing_user_profile.is_mirror_dummy:
raise AssertionError("Mirror dummy user is already active!")
# Other users should not already exist at all.
raise ValidationError(_('%s already has an account') %
(email,), code = _("Already has an account."), params={'deactivated': False})
elif not existing_user_profile.is_mirror_dummy:
raise ValidationError('The account for %s has been deactivated' % (email,),
code = _("Account has been deactivated."), params={'deactivated': True})
# Loop through errors, the only key should be our email.
for key, error_info in error_dict.items():
assert key == email
msg, code, deactivated = error_info
raise ValidationError(msg, code=code, params=dict(deactivated=deactivated))
def validate_email(
user_profile: UserProfile,