Cleaning None values

msal/oauth2cli/oauth2.py

@@ -123,7 +123,11 @@ def _obtain_token(  # The verb "obtain" is influenced by OAUTH2 RFC 6749
 
         _data.update(self.default_body)  # It may contain authen parameters
         _data.update(data or {})  # So the content in data param prevails
-        # We don't have to clean up None values here, because requests lib will.
+        filtered = {k: v for k, v in _data.items() if v is not None}
+        _data.clear()
+        _data.update(filtered)
+        # We will have to clean up None values here,
+        # because we can have some libraries not supporting cleaning of None values.
 
         if _data.get('scope'):
             _data['scope'] = self._stringify(_data['scope'])

sample/httpx.py

@@ -0,0 +1,49 @@
+import httpx
+
+from .oauth2cli import HttpClient, Response
+
+
+class DefaultHttpClient(HttpClient):
+    """
+    Default HTTP Client
+    """
+    def __init__(self):
+        """
+        Constructor for the DefaultHttpClient
+
+        verify=True,  # type: Union[str, True, False, None]
+        proxies=None,  # type: Optional[dict]
+        """
+        self.session = httpx.Client()
+
+    def post(self, url, params=None, data=None, headers=None, **kwargs):
+        if params is None:
+            params = {}
+        params.update(**kwargs)
+
+        response = self.session.post(url=url, params=params, headers=headers, data=data)
+        return Response(response.status_code, response.text, response)
+
+    def get(self, url, params=None, headers=None, **kwargs):
+        if params is None:
+            params = {}
+        params.update(kwargs)
+        response = self.session.get(url=url, params=params, headers=headers)
+        return Response(response.status_code, response.text, response)
+
+
+class Response(Response):
+
+    def __init__(self, status_code, text, response):
+        """Constructor for DefaultResponseObject
+            status,  # type: int
+            text,  # type: str response in string format
+            response,  # type: Raw response from requests
+        """
+        self.status_code = status_code
+        self.text = text
+        self.response = response
+
+
+    def raise_for_status(self):
+        self.response.raise_for_status()

sample/httpx_client.py

@@ -0,0 +1,48 @@
+import httpx
+from httpx import *
+from msal.oauth2cli import HttpClient, Response
+
+
+class HttpxClient(HttpClient):
+    """
+    Default HTTP Client
+    """
+    def __init__(self):
+        """
+        Constructor for the DefaultHttpClient
+
+        verify=True,  # type: Union[str, True, False, None]
+        proxies=None,  # type: Optional[dict]
+        """
+
+    def post(self, url, params=None, data=None, headers=None, **kwargs):
+        if params is None:
+            params = {}
+        params.update(**kwargs)
+
+        response = httpx.post(url=url, params=params, headers=headers, data=data)
+        return Response(response.status_code, response.text, response)
+
+    def get(self, url, params=None, headers=None, **kwargs):
+        if params is None:
+            params = {}
+        params.update(kwargs)
+        response = httpx.get(url=url, params=params, headers=headers)
+        return Response(response.status_code, response.text, response)
+
+
+class Response(Response):
+
+    def __init__(self, status_code, text, response):
+        """Constructor for DefaultResponseObject
+            status,  # type: int
+            text,  # type: str response in string format
+            response,  # type: Raw response from requests
+        """
+        self.status_code = status_code
+        self.text = text
+        self.response = response
+
+
+    def raise_for_status(self):
+        self.response.raise_for_status()