Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI option to subscribe existing accounts during bulk invites. #16041

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

UI option to subscribe existing accounts during bulk invites. #16041

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e6ba394
email_validation/tests: Return anonymous email when inviting existing…
sumanthvrao Aug 4, 2020
8a454ae
tests: Add test for existing user anon_email matching delivery_email.
sumanthvrao Aug 5, 2020
aca56d6
actions: Add show_subscription param when raising InvitationError.
sumanthvrao Aug 5, 2020
9a1608b
api: Document API changes for invites and bump API_FEATURE_LEVEL.
sumanthvrao Aug 5, 2020
2e0bc93
invite: Add UI to subscribe users with existing accounts.
sumanthvrao Aug 5, 2020
4916ebf
css: Add subscribe_existing_accounts button styling in zulip.scss.
sumanthvrao Aug 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
tests: Add test for existing user anon_email matching delivery_email. 
When the email_address_visibility realm setting is switched to
Realm.EMAIL_ADDRESS_VISIBILITY_EVERYONE, get_existing_user_errors
returns the maybe_anonymous_email parameter, which in this case
should match with the delivery_email.
  • Loading branch information
@sumanthvrao
sumanthvrao committed Aug 25, 2020
commit 8a454aea0bad76993ceb2777cd15e8d1a1da4598
11 changes: 10 additions & 1 deletion zerver/tests/test_auth_backends.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5005,14 +5005,23 @@ def test_validate_email(self) -> None:
self.assertEqual(error, 'Already has an account.')
self.assertEqual(maybe_anonymous_email, cordelia_anonymous_email)

do_set_realm_property(realm, 'email_address_visibility', Realm.EMAIL_ADDRESS_VISIBILITY_EVERYONE)
cordelia.refresh_from_db()

errors = get_existing_user_errors(realm, {cordelia_email})
error, is_deactivated, maybe_anonymous_email = errors[cordelia_email]
self.assertEqual(False, is_deactivated)
self.assertEqual(error, 'Already has an account.')
self.assertEqual(maybe_anonymous_email, cordelia_email)

cordelia.is_active = False
cordelia.save()

errors = get_existing_user_errors(realm, {cordelia_email})
error, is_deactivated, maybe_anonymous_email = errors[cordelia_email]
self.assertEqual(True, is_deactivated)
self.assertEqual(error, 'Account has been deactivated.')
self.assertEqual(maybe_anonymous_email, cordelia_anonymous_email)
self.assertEqual(maybe_anonymous_email, cordelia_email)

errors = get_existing_user_errors(realm, {'fred-is-fine@zulip.com'})
self.assertEqual(errors, {})
Expand Down