Send a welcome mail on account creation: fixes #254

lpoujade · web-flow · commit cc7f8a95a813 · 2020-09-22T07:48:12.000+02:00
* Send a welcome mail on account creation
* Add test
diff --git a/pytition/petition/forms.py b/pytition/petition/forms.py
@@ -8,6 +8,7 @@
 
 from .models import Signature, PetitionTemplate, Petition, Organization, PytitionUser, SlugModel
 from .widgets import SwitchField
+from .helpers import send_welcome_mail
 
 import uuid
 import html
@@ -206,6 +207,8 @@ def clean(self):
         self.cleaned_data = cleaned_data
         return cleaned_data
 
+    def send_success_email(self):
+        send_welcome_mail(self.cleaned_data)
 
 class UpdateInfoForm(UserCreationForm):
     class Meta:
diff --git a/pytition/petition/helpers.py b/pytition/petition/helpers.py
@@ -89,6 +89,18 @@ def send_confirmation_email(request, signature):
         msg.attach_alternative(html_message, "text/html")
         msg.send(fail_silently=False)
 
+# Send welcome mail on account creation
+def send_welcome_mail(user_infos):
+    html_message = render_to_string("registration/confirmation_email.html", user_infos)
+    message = strip_tags(html_message)
+    with get_connection() as connection:
+        msg = EmailMultiAlternatives(_("Account created !"),
+                                     message, to=[user_infos["email"]], connection=connection,
+                                     reply_to=[settings.DEFAULT_NOREPLY_MAIL])
+        msg.attach_alternative(html_message, "text/html")
+        msg.send(fail_silently=False)
+
+
 
 # Generate a meta url for the HTML meta property
 def petition_detail_meta(request, petition_id):
diff --git a/pytition/petition/templates/registration/confirmation_email.html b/pytition/petition/templates/registration/confirmation_email.html
@@ -0,0 +1,16 @@
+{% load i18n %}
+{% get_current_language as LANGUAGE_CODE %}
+<!DOCTYPE html>
+<html lang="{{ LANGUAGE_CODE }}">
+<head>
+    <meta charset="UTF-8">
+</head>
+<body>
+
+<h2>{% trans "Welcome" %} {{ firstname }}!</h2>
+
+{% blocktrans %}
+You successfully created your account ! Your login is {{ username }}
+{% endblocktrans %}
+</body>
+</html>
diff --git a/pytition/petition/tests/tests_RegisterView.py b/pytition/petition/tests/tests_RegisterView.py
@@ -3,6 +3,7 @@
 from django.urls.exceptions import NoReverseMatch
 from django.conf import settings
 from django.contrib.auth import authenticate
+from django.core import mail
 
 from petition.models import PytitionUser
 
@@ -171,9 +172,11 @@ def test_createPytitionUser(self):
             self.assertEqual(toto.user.email, data["email"])
             self.assertEqual(toto.user.first_name, data["first_name"])
             self.assertEqual(toto.user.last_name, data["last_name"])
+            self.assertEqual(len(mail.outbox), 1)
+            self.assertEqual(mail.outbox[0].subject, 'Account created !')
             # Let's try to authenticate, to check password is OK
             pu = authenticate(username=data['username'], password=data['password1'])
             self.assertNotEqual(pu, None)
         else:
             with self.assertRaises(NoReverseMatch):
-                response = self.client.get(reverse("register"))
+                response = self.client.get(reverse("register"))
diff --git a/pytition/petition/views.py b/pytition/petition/views.py
@@ -35,7 +35,7 @@
 from .forms import DeleteAccountForm, OrgCreationForm
 from .helpers import get_client_ip, get_session_user, petition_from_id
 from .helpers import check_petition_is_accessible
-from .helpers import send_confirmation_email, subscribe_to_newsletter
+from .helpers import send_confirmation_email, subscribe_to_newsletter, send_welcome_mail
 from .helpers import get_update_form, petition_detail_meta
 
 
@@ -1741,4 +1741,8 @@ def get_form_kwargs(self):
         kwargs.update({
             'request': self.request
         })
-        return kwargs
+        return kwargs
+
+    def form_valid(self, form):
+        form.send_success_email()
+        return super().form_valid(form)
diff --git a/pytition/pytition/settings/base.py b/pytition/pytition/settings/base.py
@@ -264,3 +264,5 @@
 #:| If set to True, regular users won't be able to create new organizations.
 #:| Only superusers will be allowed to
 RESTRICT_ORG_CREATION = False
+
+DEFAULT_NOREPLY_MAIL = "noreply@domain.tld"
