pygazpar 1.3.0b23__tar.gz → 1.3.1__tar.gz

{pygazpar-1.3.0b23 → pygazpar-1.3.1}/CHANGELOG.md

@@ -4,7 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.3.0] - 2025-02-09
+## [1.3.1] - 2025-07-22
+
+### Fixed
+
+[#88](https://github.com/ssenart/PyGazpar/issues/88) : 500 - NGINX / OpenID Connect login failure.
+
+## [1.3.0] - 2025-02-15
 
 ### Added
 

{pygazpar-1.3.0b23 → pygazpar-1.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pygazpar
-Version: 1.3.0b23
+Version: 1.3.1
 Summary: Python library to download gas consumption from a GrDF (French Gas Company) account
 License: MIT License
          
@@ -24,8 +24,7 @@ License: MIT License
          OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
          SOFTWARE.
 Author: Stéphane Senart
-Requires-Python: >=3.9
-Classifier: Programming Language :: Python :: 3.9
+Requires-Python: >=3.10
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -37,8 +36,6 @@ Description-Content-Type: text/markdown
 
 # PyGazpar
 
-## $\text{\color{green}{!!! This library is working again. CAPTCHA has been removed !!!}}$
-
 PyGazpar is a Python library for getting natural gas consumption from GrDF French provider.
 
 Their natural gas meter is called Gazpar. It is wireless and transmit the gas consumption once per day.

{pygazpar-1.3.0b23 → pygazpar-1.3.1}/README.md

@@ -1,7 +1,5 @@
 # PyGazpar
 
-## $\text{\color{green}{!!! This library is working again. CAPTCHA has been removed !!!}}$
-
 PyGazpar is a Python library for getting natural gas consumption from GrDF French provider.
 
 Their natural gas meter is called Gazpar. It is wireless and transmit the gas consumption once per day.

{pygazpar-1.3.0b23 → pygazpar-1.3.1}/pygazpar/api_client.py

@@ -1,6 +1,5 @@
-import http.cookiejar
-import json
 import logging
+import re
 import time
 import traceback
 from datetime import date
@@ -9,21 +8,20 @@ from typing import Any
 
 from requests import Response, Session
 
-SESSION_TOKEN_URL = "https://connexion.grdf.fr/api/v1/authn"
-SESSION_TOKEN_PAYLOAD = """{{
-    "username": "{0}",
-    "password": "{1}",
-    "options": {{
-        "multiOptionalFactorEnroll": "false",
-        "warnBeforePasswordExpired": "false"
-    }}
+START_URL = "https://monespace.grdf.fr/"
+
+MAIL_SESSION_TOKEN_URL = "https://connexion.grdf.fr/idp/idx/identify"
+MAIL_SESSION_TOKEN_PAYLOAD = """{{
+    "identifier": "{0}",
+    "stateHandle": "{1}"
 }}"""
 
-AUTH_TOKEN_URL = "https://connexion.grdf.fr/login/sessionCookieRedirect"
-AUTH_TOKEN_PARAMS = """{{
-    "checkAccountSetupComplete": "true",
-    "token": "{0}",
-    "redirectUrl": "https://monespace.grdf.fr"
+PASSWORD_SESSION_TOKEN_URL = "https://connexion.grdf.fr/idp/idx/challenge/answer"
+PASSWORD_SESSION_TOKEN_PAYLOAD = """{{
+    "credentials": {{
+        "passcode": "{0}"
+    }},
+    "stateHandle": "{1}"
 }}"""
 
 API_BASE_URL = "https://monespace.grdf.fr/api"
@@ -71,7 +69,7 @@ class APIClient:
         self._username = username
         self._password = password
         self._retry_count = retry_count
-        self._session = None
+        self._session: Session | None = None
 
     # ------------------------------------------------------
     def login(self):
@@ -79,38 +77,66 @@ class APIClient:
             return
 
         session = Session()
-        session.headers.update({"domain": "grdf.fr"})
-        session.headers.update({"Content-Type": "application/json"})
-        session.headers.update({"X-Requested-With": "XMLHttpRequest"})
+        session.headers.update({"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64)"})
 
-        payload = SESSION_TOKEN_PAYLOAD.format(self._username, self._password)
+        start_response = session.get(START_URL)
+        if start_response.status_code != 200:
+            raise ServerError(
+                f"An error occurred while logging in start. Status code: {start_response.status_code} - {start_response.url}",
+                start_response.status_code,
+            )
 
-        response = session.post(SESSION_TOKEN_URL, data=payload)
+        pattern = r'"stateToken"\s*:\s*"([^"]+)"'
+        match = re.search(pattern, start_response.text)
+        if match:
+            state_token_html = match.group(1)
+            state_token = state_token_html.replace("\\x2D", "-")
+        else:
+            raise ValueError("Cannot retrieve stateToken inside HTML response")
+
+        payload = MAIL_SESSION_TOKEN_PAYLOAD.format(self._username, state_token)
+        session.cookies.set("ln", self._username)
+
+        mail_response = session.post(
+            MAIL_SESSION_TOKEN_URL,
+            data=payload,
+            headers={"Accept": "application/json; okta-version=1.0.0", "Content-Type": "application/json"},
+        )
 
-        if response.status_code != 200:
+        if mail_response.status_code != 200:
             raise ServerError(
-                f"An error occurred while logging in. Status code: {response.status_code} - {response.text}",
-                response.status_code,
+                f"An error occurred while logging in mail. Status code: {mail_response.status_code} - {mail_response.text}",
+                mail_response.status_code,
             )
 
-        session_token = response.json().get("sessionToken")
+        state_handle = mail_response.json().get("stateHandle")
 
-        jar = http.cookiejar.CookieJar()
+        payload = PASSWORD_SESSION_TOKEN_PAYLOAD.format(self._password, state_handle)
 
-        self._session = Session()  # pylint: disable=attribute-defined-outside-init
-        self._session.headers.update({"Content-Type": "application/json"})
-        self._session.headers.update({"X-Requested-With": "XMLHttpRequest"})
+        password_response = session.post(
+            PASSWORD_SESSION_TOKEN_URL,
+            data=payload,
+            headers={"Accept": "application/json; okta-version=1.0.0", "Content-Type": "application/json"},
+        )
 
-        params = json.loads(AUTH_TOKEN_PARAMS.format(session_token))
+        if password_response.status_code != 200:
+            raise ServerError(
+                f"An error occurred while logging in password. Status code: {password_response.status_code} - {password_response.text}",
+                password_response.status_code,
+            )
 
-        response = self._session.get(AUTH_TOKEN_URL, params=params, allow_redirects=True, cookies=jar)  # type: ignore
+        success_url = password_response.json()["success"]["href"]
 
-        if response.status_code != 200:
+        response_redirect = session.get(success_url)
+
+        if response_redirect.status_code != 200:
             raise ServerError(
-                f"An error occurred while getting the auth token. Status code: {response.status_code} - {response.text}",
-                response.status_code,
+                f"An error occurred while logging in response_redirect. Status code: {response_redirect.status_code} - {response_redirect.url}",
+                response_redirect.status_code,
             )
 
+        self._session = session
+
     # ------------------------------------------------------
     def is_logged_in(self) -> bool:
         return self._session is not None

{pygazpar-1.3.0b23 → pygazpar-1.3.1}/pyproject.toml

@@ -1,15 +1,14 @@
 [project]
 name = "pygazpar"
-version = "1.3.0b23"
+version = "1.3.1"
 description = "Python library to download gas consumption from a GrDF (French Gas Company) account"
 license = { file = "LICENSE" }
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 authors = [
     { name = "Stéphane Senart" }
 ]
 classifiers = [
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",