pyIntradel 0.0.6__tar.gz → 0.0.7__tar.gz

{pyintradel-0.0.6 → pyintradel-0.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyIntradel
-Version: 0.0.6
+Version: 0.0.7
 Summary: Python interface for Intradel
 Project-URL: Homepage, https://github.com/thomasgermain/pyintradel
 Author-email: Thomas Germain <12560542+thomasgermain@users.noreply.github.com>
@@ -106,6 +106,12 @@ Here is an example of json:
 
 The `town` parameter is the name of the town, you can check it here: [towns](pyintradel/api/towns.py)
 
+The intradel.be login form is now protected by an invisible reCAPTCHA, which can
+reject a plain login/password POST (this notably happens when the browser blocks
+third-party cookies, e.g. in private browsing, but can also affect this library).
+As a workaround, you can authenticate once in a real browser, then reuse the
+resulting session cookie instead of login/password.
+
 ### Python module
 
 ```python
@@ -113,12 +119,18 @@ import aiohttp
 from pyintradel import api
 
 async with aiohttp.ClientSession() as sess:
+    # Using login/password
     await api.get_data(sess, login, password, town)
+
+    # Using a session cookie captured from an already logged-in browser
+    await api.get_data(sess, cookie=cookie)
 ```
 
 ### Command line
 ```bash
 python3 -m pyintradel.main user passw town
+# or
+python3 -m pyintradel.main --cookie "PHPSESSID=..."
 ```
 
 ---

{pyintradel-0.0.6 → pyintradel-0.0.7}/README.md

@@ -82,6 +82,12 @@ Here is an example of json:
 
 The `town` parameter is the name of the town, you can check it here: [towns](pyintradel/api/towns.py)
 
+The intradel.be login form is now protected by an invisible reCAPTCHA, which can
+reject a plain login/password POST (this notably happens when the browser blocks
+third-party cookies, e.g. in private browsing, but can also affect this library).
+As a workaround, you can authenticate once in a real browser, then reuse the
+resulting session cookie instead of login/password.
+
 ### Python module
 
 ```python
@@ -89,12 +95,18 @@ import aiohttp
 from pyintradel import api
 
 async with aiohttp.ClientSession() as sess:
+    # Using login/password
     await api.get_data(sess, login, password, town)
+
+    # Using a session cookie captured from an already logged-in browser
+    await api.get_data(sess, cookie=cookie)
 ```
 
 ### Command line
 ```bash
 python3 -m pyintradel.main user passw town
+# or
+python3 -m pyintradel.main --cookie "PHPSESSID=..."
 ```
 
 ---

pyintradel-0.0.7/pyintradel/api/__init__.py

@@ -0,0 +1,55 @@
+"""pyIntradel"""
+
+import logging
+from typing import Any
+
+import aiohttp
+
+from . import parser, towns
+
+_LOGGER = logging.getLogger(__name__)
+_URL = "https://www.intradel.be/particulier/"
+_HEADERS = {"Content-Type": "application/x-www-form-urlencoded"}
+
+
+async def get_data(
+    session: aiohttp.ClientSession,
+    login: str | None = None,
+    password: str | None = None,
+    town: str | None = None,
+    *,
+    cookie: str | None = None,
+) -> list[Any]:
+    """Fetch waste collection data.
+
+    Authenticate either with `login`, `password` and `town`, or with a `cookie`
+    (the raw `Cookie` header captured from an already logged-in browser session).
+    The website now gates the login form behind an invisible reCAPTCHA, so a plain
+    login/password POST can be rejected; the cookie skips the login step entirely.
+    """
+    if cookie:
+        _LOGGER.info("Will query data using a session cookie")
+        headers = {"Cookie": cookie}
+
+        async with session.get(
+            "https://www.intradel.be/particulier/data.php", headers=headers
+        ) as resp:
+            if resp.status != 200:
+                raise ValueError(f"Received error {resp.status}", await resp.text())
+            return parser.parse(await resp.text())
+
+    if not login or not password or not town:
+        raise ValueError("Either 'cookie' or 'login', 'password' and 'town' must be provided")
+
+    town_id = towns.TOWNS_MAP.get(town.upper())
+    if not town_id:
+        raise ValueError("Town not found", town)
+
+    _LOGGER.info("Will query data for user %s and city %s", login, town)
+    data = {"llogin": "YES", "login": login, "pass": password, "commune": town_id}
+
+    async with session.post(_URL, data=data, headers=_HEADERS) as resp:
+        if resp.status != 200:
+            raise ValueError(f"Received error {resp.status}", await resp.text())
+        else:
+            return parser.parse(await resp.text())

pyintradel-0.0.7/pyintradel/main.py

@@ -0,0 +1,46 @@
+import argparse
+import asyncio
+import json
+import sys
+
+import aiohttp
+
+from pyintradel import api
+
+
+async def _run(
+    login: str | None, password: str | None, town: str | None, cookie: str | None
+) -> None:
+    async with aiohttp.ClientSession() as sess:
+        data = await api.get_data(sess, login, password, town, cookie=cookie)
+        json.dump(data, sys.stdout, indent=2)
+
+
+def _parse_args(argv: list[str]) -> argparse.Namespace:
+    parser = argparse.ArgumentParser(
+        prog="pyintradel",
+        description="Usage: pyintradel user pass town OR pyintradel --cookie COOKIE",
+    )
+    parser.add_argument("login", nargs="?", help="Login")
+    parser.add_argument("password", nargs="?", help="Password")
+    parser.add_argument("town", nargs="?", help="Town, see pyintradel/api/towns.py")
+    parser.add_argument(
+        "--cookie",
+        help="Session cookie captured from an already logged-in browser, "
+        "used instead of login/password/town",
+    )
+    return parser.parse_args(argv)
+
+
+def main() -> None:
+    args = _parse_args(sys.argv[1:])
+
+    if not args.cookie and not (args.login and args.password and args.town):
+        print("Usage: pyintradel user pass town OR pyintradel --cookie COOKIE")
+        sys.exit(1)
+
+    asyncio.run(_run(args.login, args.password, args.town, args.cookie))
+
+
+if __name__ == "__main__":
+    main()

{pyintradel-0.0.6 → pyintradel-0.0.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pyIntradel"
-version = "0.0.6"
+version = "0.0.7"
 description = "Python interface for Intradel"
 readme = "README.md"
 license = { text = "MIT" }

pyintradel-0.0.7/tests/api_get_data_test.py

@@ -0,0 +1,60 @@
+import unittest
+from typing import Any
+
+from pyintradel import api
+from tests.mock import CORRECT_RESPONSE
+
+
+class _FakeResponse:
+    def __init__(self, status: int, text: str) -> None:
+        self.status = status
+        self._text = text
+
+    async def text(self) -> str:
+        return self._text
+
+    async def __aenter__(self) -> "_FakeResponse":
+        return self
+
+    async def __aexit__(self, *exc: Any) -> bool:
+        return False
+
+
+class _FakeSession:
+    def __init__(self, response: _FakeResponse) -> None:
+        self._response = response
+        self.get_calls: list[tuple[str, dict[str, str]]] = []
+        self.post_calls: list[tuple[str, dict[str, str], dict[str, str]]] = []
+
+    def get(self, url: str, headers: dict[str, str]) -> _FakeResponse:
+        self.get_calls.append((url, headers))
+        return self._response
+
+    def post(self, url: str, data: dict[str, str], headers: dict[str, str]) -> _FakeResponse:
+        self.post_calls.append((url, data, headers))
+        return self._response
+
+
+class GetDataTest(unittest.IsolatedAsyncioTestCase):
+    async def test_missing_credentials_and_cookie_raises(self) -> None:
+        session = _FakeSession(_FakeResponse(200, CORRECT_RESPONSE))
+        with self.assertRaises(ValueError):
+            await api.get_data(session)  # type: ignore[arg-type]
+
+    async def test_cookie_uses_get_and_skips_login(self) -> None:
+        session = _FakeSession(_FakeResponse(200, CORRECT_RESPONSE))
+        result = await api.get_data(session, cookie="PHPSESSID=abc")  # type: ignore[arg-type]
+
+        self.assertEqual(len(result), 3)
+        self.assertEqual(len(session.get_calls), 1)
+        self.assertEqual(len(session.post_calls), 0)
+        _, headers = session.get_calls[0]
+        self.assertEqual(headers["Cookie"], "PHPSESSID=abc")
+
+    async def test_login_uses_post(self) -> None:
+        session = _FakeSession(_FakeResponse(200, CORRECT_RESPONSE))
+        result = await api.get_data(session, "user", "pass", "LIEGE")  # type: ignore[arg-type]
+
+        self.assertEqual(len(result), 3)
+        self.assertEqual(len(session.post_calls), 1)
+        self.assertEqual(len(session.get_calls), 0)

pyintradel-0.0.6/pyintradel/api/__init__.py

@@ -1,30 +0,0 @@
-"""pyIntradel"""
-
-import logging
-from typing import Any
-
-import aiohttp
-
-from . import parser, towns
-
-_LOGGER = logging.getLogger(__name__)
-_URL = "https://www.intradel.be/particulier/"
-_HEADERS = {"Content-Type": "application/x-www-form-urlencoded"}
-
-
-async def get_data(
-    session: aiohttp.ClientSession, login: str, password: str, town: str
-) -> list[Any]:
-    _LOGGER.info("Will query data for user %s and city %s", login, town)
-
-    town_id = towns.TOWNS_MAP.get(town.upper())
-    if not town_id:
-        raise ValueError("Town not found", town)
-
-    data = {"llogin": "YES", "login": login, "pass": password, "commune": town_id}
-
-    async with session.post(_URL, data=data, headers=_HEADERS) as resp:
-        if resp.status != 200:
-            raise ValueError(f"Received error {resp.status}", await resp.text())
-        else:
-            return parser.parse(await resp.text())

pyintradel-0.0.6/pyintradel/main.py

@@ -1,24 +0,0 @@
-import asyncio
-import json
-import sys
-
-import aiohttp
-
-from pyintradel import api
-
-
-async def _run(login: str, password: str, town: str) -> None:
-    async with aiohttp.ClientSession() as sess:
-        json.dump(await api.get_data(sess, login, password, town), sys.stdout, indent=2)
-
-
-def main() -> None:
-    if len(sys.argv) != 4:
-        print("Usage: pyintradel user pass town")
-        sys.exit(0)
-
-    asyncio.run(_run(sys.argv[1], sys.argv[2], sys.argv[3]))
-
-
-if __name__ == "__main__":
-    main()