Merge lp:~leonardr/launchpadlib/handle-unknown-token into lp:launchpadlib

[Leonard Richardson]

Sometimes a launchpadlib client will present Launchpad with an OAuth access token that's expired or invalid. Launchpad sends a 401 response code and an error message. launchpadlib recognizes these error messages and knows to fetch a new access token when it gets one. But it doesn't recognize the error message "Unknown access token", which is sent when a token is valid but Launchpad simply doesn't have it in its database.

Right now access tokens are kept in the Launchpad database permanently, so in normal usage this error only shows up on staging. You'll get it if you get an access token, then the staging database is wiped, then you try to use the token.

This branch makes launchpadlib request a new token when this error occurs. It's got a unit test and I've also tested it manually.

[Benji York (benji)]

Looks good.

review: Approve (code)

[Javier Collado (javier.collado)]

I had today exactly this problem and, after I updated launchpadlib to this change, it was fixed. Thanks.

=== modified file 'src/launchpadlib/NEWS.txt'
--- src/launchpadlib/NEWS.txt	2011-02-15 12:15:15 +0000
+++ src/launchpadlib/NEWS.txt	2011-02-28 16:18:29 +0000
@@ -2,6 +2,12 @@
 NEWS for launchpadlib
 =====================
 
+1.9.8 (2011-02-28)
+==================
+
+- Detect the error Launchpad sends when it doesn't recognize an access
+  token, and get a new token.
+
 1.9.7 (2011-02-15)
 ==================
 

=== modified file 'src/launchpadlib/__init__.py'
--- src/launchpadlib/__init__.py	2011-02-15 12:15:15 +0000
+++ src/launchpadlib/__init__.py	2011-02-28 16:18:29 +0000
@@ -14,4 +14,4 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with launchpadlib. If not, see <http://www.gnu.org/licenses/>.
 
-__version__ = '1.9.7'
+__version__ = '1.9.8'

=== modified file 'src/launchpadlib/launchpad.py'
--- src/launchpadlib/launchpad.py	2011-02-15 12:03:58 +0000
+++ src/launchpadlib/launchpad.py	2011-02-28 16:18:29 +0000
@@ -118,7 +118,8 @@
         """Helper method to detect an error caused by a bad OAuth token."""
         return (response.status == 401 and
                 (content.startswith("Expired token")
-                 or content.startswith("Invalid token")))
+                 or content.startswith("Invalid token")
+                 or content.startswith("Unknown access token")))
 
     def _request(self, *args):
         response, content = super(

=== modified file 'src/launchpadlib/tests/test_http.py'
--- src/launchpadlib/tests/test_http.py	2011-01-10 14:34:03 +0000
+++ src/launchpadlib/tests/test_http.py	2011-02-28 16:18:29 +0000
@@ -200,6 +200,19 @@
             'application name', authorization_engine=self.engine)
         self.assertEquals(self.engine.access_tokens_obtained, 2)
 
+    def test_unknown_token(self):
+        """If our token is unknown, we get another one."""
+
+        SimulatedResponsesLaunchpad.responses = [
+            Response(401, "Unknown access token."),
+            Response(200, SIMPLE_WADL),
+            Response(200, SIMPLE_JSON)]
+
+        self.assertEquals(self.engine.access_tokens_obtained, 0)
+        launchpad = SimulatedResponsesLaunchpad.login_with(
+            'application name', authorization_engine=self.engine)
+        self.assertEquals(self.engine.access_tokens_obtained, 2)
+
     def test_delayed_error(self):
         """We get another token no matter when the error happens."""
         SimulatedResponsesLaunchpad.responses = [