Merge lp:~ricardokirkner/canonical-identity-provider/814104-mobile-api-fix into lp:~canonical-isd-hackers/canonical-identity-provider/stable

[Ricardo Kirkner]

modified registration flow via api for mobile platform

Overview
========

This branch changes the mobile platform behaviour for the 'register' api call so that the account gets created immeditaly after the call, but the email validation is left pending (exactly the same workflow as for the desktop platform).

Also, each platform has it's own template used to address specific platform dependent considerations.

[Anthony Lenton (elachuni)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-19 16:12:03 +0000
+++ debian/changelog	2011-07-22 12:53:51 +0000
@@ -1,3 +1,9 @@
+canonical-identity-provider (11.07.20-0ubuntu1) lucid; urgency=low
+
+  * Added missing django-piston dependency
+
+ -- Ricardo Kirkner <[e-mail]>  Wed, 20 Jul 2011 16:28:38 -0300
+
 canonical-identity-provider (11.07.19-0ubuntu1) lucid; urgency=low
 
   * Send optional sreg fields to RP if it's trusted and has auto_authorize set

=== modified file 'debian/control'
--- debian/control	2011-05-24 13:31:14 +0000
+++ debian/control	2011-07-22 12:53:51 +0000
@@ -18,6 +18,7 @@
  canonical-isd-web-dependencies (>= 1.0.18),
  memcached,
  python-django-oauth-backend (= 0.1.dev1),
+ python-django-piston,
  python-django-preflight (>= 0.1),
  python-django-preflight (<< 0.2),
  python-memcache,

=== modified file 'identityprovider/api10/handlers.py'
--- identityprovider/api10/handlers.py	2011-07-07 18:53:04 +0000
+++ identityprovider/api10/handlers.py	2011-07-22 12:53:51 +0000
@@ -55,12 +55,6 @@
 from oauth_backend.models import Token
 
 
-EMAIL_VALIDATION_TEMPLATES = {
-    'web': 'newuser.txt',
-    'mobile': 'newuser.txt',
-    'desktop': 'api-newuser.txt',
-}
-
 
 class CanNotResetPasswordError(Exception):
     pass
@@ -207,7 +201,7 @@
             cleaned_data['password'])
         displayname = cleaned_data['displayname']
         email = cleaned_data['email']
-        if platform == 'desktop':
+        if platform in ['desktop', 'mobile']:
             account = Account.objects.create_account(
                 displayname, email,
                 encrypted_password, password_encrypted=True,
@@ -221,15 +215,15 @@
                 displayname=displayname,
                 password=encrypted_password)
 
-        template = EMAIL_VALIDATION_TEMPLATES.get(platform)
+        template = '{0}-newuser.txt'.format(platform)
         if template is None:
             msg = ('Invalid platform requested during registration: {0}. '
                 'Using default platform.'.format(platform))
             logging.warn(msg)
-            template = EMAIL_VALIDATION_TEMPLATES.get('desktop')
+            template = 'desktop-newuser.txt'
         token.sendNewUserEmail(template=template)
 
-        if platform == 'desktop':
+        if platform in ['desktop', 'mobile']:
             account_created.send(sender=self,
                                  openid_identifier=account.openid_identifier)
 

=== modified file 'identityprovider/models/authtoken.py'
--- identityprovider/models/authtoken.py	2011-07-06 20:09:53 +0000
+++ identityprovider/models/authtoken.py	2011-07-22 12:53:51 +0000
@@ -134,7 +134,7 @@
         self._send_email(from_name, subject, message)
 
     # {{workflow}} remove the `old` parameter
-    def sendNewUserEmail(self, template='newuser.txt', old=False):
+    def sendNewUserEmail(self, template='web-newuser.txt', old=False):
         url = self.get_absolute_url() if old else self.get_direct_absolute_url()
         replacements = {
             'token': self.token,

=== renamed file 'identityprovider/templates/ubuntu/email/api-newuser.txt' => 'identityprovider/templates/ubuntu/email/desktop-newuser.txt'
=== added file 'identityprovider/templates/ubuntu/email/mobile-newuser.txt'
--- identityprovider/templates/ubuntu/email/mobile-newuser.txt	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/ubuntu/email/mobile-newuser.txt	2011-07-22 12:53:51 +0000
@@ -0,0 +1,15 @@
+{% load i18n %}
+{% blocktrans %}Hello
+
+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.
+
+Copy and paste the confirmation code below into your mobile device application.
+
+{{ token }}
+
+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 %}

