Adding raw response to response object

msal/oauth2cli/default_http_client.py

@@ -23,21 +23,23 @@ def __init__(self, verify=True, proxies=None):
     def post(self, url, params=None, data=None, headers=None, **kwargs):
 
         response = self.session.post(url=url, params=params, headers=headers, data=data, **kwargs)
-        return Response(response)
+        return Response(response.status_code, response.text, response)
 
     def get(self, url, params=None, headers=None, **kwargs):
         response = self.session.get(url=url, params=params, headers=headers, **kwargs)
-        return Response(response)
+        return Response(response.status_code, response.text, response)
 
 
 class Response(Response):
 
-    def __init__(self, response):
+    def __init__(self, status_code, text, response):
         """Constructor for DefaultResponseObject
-            response: Raw http response from requests
+            status,  # type: int
+            text,  # type: str response in string format
+            response,  # type: Raw response from requests
         """
-        self.status_code = response.status_code
-        self.text = response.text
+        self.status_code = status_code
+        self.text = text
         self.response = response
 
     def raise_for_status(self):

tests/test_application.py

@@ -77,29 +77,29 @@ def test_cache_empty_will_be_returned_as_None(self):
     def test_acquire_token_silent_will_suppress_error(self):
         error_response = '{"error": "invalid_grant", "suberror": "xyz"}'
         def tester(url, **kwargs):
-            return Response(400, error_response)
+            return Response(400, error_response, '')
         self.assertEqual(None, self.app.acquire_token_silent(
             self.scopes, self.account, post=tester))
 
     def test_acquire_token_silent_with_error_will_return_error(self):
         error_response = '{"error": "invalid_grant", "error_description": "xyz"}'
         def tester(url, **kwargs):
-            return Response(400, error_response)
+            return Response(400, error_response, '')
         self.assertEqual(json.loads(error_response), self.app.acquire_token_silent_with_error(
             self.scopes, self.account, post=tester))
 
     def test_atswe_will_map_some_suberror_to_classification_as_is(self):
         error_response = '{"error": "invalid_grant", "suberror": "basic_action"}'
         def tester(url, **kwargs):
-            return Response(400, error_response)
+            return Response(400, error_response, '')
         result = self.app.acquire_token_silent_with_error(
             self.scopes, self.account, post=tester)
         self.assertEqual("basic_action", result.get("classification"))
 
     def test_atswe_will_map_some_suberror_to_classification_to_empty_string(self):
         error_response = '{"error": "invalid_grant", "suberror": "client_mismatch"}'
         def tester(url, **kwargs):
-            return Response(400, error_response)
+            return Response(400, error_response, '')
         result = self.app.acquire_token_silent_with_error(
             self.scopes, self.account, post=tester)
         self.assertEqual("", result.get("classification"))
@@ -133,7 +133,7 @@ def test_unknown_orphan_app_will_attempt_frt_and_not_remove_it(self):
         error_response = '{"error": "invalid_grant","error_description": "Was issued to another client"}'
         def tester(url, data=None, **kwargs):
             self.assertEqual(self.frt, data.get("refresh_token"), "Should attempt the FRT")
-            return Response(400, error_response)
+            return Response(400, error_response, '')
         app._acquire_token_silent_by_finding_rt_belongs_to_me_or_my_family(
             self.authority, self.scopes, self.account, post=tester)
         self.assertNotEqual([], app.token_cache.find(
@@ -154,7 +154,7 @@ def test_known_orphan_app_will_skip_frt_and_only_use_its_own_rt(self):
         logger.debug("%s.cache = %s", self.id(), self.cache.serialize())
         def tester(url, data=None, **kwargs):
             self.assertEqual(rt, data.get("refresh_token"), "Should attempt the RT")
-            return Response(200, '{}')
+            return Response(200, '{}', '')
         app._acquire_token_silent_by_finding_rt_belongs_to_me_or_my_family(
             self.authority, self.scopes, self.account, post=tester)
 
@@ -164,7 +164,7 @@ def tester(url, data=None, **kwargs):
                 self.frt, data.get("refresh_token"), "Should attempt the FRT")
             return Response(
                 200, json.dumps(TokenCacheTestCase.build_response(
-                uid=self.uid, utid=self.utid, foci="1", access_token="at")))
+                uid=self.uid, utid=self.utid, foci="1", access_token="at")), '')
         app = ClientApplication(
             "unknown_family_app", authority=self.authority_url, token_cache=self.cache)
         at = app._acquire_token_silent_by_finding_rt_belongs_to_me_or_my_family(