Using the JsonHttpClient Util in Auth Module (#249)

* Using JsonHttpClient util in auth module

* Removed unused import

Author: hiranya911

firebase_admin/_token_gen.py

@@ -206,7 +206,7 @@ def create_session_cookie(self, id_token, expires_in):
             'validDuration': expires_in,
         }
         try:
-            response = self.client.request('post', 'createSessionCookie', json=payload)
+            response = self.client.body('post', 'createSessionCookie', json=payload)
         except requests.exceptions.RequestException as error:
             self._handle_http_error(COOKIE_CREATE_ERROR, 'Failed to create session cookie', error)
         else:

firebase_admin/_user_mgt.py

@@ -394,7 +394,7 @@ def get_user(self, **kwargs):
             raise TypeError('Unsupported keyword arguments: {0}.'.format(kwargs))
 
         try:
-            response = self._client.request('post', 'getAccountInfo', json=payload)
+            response = self._client.body('post', 'getAccountInfo', json=payload)
         except requests.exceptions.RequestException as error:
             msg = 'Failed to get user by {0}: {1}.'.format(key_type, key)
             self._handle_http_error(INTERNAL_ERROR, msg, error)
@@ -421,7 +421,7 @@ def list_users(self, page_token=None, max_results=MAX_LIST_USERS_RESULTS):
         if page_token:
             payload['nextPageToken'] = page_token
         try:
-            return self._client.request('post', 'downloadAccount', json=payload)
+            return self._client.body('post', 'downloadAccount', json=payload)
         except requests.exceptions.RequestException as error:
             self._handle_http_error(USER_DOWNLOAD_ERROR, 'Failed to download user accounts.', error)
 
@@ -440,7 +440,7 @@ def create_user(self, uid=None, display_name=None, email=None, phone_number=None
         }
         payload = {k: v for k, v in payload.items() if v is not None}
         try:
-            response = self._client.request('post', 'signupNewUser', json=payload)
+            response = self._client.body('post', 'signupNewUser', json=payload)
         except requests.exceptions.RequestException as error:
             self._handle_http_error(USER_CREATE_ERROR, 'Failed to create new user.', error)
         else:
@@ -490,7 +490,7 @@ def update_user(self, uid, display_name=_UNSPECIFIED, email=None, phone_number=_
 
         payload = {k: v for k, v in payload.items() if v is not None}
         try:
-            response = self._client.request('post', 'setAccountInfo', json=payload)
+            response = self._client.body('post', 'setAccountInfo', json=payload)
         except requests.exceptions.RequestException as error:
             self._handle_http_error(
                 USER_UPDATE_ERROR, 'Failed to update user: {0}.'.format(uid), error)
@@ -503,7 +503,7 @@ def delete_user(self, uid):
         """Deletes the user identified by the specified user ID."""
         _auth_utils.validate_uid(uid, required=True)
         try:
-            response = self._client.request('post', 'deleteAccount', json={'localId' : uid})
+            response = self._client.body('post', 'deleteAccount', json={'localId' : uid})
         except requests.exceptions.RequestException as error:
             self._handle_http_error(
                 USER_DELETE_ERROR, 'Failed to delete user: {0}.'.format(uid), error)
@@ -529,7 +529,7 @@ def import_users(self, users, hash_alg=None):
                 raise ValueError('A UserImportHash is required to import users with passwords.')
             payload.update(hash_alg.to_dict())
         try:
-            response = self._client.request('post', 'uploadAccount', json=payload)
+            response = self._client.body('post', 'uploadAccount', json=payload)
         except requests.exceptions.RequestException as error:
             self._handle_http_error(USER_IMPORT_ERROR, 'Failed to import users.', error)
         else:

firebase_admin/auth.py

@@ -21,9 +21,8 @@
 
 import time
 
-from google.auth import transport
-
 import firebase_admin
+from firebase_admin import _http_client
 from firebase_admin import _token_gen
 from firebase_admin import _user_import
 from firebase_admin import _user_mgt
@@ -467,8 +466,14 @@ def __init__(self, code, message, error=None):
 class _AuthService(object):
     """Firebase Authentication service."""
 
+    ID_TOOLKIT_URL = 'https://www.googleapis.com/identitytoolkit/v3/relyingparty/'
+
     def __init__(self, app):
-        client = _AuthHTTPClient(app)
+        credential = app.credential.get_credential()
+        version_header = 'Python/Admin/{0}'.format(firebase_admin.__version__)
+        client = _http_client.JsonHttpClient(
+            credential=credential, base_url=self.ID_TOOLKIT_URL,
+            headers={'X-Client-Version': version_header})
         self._token_generator = _token_gen.TokenGenerator(app, client)
         self._token_verifier = _token_gen.TokenVerifier(app)
         self._user_manager = _user_mgt.UserManager(client)
@@ -484,32 +489,3 @@ def token_verifier(self):
     @property
     def user_manager(self):
         return self._user_manager
-
-
-class _AuthHTTPClient(object):
-    """An HTTP client for making REST calls to the identity toolkit service."""
-
-    ID_TOOLKIT_URL = 'https://www.googleapis.com/identitytoolkit/v3/relyingparty/'
-
-    def __init__(self, app):
-        g_credential = app.credential.get_credential()
-        session = transport.requests.AuthorizedSession(g_credential)
-        version_header = 'Python/Admin/{0}'.format(firebase_admin.__version__)
-        session.headers.update({'X-Client-Version': version_header})
-        self.session = session
-
-    def request(self, method, urlpath, **kwargs):
-        """Makes an HTTP call using the Python requests library.
-
-        Args:
-            method: HTTP method name as a string (e.g. get, post).
-            urlpath: URL path of the endpoint. This will be appended to the server's base URL.
-            kwargs: An additional set of keyword arguments to be passed into requests API
-              (e.g. json, params).
-
-        Returns:
-            dict: The parsed JSON response.
-        """
-        resp = self.session.request(method, self.ID_TOOLKIT_URL + urlpath, **kwargs)
-        resp.raise_for_status()
-        return resp.json()

tests/test_token_gen.py

@@ -104,7 +104,7 @@ def _instrument_user_manager(app, status, payload):
     user_manager = auth_service.user_manager
     recorder = []
     user_manager._client.session.mount(
-        auth._AuthHTTPClient.ID_TOOLKIT_URL,
+        auth._AuthService.ID_TOOLKIT_URL,
         testutils.MockAdapter(payload, status, recorder))
     return user_manager, recorder
 

tests/test_user_mgt.py

@@ -48,7 +48,7 @@ def _instrument_user_manager(app, status, payload):
     user_manager = auth_service.user_manager
     recorder = []
     user_manager._client.session.mount(
-        auth._AuthHTTPClient.ID_TOOLKIT_URL,
+        auth._AuthService.ID_TOOLKIT_URL,
         testutils.MockAdapter(payload, status, recorder))
     return user_manager, recorder