Rework revoke_authorization(s) with new methods

sigmavirus24 · sigmavirus24 · commit df7a6d630ac9 · 2014-02-22T16:05:08.000-06:00
diff --git a/github3/github.py b/github3/github.py
@@ -1020,48 +1020,42 @@ def repository(self, owner, repository):
             json = self._json(self._get(url), 200)
         return Repository(json, self) if json else None
 
-    def _revoke_authorization(self, access_token=None):
-        """Helper method for revoking application authorization keys.
-
-        :param str access_token: (optional), the access token to delete; if
-            not provided, revoke all access tokens for this application
-
-        """
-        p = self._session.params
-        client_id = p.get('client_id')
-        client_secret = p.get('client_secret')
-        if client_id and client_secret:
-            auth = (client_id, client_secret)
-            url_parts = ['applications', str(auth[0]), 'tokens']
-            if access_token:
-                url_parts.append(access_token)
-            url = self._build_url(*url_parts)
-            return self._delete(url, auth=auth, params={
-                'client_id': None, 'client_secret': None
-            })
-        return False
-
     @requires_app_credentials
     def revoke_authorization(self, access_token):
         """Revoke specified authorization for an OAuth application.
 
-        Revoke all authorization tokens created by your application.
+        Revoke all authorization tokens created by your application. This will
+        only work if you have already called ``set_client_id``.
 
         :param str access_token: (required), the access_token to revoke
         :returns: bool -- True if successful, False otherwise
         """
-        self._revoke_authorization(access_token)
+        client_id, client_secret = self._session.retrieve_client_credentials()
+        url = self._build_url('applications', str(client_id), 'tokens',
+                              access_token)
+        with self._session.temporary_basic_auth(client_id, client_secret):
+            response = self._delete(url, params={'client_id': None,
+                                                 'client_secret': None})
+
+        return self._boolean(response, 204, 404)
 
     @requires_app_credentials
     def revoke_authorizations(self):
         """Revoke all authorizations for an OAuth application.
 
-        Revoke all authorization tokens created by your application.
+        Revoke all authorization tokens created by your application. This will
+        only work if you have already called ``set_client_id``.
 
         :param str client_id: (required), the client_id of your application
         :returns: bool -- True if successful, False otherwise
         """
-        self._revoke_authorization()
+        client_id, client_secret = self._session.retrieve_client_credentials()
+        url = self._build_url('applications', str(client_id), 'tokens')
+        with self._session.temporary_basic_auth(client_id, client_secret):
+            response = self._delete(url, params={'client_id': None,
+                                                 'client_secret': None})
+
+        return self._boolean(response, 204, 404)
 
     def search_code(self, query, sort=None, order=None, per_page=None,
                     text_match=False, number=-1, etag=None):
diff --git a/tests/unit/test_github.py b/tests/unit/test_github.py
@@ -15,20 +15,29 @@ def test_can_login_without_two_factor_callback(self):
         self.instance.login('username', 'password')
         self.instance.login(token='token')
 
+
+class TestGitHubAuthorizations(UnitHelper):
+    described_class = GitHub
+    example_data = None
+
+    def create_session_mock(self, *args):
+        session = super(TestGitHubAuthorizations,
+                        self).create_session_mock(*args)
+        session.retrieve_client_credentials.return_value = ('id', 'secret')
+        return session
+
     def test_revoke_authorization(self):
-        self.instance.set_client_id('key', 'secret')
+        self.instance.set_client_id('id', 'secret')
         self.instance.revoke_authorization('access_token')
         self.session.delete.assert_called_once_with(
-            'https://api.github.com/applications/key/tokens/access_token',
-            auth=('key', 'secret'),
+            'https://api.github.com/applications/id/tokens/access_token',
             params={'client_id': None, 'client_secret': None}
         )
 
     def test_revoke_authorizations(self):
-        self.instance.set_client_id('key', 'secret')
+        self.instance.set_client_id('id', 'secret')
         self.instance.revoke_authorizations()
         self.session.delete.assert_called_once_with(
-            'https://api.github.com/applications/key/tokens',
-            auth=('key', 'secret'),
+            'https://api.github.com/applications/id/tokens',
             params={'client_id': None, 'client_secret': None}
         )
