Fix token response parsing (#167)

* Fix token response parsing

- Removed unnecessary rounding in token expiration check.
- Updated token parsing to align with API response structure.
- Adjusted `GetTokenResponse` typing attributes accordingly.

* Add pytests for login

* Add GitHub Actions workflow for pytest

- Introduced GitHub Actions workflow for running tests on push and pull requests.
- Configured matrix strategy to test with Python versions 3.11 and 3.12.
- Installed project dependencies and ran pytest with coverage reporting.
- Integrated Codecov for coverage reporting using a GitHub Actions workflow.

* Update pyecotrend_ista.py

---------

Co-authored-by: Ludy <[email protected]>

Author: tr4nt0r

.github/workflows/pytest.yml

@@ -0,0 +1,31 @@
+name: Test
+
+on: [push, pull_request]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python_version: ['3.11','3.12']
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python_version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+        pip install -r requirements_test.txt
+    - name: Test
+      run: |
+        pytest --cov-report=xml
+    - uses: codecov/codecov-action@v4
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+        fail_ci_if_error: false
+        verbose: true

src/pyecotrend_ista/pyecotrend_ista.py

@@ -108,7 +108,7 @@ def access_token(self):
             self._accessTokenExpiresIn > 0
             and self._is_connected()
             and self._refreshToken
-            and self._accessTokenExpiresIn <= (time.time() - self.start_timer).__round__(2)
+            and self._accessTokenExpiresIn <= time.time() - self.start_timer
         ):
             self.__refresh()
         return self._accessToken
@@ -922,7 +922,10 @@ def demo_user_login(self) -> GetTokenResponse:
             ) as r:
                 r.raise_for_status()
                 try:
-                    return cast(GetTokenResponse, r.json())
+                    data = r.json()
+                    key = iter(GetTokenResponse.__annotations__)
+                    token = dict((next(key), value) for value in data.values())
+                    return cast(GetTokenResponse, token)
                 except requests.JSONDecodeError as e:
                     self._LOGGER.debug("JSONDecodeError: %s", e)
                     raise ServerError from e

src/pyecotrend_ista/types.py

@@ -8,18 +8,18 @@ class GetTokenResponse(TypedDict):
 
     Attributes
     ----------
-    accessToken : str
+    access_token : str
         The access token issued by the authentication provider.
-    accessTokenExpiresIn : int
+    expires_in : int
         The number of seconds until the access token expires.
-    refreshToken : str
+    refresh_token : str
         The refresh token that can be used to obtain new access tokens.
-    refreshTokenExpiresIn : int
+    refresh_expires_in : int
         The number of seconds until the refresh token expires.
 
     """
 
-    accessToken: str
-    accessTokenExpiresIn: int
-    refreshToken: str
-    refreshTokenExpiresIn: int
+    access_token: str
+    expires_in: int
+    refresh_token: str
+    refresh_expires_in: int

tests/conftest.py

@@ -25,10 +25,15 @@ def mock_requests_login(requests_mock):
     requests_mock.post(
         PROVIDER_URL + "token",
         json={
-            "accessToken": "ACCESS_TOKEN",
-            "accessTokenExpiresIn": 60,
-            "refreshToken": "REFRESH_TOKEN",
-            "refreshTokenExpiresIn": 5184000,
+            "access_token": "ACCESS_TOKEN",
+            "expires_in": 60,
+            "refresh_expires_in": 5183999,
+            "refresh_token": "REFRESH_TOKEN",
+            "token_type": "Bearer",
+            "id_token": "ID_TOKEN",
+            "not-before-policy": 0,
+            "session_state": "SESSION_STATE",
+            "scope": "openid profile email",
         },
     )
     requests_mock.get(

tests/test_login.py

@@ -0,0 +1,17 @@
+"""Tests for Login methods."""
+
+
+
+import pytest
+from pyecotrend_ista.pyecotrend_ista import PyEcotrendIsta
+
+from tests.conftest import DEMO_EMAIL, TEST_EMAIL
+
+
+@pytest.mark.parametrize('ista_client', [TEST_EMAIL, DEMO_EMAIL], indirect=True)
+@pytest.mark.usefixtures("mock_requests_login")
+def test_login(ista_client: PyEcotrendIsta) -> None:
+    """Test Login method."""
+    assert ista_client.login() == "ACCESS_TOKEN"
+
+