Cleaning up

msal/application.py

@@ -19,6 +19,7 @@
 from .wstrust_response import *
 from .token_cache import TokenCache
 
+
 # The __init__.py will import this. Not the other way around.
 __version__ = "1.2.0"
 
@@ -283,11 +284,12 @@ def get_authorization_request_url(
         # The previous implementation is, it will use self.authority by default.
         # Multi-tenant app can use new authority on demand
         the_authority = Authority(
-            authority, http_client=self.http_client) if authority else self.authority
+            authority, http_client=self.http_client
+            ) if authority else self.authority
 
         client = Client(
             {"authorization_endpoint": the_authority.authorization_endpoint},
-            self.client_id, self.http_client)
+            self.client_id, http_client=self.http_client)
         return client.build_auth_request_uri(
             response_type=response_type,
             redirect_uri=redirect_uri, state=state, login_hint=login_hint,
@@ -516,7 +518,8 @@ def acquire_token_silent_with_error(
         if authority:
             warnings.warn("We haven't decided how/if this method will accept authority parameter")
         # the_authority = Authority(
-        #     authority, http_client=self.http_client,
+        #     authority,
+        #     http_client=self.http_client,
         #     ) if authority else self.authority
         result = self._acquire_token_silent_from_cache_and_possibly_refresh_it(
             scopes, account, self.authority, force_refresh=force_refresh,
@@ -757,7 +760,7 @@ def acquire_token_by_username_password(
             CLIENT_CURRENT_TELEMETRY: _build_current_telemetry_request_header(
                 self.ACQUIRE_TOKEN_BY_USERNAME_PASSWORD_ID),
             }
-        if not self.authority.is_adfs and not self.authority.is_b2c:
+        if not self.authority.is_adfs:
             user_realm_result = self.authority.user_realm_discovery(
                 username, correlation_id=headers[CLIENT_REQUEST_ID])
             if user_realm_result.get("account_type") == "Federated":

msal/authority.py

@@ -45,9 +45,9 @@ def __init__(self, authority_url, http_client, validate_authority=True):
         self.http_client = http_client
         authority, self.instance, tenant = canonicalize(authority_url)
         parts = authority.path.split('/')
-        self.is_b2c = any(self.instance.endswith("." + d) for d in WELL_KNOWN_B2C_HOSTS) or (
+        is_b2c = any(self.instance.endswith("." + d) for d in WELL_KNOWN_B2C_HOSTS) or (
             len(parts) == 3 and parts[2].lower().startswith("b2c_"))
-        if (tenant != "adfs" and (not self.is_b2c) and validate_authority
+        if (tenant != "adfs" and (not is_b2c) and validate_authority
                 and self.instance not in WELL_KNOWN_AUTHORITY_HOSTS):
             payload = instance_discovery(
                 "https://{}{}/oauth2/v2.0/authorize".format(

tests/test_application.py

@@ -10,7 +10,8 @@
 import msal
 from tests import unittest
 from tests.test_token_cache import TokenCacheTestCase
-import requests
+from tests.http_client import MinimalHttpClient
+
 
 logger = logging.getLogger(__name__)
 logging.basicConfig(level=logging.DEBUG)
@@ -47,7 +48,8 @@ class TestClientApplicationAcquireTokenSilentErrorBehaviors(unittest.TestCase):
 
     def setUp(self):
         self.authority_url = "https://login.microsoftonline.com/common"
-        self.authority = msal.authority.Authority(self.authority_url, http_client= requests.Session())
+        self.authority = msal.authority.Authority(
+            self.authority_url, http_client=MinimalHttpClient())
         self.scopes = ["s1", "s2"]
         self.uid = "my_uid"
         self.utid = "my_utid"
@@ -106,7 +108,8 @@ class TestClientApplicationAcquireTokenSilentFociBehaviors(unittest.TestCase):
 
     def setUp(self):
         self.authority_url = "https://login.microsoftonline.com/common"
-        self.authority = msal.authority.Authority(self.authority_url, requests.Session())
+        self.authority = msal.authority.Authority(
+            self.authority_url, http_client=MinimalHttpClient())
         self.scopes = ["s1", "s2"]
         self.uid = "my_uid"
         self.utid = "my_utid"

tests/test_authority.py

@@ -2,8 +2,6 @@
 
 from msal.authority import *
 from tests import unittest
-import requests
-
 from tests.http_client import MinimalHttpClient
 
 
@@ -13,7 +11,8 @@ 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), MinimalHttpClient())
+            a = Authority(
+                'https://{}/common'.format(host), http_client=MinimalHttpClient())
             self.assertEqual(
                 a.authorization_endpoint,
                 'https://%s/common/oauth2/v2.0/authorize' % host)
@@ -26,18 +25,22 @@ 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), MinimalHttpClient())
+        a = Authority(
+            'https://{}/common'.format(less_known), http_client=MinimalHttpClient())
         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', MinimalHttpClient())
+            Authority('https://example.com/tenant_doesnt_matter_in_this_case',
+                      http_client=MinimalHttpClient())
 
     def test_invalid_host_skipping_validation_can_be_turned_off(self):
         try:
-            Authority('https://example.com/invalid', validate_authority=False)
+            Authority(
+                'https://example.com/invalid',
+                http_client=MinimalHttpClient(), validate_authority=False)
         except ValueError as e:
             if "invalid_instance" in str(e):  # Imprecise but good enough
                 self.fail("validate_authority=False should turn off validation")
@@ -81,7 +84,8 @@ def test_memorize(self):
         # We use a real authority so the constructor can finish tenant discovery
         authority = "https://login.microsoftonline.com/common"
         self.assertNotIn(authority, Authority._domains_without_user_realm_discovery)
-        a = Authority(authority, MinimalHttpClient(), validate_authority=False)
+        a = Authority(authority, http_client=MinimalHttpClient(),
+            validate_authority=False)
 
         # We now pretend this authority supports no User Realm Discovery
         class MockResponse(object):
@@ -92,4 +96,4 @@ class MockResponse(object):
             Authority._domains_without_user_realm_discovery,
             "user_realm_discovery() should memorize domains not supporting URD")
         a.user_realm_discovery("[email protected]",
-            response="This would cause exception if memorization did not work")
+            response="This would cause exception if memorization did not work")

tests/test_client.py

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