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.

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

[#2967] Fix verification email not sent #1600

Merged
merged 1 commit into from
Feb 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/open_inwoner/accounts/views/registration.py
Original file line number Diff line number Diff line change
Expand Up @@ -245,12 +245,12 @@ def get(self, request, *args, **kwargs):
get_next_url_from(self.request, default=reverse("pages-root"))
)

# send verification email immediately on requesting page, but only once
if not request.session.get("verification_email_sent"):
# send verification email immediately on requesting page
if request.session.get("verification_email_sent_to") != user.email:
send_user_email_verification_mail(
user, next_url=get_next_url_from(self.request, default="")
)
request.session["verification_email_sent"] = True
request.session["verification_email_sent_to"] = user.email

return super().get(request, *args, **kwargs)

Expand Down
34 changes: 33 additions & 1 deletion src/open_inwoner/mail/tests/test_verification.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from django.conf import settings
from django.core import mail
from django.test import TestCase, override_settings
from django.test import RequestFactory, TestCase, override_settings
from django.urls import reverse

from django_webtest import WebTest
Expand All @@ -11,6 +11,7 @@
from pyquery.pyquery import PyQuery

from open_inwoner.accounts.tests.factories import UserFactory
from open_inwoner.accounts.views.registration import EmailVerificationUserView
from open_inwoner.cms.profile.cms_apps import ProfileApphook
from open_inwoner.cms.tests import cms_tools
from open_inwoner.configurations.models import SiteConfiguration
Expand Down Expand Up @@ -322,3 +323,34 @@ def test_unverified_user_redirects__with_next_url(self, mock_send):

# email sent after submitting form
mock_send.assert_called_once_with(user, target_url)

@patch(
"open_inwoner.accounts.views.registration.send_user_email_verification_mail",
autospec=True,
)
def test_verification_email_dupes(self, mock_send):
request_factory = RequestFactory()
user = UserFactory(email="foo@example.com")

request = request_factory.get("/")
request.session = {}
request.user = user

view = EmailVerificationUserView.as_view()

# two requests with the same email: one call
view(request)
view(request)

mock_send.assert_called_once_with(user, next_url="")

# request with changed email: two calls
user.email = "changed@example.com"
view(request)

self.assertEqual(len(mock_send.call_args_list), 2)

# still two calls
view(request)

self.assertEqual(len(mock_send.call_args_list), 2)
Loading