Iteration 1

msal/application.py

@@ -164,14 +164,13 @@ def __init__(
         self.client_claims = client_claims
         self.verify = verify
         self.proxies = proxies
-        from msal.oauth2cli.http import DefaultHttpClient
-        self.http_client = http_client if http_client else DefaultHttpClient(self.verify, self.proxies)
+        self.http_client = http_client or DefaultHttpClient(verify=self.verify, proxy=self.proxies)
         self.timeout = timeout
         self.app_name = app_name
         self.app_version = app_version
         self.authority = Authority(
                 authority or "https://login.microsoftonline.com/common/",
-                validate_authority, verify=verify, proxies=proxies, timeout=timeout, http_client = self.http_client)
+                validate_authority, verify=verify, proxies=proxies, timeout=timeout, http_client=self.http_client)
             # Here the self.authority is not the same type as authority in input
         self.token_cache = token_cache or TokenCache()
         self.client = self._build_client(client_credential, self.authority)
@@ -374,12 +373,6 @@ def _get_authority_aliases(self, instance):
             resp = self.http_client.request("GET", "https://login.microsoftonline.com/common/discovery/instance?api-version=1.1&authorization_endpoint=https://login.microsoftonline.com/common/oauth2/authorize",
                 headers={'Accept': 'application/json'},
                 verify=self.verify, proxies=self.proxies, timeout=self.timeout)
-
-            # resp = requests.get(
-            #     "https://login.microsoftonline.com/common/discovery/instance?api-version=1.1&authorization_endpoint=https://login.microsoftonline.com/common/oauth2/authorize",
-            #     headers={'Accept': 'application/json'},
-            #     verify=self.verify, proxies=self.proxies, timeout=self.timeout)
-            resp.raise_for_status()
             self.authority_groups = [
                 set(group['aliases']) for group in resp.content.json()['metadata']]
         for group in self.authority_groups:

msal/authority.py

@@ -4,7 +4,6 @@
     from urlparse import urlparse
 import logging
 
-import requests
 
 from .exceptions import MsalServiceError
 
@@ -54,7 +53,7 @@ def __init__(self, authority_url, validate_authority=True,
             len(parts) == 3 and parts[2].lower().startswith("b2c_"))
         if (tenant != "adfs" and (not is_b2c) and validate_authority
                 and self.instance not in WELL_KNOWN_AUTHORITY_HOSTS):
-            payload = instance_discovery(
+            payload = self.instance_discovery(
                 "https://{}{}/oauth2/v2.0/authorize".format(
                     self.instance, authority.path),
                 verify=verify, proxies=proxies, timeout=timeout)
@@ -74,7 +73,7 @@ def __init__(self, authority_url, validate_authority=True,
                     authority.path,  # In B2C scenario, it is "/tenant/policy"
                     "" if tenant == "adfs" else "/v2.0" # the AAD v2 endpoint
                     ))
-        openid_config = tenant_discovery(
+        openid_config = self.tenant_discovery(
             tenant_discovery_endpoint,
             verify=verify, proxies=proxies, timeout=timeout)
         logger.debug("openid_config = %s", openid_config)
@@ -93,17 +92,7 @@ def user_realm_discovery(self, username, correlation_id=None, response=None):
                      netloc=self.instance, username=username), headers={'Accept':'application/json',
                           'client-request-id': correlation_id}, timeout= self.timeout)
             if resp.status_code != 404:
-                resp.raise_for_status()
                 return resp.content.json()
-            # resp = response or requests.get(
-            #     "https://{netloc}/common/userrealm/{username}?api-version=1.0".format(
-            #         netloc=self.instance, username=username),
-            #     headers={'Accept':'application/json',
-            #              'client-request-id': correlation_id},
-            #     verify=self.verify, proxies=self.proxies, timeout=self.timeout)
-            # if resp.status_code != 404:
-            #     resp.raise_for_status()
-            #     return resp.json()
             self.__class__._domains_without_user_realm_discovery.add(self.instance)
         return {}  # This can guide the caller to fall back normal ROPC flow
 

