Removing default http client

msal/application.py

@@ -1,4 +1,5 @@
 import json
+import requests
 import time
 try:  # Python 2
     from urlparse import urljoin
@@ -9,7 +10,7 @@
 import warnings
 import uuid
 
-from .oauth2cli import Client, JwtAssertionCreator, DefaultHttpClient
+from .oauth2cli import Client, JwtAssertionCreator
 from .authority import Authority
 from .mex import send_request as mex_send_request
 from .wstrust_request import send_request as wst_send_request
@@ -162,7 +163,12 @@ def __init__(
         self.client_id = client_id
         self.client_credential = client_credential
         self.client_claims = client_claims
-        self.http_client = http_client if http_client else DefaultHttpClient(verify=verify, proxies=proxies)
+        if http_client:
+            self.http_client = http_client
+        else:
+            self.http_client = requests.Session()
+            self.http_client.verify = verify
+            self.http_client.proxies = proxies
         self.timeout = timeout
         self.app_name = app_name
         self.app_version = app_version

msal/oauth2cli/__init__.py

@@ -4,4 +4,3 @@
 from .assertion import JwtAssertionCreator
 from .assertion import JwtSigner  # Obsolete. For backward compatibility.
 from .http import HttpClient
-from .default_http_client import DefaultHttpClient

tests/test_application.py

@@ -7,11 +7,10 @@
     from mock import *  # Need an external mock package
 
 from msal.application import *
-from msal.oauth2cli.default_http_client import Response
 import msal
 from tests import unittest
 from tests.test_token_cache import TokenCacheTestCase
-
+import requests
 
 logger = logging.getLogger(__name__)
 logging.basicConfig(level=logging.DEBUG)
@@ -47,9 +46,8 @@ def test_extract_multiple_tag_enclosed_certs(self):
 class TestClientApplicationAcquireTokenSilentErrorBehaviors(unittest.TestCase):
 
     def setUp(self):
-        self.http_client = DefaultHttpClient()
         self.authority_url = "https://login.microsoftonline.com/common"
-        self.authority = msal.authority.Authority(self.authority_url, http_client= self.http_client)
+        self.authority = msal.authority.Authority(self.authority_url, http_client= requests.Session())
         self.scopes = ["s1", "s2"]
         self.uid = "my_uid"
         self.utid = "my_utid"
@@ -66,7 +64,7 @@ def setUp(self):
                 uid=self.uid, utid=self.utid, refresh_token=self.rt),
             })  # The add(...) helper populates correct home_account_id for future searching
         self.app = ClientApplication(
-            self.client_id, authority=self.authority_url, token_cache=self.cache, http_client=self.http_client)
+            self.client_id, authority=self.authority_url, token_cache=self.cache)
 
     def test_cache_empty_will_be_returned_as_None(self):
         self.assertEqual(
@@ -108,7 +106,7 @@ class TestClientApplicationAcquireTokenSilentFociBehaviors(unittest.TestCase):
 
     def setUp(self):
         self.authority_url = "https://login.microsoftonline.com/common"
-        self.authority = msal.authority.Authority(self.authority_url, DefaultHttpClient())
+        self.authority = msal.authority.Authority(self.authority_url, requests.Session())
         self.scopes = ["s1", "s2"]
         self.uid = "my_uid"
         self.utid = "my_utid"

tests/test_authority.py

@@ -2,7 +2,7 @@
 
 from msal.authority import *
 from tests import unittest
-from msal.oauth2cli.default_http_client import DefaultHttpClient
+import requests
 
 
 @unittest.skipIf(os.getenv("TRAVIS_TAG"), "Skip network io during tagged release")
@@ -11,7 +11,7 @@ class TestAuthority(unittest.TestCase):
     def test_wellknown_host_and_tenant(self):
         # Assert all well known authority hosts are using their own "common" tenant
         for host in WELL_KNOWN_AUTHORITY_HOSTS:
-            a = Authority('https://{}/common'.format(host), DefaultHttpClient())
+            a = Authority('https://{}/common'.format(host), requests.Session())
             self.assertEqual(
                 a.authorization_endpoint,
                 'https://%s/common/oauth2/v2.0/authorize' % host)
@@ -24,14 +24,14 @@ def test_lessknown_host_will_return_a_set_of_v1_endpoints(self):
         # It is probably not a strict API contract. I simply mention it here.
         less_known = 'login.windows.net'  # less.known.host/
         v1_token_endpoint = 'https://{}/common/oauth2/token'.format(less_known)
-        a = Authority('https://{}/common'.format(less_known), DefaultHttpClient())
+        a = Authority('https://{}/common'.format(less_known), requests.Session())
         self.assertEqual(a.token_endpoint, v1_token_endpoint)
         self.assertNotIn('v2.0', a.token_endpoint)
 
     def test_unknown_host_wont_pass_instance_discovery(self):
         _assert = getattr(self, "assertRaisesRegex", self.assertRaisesRegexp)  # Hack
         with _assert(ValueError, "invalid_instance"):
-            Authority('https://example.com/tenant_doesnt_matter_in_this_case', DefaultHttpClient())
+            Authority('https://example.com/tenant_doesnt_matter_in_this_case', requests.Session())
 
     def test_invalid_host_skipping_validation_can_be_turned_off(self):
         try:

tests/test_client.py

@@ -11,7 +11,6 @@
 
 from msal.oauth2cli import Client, JwtSigner
 from msal.oauth2cli.authcode import obtain_auth_code
-from msal.oauth2cli.default_http_client import DefaultHttpClient
 from tests import unittest, Oauth2TestCase
 
 
@@ -100,13 +99,13 @@ def setUpClass(cls):
                         issuer=CONFIG["client_id"],
                     ),
                 client_assertion_type=Client.CLIENT_ASSERTION_TYPE_JWT,
-                http_client=DefaultHttpClient()
+                http_client=requests.Session()
                 )
         else:
             cls.client = Client(
                 CONFIG["openid_configuration"], CONFIG['client_id'],
                 client_secret=CONFIG.get('client_secret'),
-                http_client=DefaultHttpClient())
+                http_client=requests.Session())
 
     @unittest.skipIf(
         "token_endpoint" not in CONFIG.get("openid_configuration", {}),