=== renamed file 'identityprovider/templates/ubuntu/email/newuser.txt' => 'identityprovider/templates/ubuntu/email/web-newuser.txt'
=== modified file 'identityprovider/tests/test_handlers.py'
--- identityprovider/tests/test_handlers.py	2011-07-11 14:33:55 +0000
+++ identityprovider/tests/test_handlers.py	2011-07-22 12:53:51 +0000
@@ -127,7 +127,8 @@
         response = self.registration.register(request)
         self.assertEqual(response['status'], 'ok')
 
-        mock_sendNewUserEmail.assert_called_with(template='api-newuser.txt')
+        mock_sendNewUserEmail.assert_called_with(
+            template='desktop-newuser.txt')
 
     @patch('identityprovider.models.authtoken.AuthToken.sendNewUserEmail')
     def test_register_with_platform(self, mock_sendNewUserEmail):
@@ -141,7 +142,8 @@
         response = self.registration.register(request)
         self.assertEqual(response['status'], 'ok')
 
-        mock_sendNewUserEmail.assert_called_with(template='newuser.txt')
+        mock_sendNewUserEmail.assert_called_with(
+            template='mobile-newuser.txt')
 
     @patch('identityprovider.models.authtoken.AuthToken.sendNewUserEmail')
     def test_register_with_invalid_platform(self, mock_sendNewUserEmail):
@@ -194,9 +196,10 @@
             email.account, '[e-mail]', 'http://foo')
 
     @patch('identityprovider.api10.handlers.encrypt_launchpad_password')
-    @patch('identityprovider.models.authtoken.AuthTokenFactory.new')
-    def test_register_from_mobile_with_redirection_url(self, mock_new,
-            mock_encrypt_launchpad_password):
+    @patch('identityprovider.models.authtoken.AuthTokenFactory.'
+        'new_api_email_validation_token')
+    def test_register_from_mobile_with_redirection_url(self,
+        mock_new_api_email_validation_token, mock_encrypt_launchpad_password):
 
         mock_encrypt_launchpad_password.return_value = 'the_password'
 
@@ -211,14 +214,15 @@
         response = self.registration.register(request)
         self.assertEqual(response['status'], 'ok')
 
-        mock_new.assert_called_with(None, None, '[e-mail]',
-            LoginTokenType.NEWPERSONLESSACCOUNT, 'http://foo',
-            displayname='', password='the_password')
+        email = EmailAddress.objects.get(email='[e-mail]')
+        mock_new_api_email_validation_token.assert_called_with(
+            email.account, '[e-mail]', 'http://foo')
 
     @patch('identityprovider.api10.handlers.encrypt_launchpad_password')
-    @patch('identityprovider.models.authtoken.AuthTokenFactory.new')
-    def test_register_from_mobile_without_redirection_url(self, mock_new,
-            mock_encrypt_launchpad_password):
+    @patch('identityprovider.models.authtoken.AuthTokenFactory.'
+        'new_api_email_validation_token')
+    def test_register_from_mobile_without_redirection_url(self,
+        mock_new_api_email_validation_token, mock_encrypt_launchpad_password):
 
         mock_encrypt_launchpad_password.return_value = 'the_password'
 
@@ -232,9 +236,9 @@
         response = self.registration.register(request)
         self.assertEqual(response['status'], 'ok')
 
-        mock_new.assert_called_with(None, None, '[e-mail]',
-            LoginTokenType.NEWPERSONLESSACCOUNT, None,
-            displayname='', password='the_password')
+        email = EmailAddress.objects.get(email='[e-mail]')
+        mock_new_api_email_validation_token.assert_called_with(
+            email.account, '[e-mail]', None)
 
 
 class AuthenticationTestCase(SQLCachedTestCase):
@@ -281,4 +285,3 @@
         content = simplejson.loads(response.content)
         self.assertEqual(set(content.keys()), set(expected_keys))
         self.assertEqual(content['name'], 'some-token')
-

=== modified file 'identityprovider/tests/test_models_authtoken.py'
--- identityprovider/tests/test_models_authtoken.py	2011-07-06 20:09:53 +0000
+++ identityprovider/tests/test_models_authtoken.py	2011-07-22 12:53:51 +0000
@@ -87,7 +87,7 @@
 
         token.sendNewUserEmail()
 
-        self.assertTrue(mock_rts.template.endswith('newuser.txt'))
+        self.assertTrue(mock_rts.template.endswith('web-newuser.txt'))
 
         self._teardown_mock_render_to_string(rts)