Merge lp:~terrycojones/fom/add-oauth-calls-899576 into lp:fom

[Terry Jones]

Makes it possible to make OAuth2 calls to Fluidinfo.

[Nicholas Tollervey (ntoll)]

All the tests pass. I've also tried running some requests via the main instance using the new oAuth functionality and it works. +1 LGTM.

Now I just need to remember how to merge the bloody thing.

review: Approve

=== modified file 'fom/db.py'
--- fom/db.py	2011-08-30 11:40:04 +0000
+++ fom/db.py	2011-12-03 13:18:24 +0000
@@ -246,7 +246,17 @@
         auth = 'Basic ' + userpass.encode('base64').strip()
         self.headers['Authorization'] = auth
 
+    def login_oauth2(self, token):
+        """Prepare to make OAuth2 calls to Fluidinfo.
+
+        :param token: The OAuth token to pass in calls to Fluidinfo.
+        """
+        self.headers['Authorization'] = 'oauth2'
+        self.headers['X-FluidDB-Access-Token'] = token
+
     def logout(self):
         """Log out of this FluidDB instance
         """
-        del self.headers['Authorization']
+        # Use pop here, to avoid catching KeyError if login was never called.
+        self.headers.pop('Authorization', None)
+        self.headers.pop('X-FluidDB-Access-Token', None)
 
=== modified file 'fom/session.py'
--- fom/session.py	2010-02-06 22:29:08 +0000
+++ fom/session.py	2011-12-03 13:18:24 +0000
@@ -54,11 +54,21 @@
         """
         return self.db.login(username, password)
 
+    def login_oauth2(self, token):
+        """Log in to the connected FluidDB using OAuth2
+
+        The login is maintained for the session until :meth:`~Fluid.logout`
+        is called.
+
+        >>> fdb = Fluid()
+        >>> fdb.login_oauth2(u'token')
+        >>> fdb.users.get(u'aliafshar') # this is now authenticated
+
+        :param token: The OAuth token to pass in calls to Fluidinfo.
+        """
+        return self.db.login_oauth2(token)
+
     def logout(self):
         """Log out of the FluidDB session
         """
         return self.db.logout()
-
-
-
-
 
=== modified file 'tests/test_db.py'
--- tests/test_db.py	2010-12-24 15:30:04 +0000
+++ tests/test_db.py	2011-12-03 13:18:24 +0000
@@ -184,6 +184,25 @@
         db.logout()
         self.assertFalse('Authorization' in db.headers)
 
+    def testLoginLogoutOAuth2(self):
+        """
+        Make sure login and logout functions set things up correctly
+        when we use OAuth2.
+        """
+        token = 'kajfjowijmssafuwoisflsjlfsoieuossfh'
+        db = FluidDB(TEST_INSTANCE)
+        # start from a blank slate
+        self.assertFalse('Authorization' in db.headers)
+        self.assertFalse('X-FluidDB-Access-Token' in db.headers)
+        # Login
+        db.login_oauth2(token)
+        self.assertEquals(db.headers['Authorization'], 'oauth2')
+        self.assertEquals(db.headers['X-FluidDB-Access-Token'], token)
+        # Logout
+        db.logout()
+        self.assertFalse('Authorization' in db.headers)
+        self.assertFalse('X-FluidDB-Access-Token' in db.headers)
+
 
 if __name__ == '__main__':
     unittest.main()