Merge branch 'http_session_injected' into dev

Author: rayluo

oauth2cli/oauth2.py

@@ -33,6 +33,17 @@ def encode_saml_assertion(assertion):
     CLIENT_ASSERTION_TYPE_SAML2 = "urn:ietf:params:oauth:client-assertion-type:saml2-bearer"
     client_assertion_encoders = {CLIENT_ASSERTION_TYPE_SAML2: encode_saml_assertion}
 
+    @property
+    def session(self):
+        warnings.warn("Will be gone in next major release", DeprecationWarning)
+        return self._http_client
+
+    @session.setter
+    def session(self, value):
+        warnings.warn("Will be gone in next major release", DeprecationWarning)
+        self._http_client = value
+
+
     def __init__(
             self,
             server_configuration,  # type: dict
@@ -132,14 +143,14 @@ def __init__(
                 raise ValueError(
                     "verify, proxies, or timeout is not allowed "
                     "when http_client is in use")
-            self.http_client = http_client
+            self._http_client = http_client
         else:
-            self.http_client = requests.Session()
-            self.http_client.verify = True if verify is None else verify
-            self.http_client.proxies = proxies
-            self.http_client.request = functools.partial(
+            self._http_client = requests.Session()
+            self._http_client.verify = True if verify is None else verify
+            self._http_client.proxies = proxies
+            self._http_client.request = functools.partial(
                 # A workaround for requests not supporting session-wide timeout
-                self.http_client.request, timeout=timeout)
+                self._http_client.request, timeout=timeout)
 
     def _build_auth_request_params(self, response_type, **kwargs):
         # response_type is a string defined in
@@ -200,7 +211,7 @@ def _obtain_token(  # The verb "obtain" is influenced by OAUTH2 RFC 6749
 
         if "token_endpoint" not in self.configuration:
             raise ValueError("token_endpoint not found in configuration")
-        resp = (post or self.http_client.post)(
+        resp = (post or self._http_client.post)(
             self.configuration["token_endpoint"],
             headers=_headers, params=params, data=_data,
             **kwargs)
@@ -269,7 +280,7 @@ def initiate_device_flow(self, scope=None, **kwargs):
         DAE = "device_authorization_endpoint"
         if not self.configuration.get(DAE):
             raise ValueError("You need to provide device authorization endpoint")
-        resp = self.http_client.post(self.configuration[DAE],
+        resp = self._http_client.post(self.configuration[DAE],
             data={"client_id": self.client_id, "scope": self._stringify(scope or [])},
             headers=dict(self.default_headers, **kwargs.pop("headers", {})),
             **kwargs)

tests/test_client.py

@@ -174,3 +174,11 @@ def test_device_flow(self):
                 assertion=lambda: self.assertIn('access_token', result),
                 skippable_errors=self.client.DEVICE_FLOW_RETRIABLE_ERRORS)
 
+
+class TestSessionAccessibility(unittest.TestCase):
+    def test_accessing_session_property_for_backward_compatibility(self):
+        client = Client({}, "client_id")
+        client.session
+        client.session.close()
+        client.session = "something"
+