Merge pull request googleapis#134 from craigcitro/revoke

craigcitro · craigcitro · commit 75044598ad8a · 2015-03-17T14:40:11.000-07:00
Fall back to using an access_token for revocation.
diff --git a/oauth2client/client.py b/oauth2client/client.py
@@ -811,16 +811,16 @@ def _do_refresh_request(self, http_request):
       raise AccessTokenRefreshError(error_msg)
 
   def _revoke(self, http_request):
-    """Revokes the refresh_token and deletes the store if available.
+    """Revokes this credential and deletes the stored copy (if it exists).
 
     Args:
       http_request: callable, a callable that matches the method signature of
         httplib2.Http.request, used to make the revoke request.
     """
-    self._do_revoke(http_request, self.refresh_token)
+    self._do_revoke(http_request, self.refresh_token or self.access_token)
 
   def _do_revoke(self, http_request, token):
-    """Revokes the credentials and deletes the store if available.
+    """Revokes this credential and deletes the stored copy (if it exists).
 
     Args:
       http_request: callable, a callable that matches the method signature of
diff --git a/tests/test_oauth2client.py b/tests/test_oauth2client.py
@@ -560,6 +560,14 @@ def test_token_revoke_failure(self):
         self, '400', revoke_raise=True,
         valid_bool_value=False, token_attr='refresh_token')
 
+  def test_token_revoke_fallback(self):
+    original_credentials = self.credentials.to_json()
+    self.credentials.refresh_token = None
+    _token_revoke_test_helper(
+        self, '200', revoke_raise=False,
+      valid_bool_value=True, token_attr='access_token')
+    self.credentials = self.credentials.from_json(original_credentials)
+
   def test_non_401_error_response(self):
     http = HttpMockSequence([
       ({'status': '400'}, b''),
