Merge lp:~canonical-isd-hackers/canonical-identity-provider/sso-piston-api-unquoted-params into lp:canonical-identity-provider/release

[Ricardo Kirkner]

Fix a bug in the piston api that doesn't correctly handle unquoted parameters

Overview
========

Fix a bug in the piston api that doesn't correctly handle unquoted parameters

[Anthony Lenton (elachuni)]

Thanks!

review: Approve

=== modified file 'identityprovider/api10/handlers.py'
--- identityprovider/api10/handlers.py	2011-07-07 18:16:53 +0000
+++ identityprovider/api10/handlers.py	2011-07-07 18:33:34 +0000
@@ -118,7 +118,11 @@
         for key in serialized:
             if key == 'ws.op':
                 continue
-            data[key] = simplejson.loads(serialized[key])
+            try:
+                value = simplejson.loads(serialized[key])
+            except (ValueError, TypeError):
+                value = serialized[key]
+            data[key] = value
         return data
 
 

=== modified file 'identityprovider/tests/test_handlers.py'
--- identityprovider/tests/test_handlers.py	2011-06-15 22:24:43 +0000
+++ identityprovider/tests/test_handlers.py	2011-07-07 18:33:34 +0000
@@ -1,3 +1,6 @@
+import base64
+
+from django.utils import simplejson
 from mock import patch
 
 from identityprovider.tests.utils import SQLCachedTestCase
@@ -175,3 +178,28 @@
         account = self.authentication.account_by_openid(request)
 
         self.assertTrue(account is None)
+
+    def test_authenticate_unquoted_token(self):
+        expected_keys = ['consumer_key', 'consumer_secret', 'name', 'token',
+            'token_secret']
+
+        extra = {'HTTP_AUTHORIZATION': 'basic ' + base64.b64encode('[e-mail]:test')}
+        response = self.client.get('/api/1.0/authentications', data={
+            'ws.op': 'authenticate', 'token_name': 'some-token'}, **extra)
+
+        content = simplejson.loads(response.content)
+        self.assertEqual(set(content.keys()), set(expected_keys))
+        self.assertEqual(content['name'], 'some-token')
+
+    def test_authenticate_quoted_token(self):
+        expected_keys = ['consumer_key', 'consumer_secret', 'name', 'token',
+            'token_secret']
+
+        extra = {'HTTP_AUTHORIZATION': 'basic ' + base64.b64encode('[e-mail]:test')}
+        response = self.client.get('/api/1.0/authentications', data={
+            'ws.op': 'authenticate', 'token_name': '"some-token"'}, **extra)
+
+        content = simplejson.loads(response.content)
+        self.assertEqual(set(content.keys()), set(expected_keys))
+        self.assertEqual(content['name'], 'some-token')
+