Ticket #17431: password_reset_custom_email.diff

django/contrib/auth/tests/forms.py

@@ -276 +276 @@
             self.assertEqual(len(mail.outbox), 1)
             self.assertEqual(mail.outbox[0].subject, u'Custom password reset on example.com')
 
+    def test_custom_email_constructor(self):
+        template_path = os.path.join(os.path.dirname(__file__), 'templates')
+        with self.settings(TEMPLATE_DIRS=(template_path,)):
+            data = {'email': 'testclient@example.com'}
+
+            class CustomEmailPasswordResetForm(PasswordResetForm):
+                def construct_email(self, ctx, user, **kwargs):
+                    from django.core.mail import EmailMessage
+
+                    email_message = EmailMessage(u"Forgot your password?", 
+                                                 u"Sorry to hear you forgot your password.",
+                                                 None, [user.email], 
+                                                 ['site_monitor@example.com'],
+                                                 headers = {'Reply-To': 'webmaster@example.com'})
+                    email_message.content_subtype = "text/html"
+                    return email_message
+
+            form = CustomEmailPasswordResetForm(data)
+            self.assertTrue(form.is_valid())
+            # Since we're not providing a request object, we must provide a
+            # domain_override to prevent the save operation from failing in the
+            # potential case where contrib.sites is not installed. Refs #16412.
+            form.save(domain_override='example.com')
+            self.assertEqual(len(mail.outbox), 1)
+            self.assertEqual(mail.outbox[0].subject, u'Forgot your password?')
+            self.assertEqual(mail.outbox[0].bcc, ['site_monitor@example.com'])
+            self.assertEqual(mail.outbox[0].content_subtype, "text/html")
+
     def test_bug_5605(self):
         # bug #5605, preserve the case of the user name (before the @ in the
         # email address) when creating a user.

django/contrib/auth/forms.py

@@ -188 +188 @@
             raise forms.ValidationError(self.error_messages['unusable'])
         return email
 
+    def construct_email(self, ctx, user, **kwargs):
+        """
+        Constructs and returns a django.core.mail.EmailMessage object
+        to be sent when the form's .save() method is called
+        """
+
+        from django.core.mail import EmailMessage
+
+        subject_template_name = kwargs['subject_template_name']
+        email_template_name = kwargs['email_template_name']
+        from_email = kwargs['from_email']
+
+        subject = loader.render_to_string(subject_template_name, ctx)
+        # Email subject *must not* contain newlines
+        subject = ''.join(subject.splitlines())
+        body = loader.render_to_string(email_template_name, ctx)
+        
+        email_message = EmailMessage(subject, body, from_email, [user.email])
+        return email_message
+
     def save(self, domain_override=None,
              subject_template_name='registration/password_reset_subject.txt',
              email_template_name='registration/password_reset_email.html',
@@ -213 +233 @@
                 'token': token_generator.make_token(user),
                 'protocol': use_https and 'https' or 'http',
             }
-            subject = loader.render_to_string(subject_template_name, c)
-            # Email subject *must not* contain newlines
-            subject = ''.join(subject.splitlines())
-            email = loader.render_to_string(email_template_name, c)
-            send_mail(subject, email, from_email, [user.email])
 
+            email_message = self.construct_email(c, user, 
+                                                 subject_template_name=subject_template_name,
+                                                 email_template_name=email_template_name,
+                                                 from_email=from_email)
+            email_message.send()
 
 class SetPasswordForm(forms.Form):
     """