Merge lp:~canonical-isd-hackers/canonical-identity-provider/794957-api-register-platform into lp:canonical-identity-provider/release

[Ricardo Kirkner]

added platform parameter to the register api call to support different api user types

added platform parameter to the register api call to support different api user types

[David Owen (dsowen)]

Great way to maintain backwards compatibility!

review: Approve

=== modified file 'identityprovider/api10/handlers.py'
--- identityprovider/api10/handlers.py	2011-06-07 15:03:14 +0000
+++ identityprovider/api10/handlers.py	2011-06-16 14:06:48 +0000
@@ -54,6 +54,13 @@
 from oauth_backend.models import Token
 
 
+EMAIL_VALIDATION_TEMPLATES = {
+    'web': 'newuser.txt',
+    'mobile': 'newuser.txt',
+    'desktop': 'api-newuser.txt',
+}
+
+
 class CanNotResetPasswordError(Exception):
     pass
 
@@ -203,7 +210,14 @@
         token = AuthTokenFactory().new_api_email_validation_token(
             account, cleaned_data['email'])
 
-        token.sendNewUserEmail('api-newuser.txt')
+        platform = data.get('platform', 'desktop')
+        template = EMAIL_VALIDATION_TEMPLATES.get(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')
+        token.sendNewUserEmail(template=template)
 
         account_created.send(sender=self,
                              openid_identifier=account.openid_identifier)

=== modified file 'identityprovider/templates/wadl1.0.xml'
--- identityprovider/templates/wadl1.0.xml	2011-05-10 12:37:21 +0000
+++ identityprovider/templates/wadl1.0.xml	2011-06-16 14:06:48 +0000
@@ -597,6 +597,13 @@
 </wadl:doc>
               
             </wadl:param>
+            <wadl:param style="query" required="false"
+                        name="consumer_type">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Consumer type.
+</wadl:doc>
+
+            </wadl:param>
           </wadl:representation>
         </wadl:request>
         

=== modified file 'identityprovider/tests/test_handlers.py'
--- identityprovider/tests/test_handlers.py	2011-05-11 13:01:00 +0000
+++ identityprovider/tests/test_handlers.py	2011-06-16 14:06:48 +0000
@@ -19,6 +19,7 @@
     RegistrationHandler,
 )
 
+
 class MockRequest(object):
     def __init__(self, data=None, user=None):
         self.user = user
@@ -48,7 +49,7 @@
 
     def test_reset_token_when_email_is_invalid(self):
         request = MockRequest(data={'email': "[e-mail]"})
-        
+
         self.assertRaises(CanNotResetPasswordError,
                           self.registration.request_password_reset_token,
                           request)
@@ -112,6 +113,47 @@
         account = Account.objects.get_by_email('[e-mail]')
         self.assertEqual(account.displayname, 'Test User')
 
+    @patch('identityprovider.models.authtoken.AuthToken.sendNewUserEmail')
+    def test_register_without_platform(self, mock_sendNewUserEmail):
+        request = MockRequest(data={
+            'email': '[e-mail]',
+            'password': 'MySecretPassword1',
+            'captcha_solution': 'foobar',
+            'captcha_id': 'id',
+        })
+        response = self.registration.register(request)
+        self.assertEqual(response['status'], 'ok')
+
+        mock_sendNewUserEmail.assert_called_with(template='api-newuser.txt')
+
+    @patch('identityprovider.models.authtoken.AuthToken.sendNewUserEmail')
+    def test_register_with_platform(self, mock_sendNewUserEmail):
+        request = MockRequest(data={
+            'email': '[e-mail]',
+            'password': 'MySecretPassword1',
+            'captcha_solution': 'foobar',
+            'captcha_id': 'id',
+            'platform': 'mobile',
+        })
+        response = self.registration.register(request)
+        self.assertEqual(response['status'], 'ok')
+
+        mock_sendNewUserEmail.assert_called_with(template='newuser.txt')
+
+    @patch('identityprovider.models.authtoken.AuthToken.sendNewUserEmail')
+    def test_register_with_invalid_platform(self, mock_sendNewUserEmail):
+        request = MockRequest(data={
+            'email': '[e-mail]',
+            'password': 'MySecretPassword1',
+            'captcha_solution': 'foobar',
+            'captcha_id': 'id',
+            'platform': 'foo',
+        })
+        response = self.registration.register(request)
+        self.assertEqual(response['status'], 'ok')
+
+        mock_sendNewUserEmail.assert_called_with(template='api-newuser.txt')
+
 
 class AuthenticationTestCase(SQLCachedTestCase):
 

=== modified file 'payload/__init__.py'
--- payload/__init__.py	2011-06-10 14:23:27 +0000
+++ payload/__init__.py	2011-06-16 14:06:48 +0000
@@ -49,8 +49,6 @@
     setup_virtualenv()
     install_dependencies()
     _setup_configuration()
-    # make sure the virtualenv is refreshed
-    setup_virtualenv()
 
 
 def clean():

=== modified file 'payload/postgresql.py'
--- payload/postgresql.py	2011-06-10 15:55:13 +0000
+++ payload/postgresql.py	2011-06-16 14:06:48 +0000
@@ -162,9 +162,6 @@
     port = env.database['PORT']
     if port:
         pg_env.append("PGPORT=%s" % port)
-    user = os.environ.get('PGUSER', env.database['USER'])
-    if user:
-        pg_env.append("PGUSER=%s" % user)
 
     env.postgres['ENV'] = ' '.join(pg_env)