New session every time (#342)

* works but not sure if the best way

* lint

* setup

* not sure if its fine

* dev version

* release candidate

* fixed version

* linter

---------

Co-authored-by: rogeliolopez <rogelio.lpz94@gmail.com>

Author: alexviquez

cuenca/http/client.py

@@ -24,18 +24,15 @@
 class Session:
 
     host: str = API_HOST
+    headers: DictStrAny = {}
     basic_auth: Tuple[str, str]
     jwt_token: Optional[Jwt] = None
-    session: requests.Session
 
     def __init__(self):
-        self.session = requests.Session()
-        self.session.headers.update(
-            {
-                'X-Cuenca-Api-Version': API_VERSION,
-                'User-Agent': f'cuenca-python/{CLIENT_VERSION}',
-            }
-        )
+        self.headers = {
+            'X-Cuenca-Api-Version': API_VERSION,
+            'User-Agent': f'cuenca-python/{CLIENT_VERSION}',
+        }
 
         # basic auth
         api_key = os.getenv('CUENCA_API_KEY', '')
@@ -75,10 +72,10 @@ def configure(
             self.jwt_token = Jwt.create(self)
 
         if login_token:
-            self.session.headers['X-Cuenca-LoginToken'] = login_token
+            self.headers['X-Cuenca-LoginToken'] = login_token
 
         if session_token:
-            self.session.headers['X-Cuenca-SessionId'] = session_token
+            self.headers['X-Cuenca-SessionId'] = session_token
 
     def get(
         self, endpoint: str, params: ClientRequestParams = None
@@ -105,19 +102,22 @@ def request(
         data: OptionalDict = None,
         **kwargs,
     ) -> bytes:
-        if self.jwt_token:
-            if self.jwt_token.is_expired:
-                self.jwt_token = Jwt.create(self)
-            self.session.headers['X-Cuenca-Token'] = self.jwt_token.token
-
-        resp = self.session.request(
-            method=method,
-            url='https://' + self.host + urljoin('/', endpoint),
-            auth=self.auth,
-            json=json.loads(JSONEncoder().encode(data)),
-            params=params,
-            **kwargs,
-        )
+        resp = None
+        with requests.Session() as session:
+            session.headers = self.headers  # type: ignore
+            if self.jwt_token:
+                if self.jwt_token.is_expired:
+                    self.jwt_token = Jwt.create(self)
+                self.headers['X-Cuenca-Token'] = self.jwt_token.token
+                session.headers = self.headers  # type: ignore
+            resp = session.request(  # type: ignore
+                method=method,
+                url='https://' + self.host + urljoin('/', endpoint),
+                auth=self.auth,
+                json=json.loads(JSONEncoder().encode(data)),
+                params=params,
+                **kwargs,
+            )
         self._check_response(resp)
         return resp.content
 

cuenca/jwt.py

@@ -42,7 +42,7 @@ def get_expiration_date(token: str) -> dt.datetime:
     @classmethod
     def create(cls, session: 'Session') -> 'Jwt':
         session.jwt_token = None
-        session.session.headers.pop('X-Cuenca-Token', None)
+        session.headers.pop('X-Cuenca-Token', None)
         token = session.post('/token', dict())['token']
         expires_at = Jwt.get_expiration_date(token)
         return cls(expires_at=expires_at, token=token)

cuenca/resources/user_logins.py

@@ -33,7 +33,7 @@ def create(
         req = UserLoginRequest(password=password, user_id=user_id)
         login = cast('UserLogin', cls._create(session=session, **req.dict()))
         if login.success:
-            session.session.headers['X-Cuenca-LoginId'] = login.id
+            session.headers['X-Cuenca-LoginId'] = login.id
         return login
 
     @classmethod
@@ -43,4 +43,4 @@ def logout(
         # Using user_id vs user_login_id to avoid needing to store
         # user_login_id or perform a query to fetch it
         session.delete(f'{cls._resource}/{user_id}', dict())
-        session.session.headers.pop('X-Cuenca-LoginId', None)
+        session.headers.pop('X-Cuenca-LoginId', None)

cuenca/version.py

@@ -1,3 +1,3 @@
-__version__ = '0.15.7'
+__version__ = '0.15.8'
 CLIENT_VERSION = __version__
 API_VERSION = '2020-03-19'

tests/resources/test_login_tokens.py

@@ -4,7 +4,7 @@
 from cuenca.http.client import Session
 
 
-@pytest.fixture
+@pytest.fixture(scope='function')
 def session():
     session = Session()
     session.configure(
@@ -19,6 +19,6 @@ def session():
 def test_login_token(session):
     UserLogin.create('222222', session=session)
     login_token = LoginToken.create(session=session)
-    session.session.headers.pop('X-Cuenca-LoginId')
+    session.headers.pop('X-Cuenca-LoginId')
     session.configure(login_token=login_token.id)
     Transfer.count(session=session)

tests/resources/test_user_logins.py

@@ -21,7 +21,7 @@ def test_valid_login(session: Session):
     assert login.success
     assert login.last_login_at is not None
     assert login.id is not None
-    assert session.session.headers['X-Cuenca-LoginId'] == login.id
+    assert session.headers['X-Cuenca-LoginId'] == login.id
 
 
 @pytest.mark.vcr
@@ -30,11 +30,11 @@ def test_invalid_login(session: Session):
     assert not login.success
     assert login.last_login_at is None
     assert login.id is not None
-    assert 'X-Cuenca-LoginId' not in session.session.headers
+    assert 'X-Cuenca-LoginId' not in session.headers
 
 
 @pytest.mark.vcr
 def test_logout(session: Session):
     UserLogin.create('222222', session=session)
     UserLogin.logout(session=session)
-    assert 'X-Cuenca-LoginId' not in session.session.headers
+    assert 'X-Cuenca-LoginId' not in session.headers