msal/oauth2cli/http/http_client.py

@@ -17,7 +17,7 @@ class DefaultHttpClient(HttpClient):
     """
     General purpose HTTP Client for interacting with the Twilio API
     """
-    def __init__(self, default_headers=None, verify=None, proxy=None):
+    def __init__(self, default_headers={}, verify=None, proxy=None):
         """
         Constructor for the TwilioHttpClient
 
@@ -33,7 +33,6 @@ def __init__(self, default_headers=None, verify=None, proxy=None):
         self.session.verify = verify
         self.session.proxy = proxy
 
-
     def request(self, method, url, params=None, data=None, headers=None, auth=None, timeout=None,
                 allow_redirects=False, **kwargs):
         """
@@ -50,37 +49,13 @@ def request(self, method, url, params=None, data=None, headers=None, auth=None,
         See the requests documentation for explanation of all these parameters
 
         :return: An http response
-        :rtype: A :class:`Response <twilio.rest.http.response.Response>` object
+        :rtype: A :class:`Response <http.response.Response>` object
         """
-        # if timeout is not None and timeout <= 0:
-        #     raise ValueError(timeout)
-        #
-        # kwargs = {
-        #     'method': method.upper(),
-        #     'url': url,
-        #     'params': params,
-        #     'data': data,
-        #     'headers': headers,
-        #     'auth': auth,
-        #     'hooks': self.request_hooks
-        # }
-        #
-        # if params:
-        #     self.logger.info('{method} Request: {url}?{query}'.format(query=urlencode(params), **kwargs))
-        #     self.logger.info('PARAMS: {params}'.format(**kwargs))
-        # else:
-        #     self.logger.info('{method} Request: {url}'.format(**kwargs))
-        # if data:
-        #     self.logger.info('PAYLOAD: {data}'.format(**kwargs))
-        #
-        # self.last_response = None
-        session = self.session or Session()
         if method == "POST":
-            response = session.post(headers=headers, params=params, data=data, auth=auth,
-            timeout=timeout, **kwargs)
+            response = self.session.post(url=url, headers=headers, params=params, data=data, auth=auth,
+                                         timeout=timeout, **kwargs)
         elif method == "GET":
-            response = requests.get(url= url, headers=headers, params=params, timeout=timeout)
-
-        self.last_response = Response(int(response.status_code), response.text)
-
-        return self.last_response
+            response = self.session.get(url=url, headers=headers, params=params, timeout=timeout, data=data, auth=auth)
+        response.raise_for_status()
+        response = Response(int(response.status_code), response)
+        return response

msal/oauth2cli/http/http_response.py

@@ -11,6 +11,3 @@ def __init__(self, status_code, text):
     @property
     def text(self):
         return self.content
-
-    def __repr__(self):
-        return 'HTTP {} {}'.format(self.status_code, self.content)

msal/oauth2cli/oauth2.py

@@ -88,7 +88,7 @@ def __init__(
             self.default_body["client_assertion_type"] = client_assertion_type
         self.logger = logging.getLogger(__name__)
         if not http_client:
-            self.http_client = DefaultHttpClient(verify, proxies or {})
+            self.http_client = DefaultHttpClient(verify=verify, proxy=proxies or {}, default_headers= {})
         else:
             self.http_client = http_client
         self.timeout = timeout
@@ -150,7 +150,7 @@ def _obtain_token(  # The verb "obtain" is influenced by OAUTH2 RFC 6749
             raise ValueError("token_endpoint not found in configuration")
         _headers = {'Accept': 'application/json'}
         _headers.update(headers or {})
-        resp = (post or self.http_client.request)("POST", self.configuration["token_endpoint"],
+        resp = self.http_client.request("POST", self.configuration["token_endpoint"],
             headers=_headers, params=params, data=_data, auth=auth,
             timeout=timeout or self.timeout,
             **kwargs)