yul/bookwyrm-mastodon
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Activate pending users when email confirmation is disabled

Browse Source
This commit is contained in:
Mouse Reeve
2022-01-20 15:58:00 -08:00
parent 874e2e0a9c
commit 148f9b6f5e
2 changed files with 43 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
bookwyrm/tests/models/test_site.py
View File

@ -94,27 +94,47 @@ class SiteModels(TestCase):
self.assertTrue(token.valid())
self.assertEqual(token.link, f"https://{settings.DOMAIN}/password-reset/hello")
def test_change_confirmation_scheme(self):
@patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
@patch("bookwyrm.suggested_users.remove_user_task.delay")
@patch("bookwyrm.activitystreams.populate_stream_task.delay")
@patch("bookwyrm.lists_stream.populate_lists_task.delay")
def test_change_confirmation_scheme(self, *_):
"""Switch from requiring email confirmation to not"""
site = models.SiteSettings.objects.create(
id=1, name="Fish Town", require_confirm_email=True
)
with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
"bookwyrm.activitystreams.populate_stream_task.delay"
), patch("bookwyrm.lists_stream.populate_lists_task.delay"):
pending_user = models.User.objects.create_user(
"nutria@local.com",
"nutria@nutria.com",
"nutriaword",
local=True,
localname="nutria",
remote_id="https://example.com/users/nutria",
is_active=False,
deactivation_reason="pending",
confirmation_code="HELLO",
)
banned_user = models.User.objects.create_user(
"rat@local.com",
"rat@rat.com",
"ratword",
local=True,
localname="rat",
remote_id="https://example.com/users/rat",
confirmation_code="HELLO",
)
banned_user.is_active = False
banned_user.deactivation_reason = "banned"
banned_user.save(broadcast=False)
pending_user = models.User.objects.create_user(
"nutria@local.com",
"nutria@nutria.com",
"nutriaword",
local=True,
localname="nutria",
remote_id="https://example.com/users/nutria",
confirmation_code="HELLO",
)
pending_user.is_active = False
pending_user.deactivation_reason = "pending"
pending_user.save(broadcast=False)
site.require_confirm_email = False
site.save()
pending_user.refresh_from_db()
self.assertTrue(pending_user.is_active)
self.assertIsNone(pending_user.deactivation_reason)
banned_user.refresh_from_db()
self.assertFalse(banned_user.is_active)
self.assertIsNotNone(banned_user.deactivation_reason)