Merge lp:~canonical-isd-hackers/canonical-identity-provider/unify-new-account-emails into lp:canonical-identity-provider/release

[Łukasz Czyżykowski]

[Anthony Lenton (elachuni)]

review: Approve

=== modified file 'identityprovider/models/authtoken.py'
--- identityprovider/models/authtoken.py	2010-08-23 12:36:31 +0000
+++ identityprovider/models/authtoken.py	2010-08-27 12:46:45 +0000
@@ -126,14 +126,15 @@
         subject = u"%s: %s" % (current_brand.name, _("Forgotten Password"))
         self._send_email(from_name, subject, message)
 
-    def sendNewUserEmail(self):
+    def sendNewUserEmail(self, template='newuser.txt'):
         replacements = {
             'token': self.token,
-            'token_url': self.get_absolute_url()
+            'token_url': self.get_absolute_url(),
+            'toaddress': self.email,
         }
         from_name = unicode(current_brand.name)
-        message = render_to_string('%s/email/newuser.txt' %
-            current_brand.template_dir, replacements)
+        template_path = '%s/email/%s' % (current_brand.template_dir, template)
+        message = render_to_string(template_path, replacements)
         subject = u"%s: %s" % (current_brand.name,
                                _("Finish your registration"))
         self._send_email(from_name, subject, message)

=== renamed file 'identityprovider/templates/ubuntu/email/api-email-validation-token.txt' => 'identityprovider/templates/ubuntu/email/api-newuser.txt'
=== modified file 'identityprovider/templates/ubuntu/email/newuser.txt'
--- identityprovider/templates/ubuntu/email/newuser.txt	2010-07-15 22:20:43 +0000
+++ identityprovider/templates/ubuntu/email/newuser.txt	2010-08-27 12:46:45 +0000
@@ -1,7 +1,7 @@
 {% load i18n %}
 {% blocktrans %}Hello
 
-Thank you for registering with the Ubuntu Single Sign On service.
+As a final step of the Ubuntu Single Sign On (SSO) account creation process, please validate the email address {{ toaddress }}. Ubuntu SSO enables convenient access to a variety of Ubuntu-related services like Ubuntu One with the same username and password.
 
 Here is your confirmation code:
 
@@ -11,8 +11,9 @@
 
     {{ token_url }}
 
-If you don't know what this is about, then someone has probably entered your email address by mistake at the Ubuntu Single Sign On service web site. Sorry about that. You don't need to do anything further, just delete this message.
-
-Regards,
-
-The Ubuntu Single Sign On team{% endblocktrans %}
+If you don't know what this is about, then someone has probably entered your email address by mistake. Sorry about that. You don't need to do anything further. Just delete this message.
+
+Thank you,
+
+The Ubuntu Single Sign On team
+https://login.ubuntu.com/{% endblocktrans %}

=== modified file 'identityprovider/tests/test_models_authtoken.py'
--- identityprovider/tests/test_models_authtoken.py	2010-08-23 12:36:31 +0000
+++ identityprovider/tests/test_models_authtoken.py	2010-08-27 12:46:45 +0000
@@ -66,6 +66,33 @@
 
         self._teardown_mock_render_to_string(rts)
 
+    def test_sendNewUserEmail_uses_provided_template(self):
+        token = self._get_new_account_token()
+        mock_rts, rts = self._setup_mock_rendert_to_string()
+
+        token.sendNewUserEmail('new-template.txt')
+
+        self.assertTrue(mock_rts.template.endswith('new-template.txt'))
+
+        self._teardown_mock_render_to_string(rts)
+
+    def test_sendNewUserEmail_default_template(self):
+        token = self._get_new_account_token()
+        mock_rts, rts = self._setup_mock_rendert_to_string()
+
+        token.sendNewUserEmail()
+
+        self.assertTrue(mock_rts.template.endswith('newuser.txt'))
+
+        self._teardown_mock_render_to_string(rts)
+
+    def _get_new_account_token(self):
+        account = Account.objects.get_by_email('[e-mail]')
+        token = AuthTokenFactory().new(account, '[e-mail]',
+                                       '[e-mail]',
+                                       LoginTokenType.NEWACCOUNT, None)
+        return token
+
     def _teardown_mock_render_to_string(self, rts):
         authtoken.render_to_string = rts
 

=== modified file 'identityprovider/webservice/models.py'
--- identityprovider/webservice/models.py	2010-08-23 20:09:44 +0000
+++ identityprovider/webservice/models.py	2010-08-27 12:46:45 +0000
@@ -249,7 +249,7 @@
         token = AuthTokenFactory().new_api_email_validation_token(
             account, cleaned_data['email'])
 
-        token.sendEmailValidationToken('api-email-validation-token.txt')
+        token.sendNewUserEmail('api-newuser.txt')
 
         account_created.send(sender=self,
                              openid_identifier=account.openid_identifier)