python-picnic-api2 1.3.2__py3-none-any.whl → 1.3.4__py3-none-any.whl

python_picnic_api2/__init__.py

@@ -1,6 +1,7 @@
 from .client import PicnicAPI
+from .session import Picnic2FAError, Picnic2FARequired
 
-__all__ = ["PicnicAPI"]
+__all__ = ["PicnicAPI", "Picnic2FAError", "Picnic2FARequired"]
 __title__ = "python-picnic-api"
 __version__ = "1.1.0"
 __author__ = "Mike Brink"

python_picnic_api2/client.py

@@ -10,7 +10,12 @@ from .helper import (
     _url_generator,
     find_nodes_by_content,
 )
-from .session import PicnicAPISession, PicnicAuthError
+from .session import (
+    Picnic2FAError,
+    Picnic2FARequired,
+    PicnicAPISession,
+    PicnicAuthError,
+)
 
 DEFAULT_URL = "https://storefront-prod.{}.picnicinternational.com/api/{}"
 GLOBAL_GATEWAY_URL = "https://gateway-prod.global.picnicinternational.com"
@@ -60,14 +65,18 @@ class PicnicAPI:
 
         return response
 
-    def _post(self, path: str, data=None, base_url_override=None):
+    def _post(
+        self, path: str, data=None, base_url_override=None, add_picnic_headers=False
+    ):
         url = (base_url_override if base_url_override else self._base_url) + path
-        response = self.session.post(url, json=data).json()
+        kwargs = {"json": data}
+        if add_picnic_headers:
+            kwargs["headers"] = _HEADERS
+        response = self.session.post(url, **kwargs).json()
 
         if self._contains_auth_error(response):
             raise PicnicAuthError(
-                f"Picnic authentication error: \
-                    {response['error'].get('message')}"
+                f"Picnic authentication error: {response['error'].get('message')}"
             )
 
         return response
@@ -80,12 +89,82 @@ class PicnicAPI:
         error_code = response.setdefault("error", {}).get("code")
         return error_code == "AUTH_ERROR" or error_code == "AUTH_INVALID_CRED"
 
+    @staticmethod
+    def _requires_2fa(response):
+        if not isinstance(response, dict):
+            return False
+
+        return "second_factor_authentication_required" in response \
+        and response["second_factor_authentication_required"] is True
+
     def login(self, username: str, password: str):
         path = "/user/login"
         secret = md5(password.encode("utf-8")).hexdigest()
         data = {"key": username, "secret": secret, "client_id": 30100}
 
-        return self._post(path, data)
+        response = self._post(path, data, add_picnic_headers=True)
+
+        if self._requires_2fa(response):
+            raise Picnic2FARequired(
+                message=response.get("error", {}).get(
+                    "message", "Two-factor authentication required"
+                ),
+                response=response,
+            )
+
+        return response
+
+    def _post_2fa(self, path: str, data=None):
+        """POST for 2FA endpoints that may return empty (204) or JSON error bodies."""
+        url = self._base_url + path
+        response = self.session.post(url, json=data, headers=_HEADERS)
+
+        if response.status_code == 204 or not response.content:
+            return None
+
+        json_body = response.json()
+
+        # This should not happen because password auth is already done
+        # at this point, but just in case.
+        if self._contains_auth_error(json_body):
+            raise PicnicAuthError(
+                f"Picnic authentication error: {json_body['error'].get('message')}"
+            )
+
+        error = json_body.get("error", {})
+        if error.get("code"):
+            raise Picnic2FAError(
+                message=error.get("message", "Two-factor authentication failed"),
+                code=error["code"],
+            )
+
+        return json_body
+
+    def generate_2fa_code(self, channel: str = "SMS"):
+        """Request a 2FA code to be sent via the specified channel.
+
+        Args:
+            channel: The delivery channel ("SMS" or "EMAIL").
+
+        Raises:
+            Picnic2FAError: If the server returns an error (e.g. invalid channel).
+        """
+        path = "/user/2fa/generate"
+        data = {"channel": channel}
+        self._post_2fa(path, data)
+
+    def verify_2fa_code(self, code: str):
+        """Verify the 2FA code to complete authentication.
+
+        Args:
+            code: The OTP code received via SMS or email.
+
+        Raises:
+            Picnic2FAError: If the OTP code is invalid.
+        """
+        path = "/user/2fa/verify"
+        data = {"otp": code}
+        self._post_2fa(path, data)
 
     def logged_in(self):
         return self.session.authenticated
@@ -189,7 +268,8 @@ class PicnicAPI:
         return self.get_deliveries(data=["CURRENT"])
 
     def get_categories(self, depth: int = 0):
-        return self._get(f"/my_store?depth={depth}")["catalog"]
+        raise NotImplementedError("This endpoint has been removed by picnic\
+        and is no longer functional.")
 
     def get_category_by_ids(self, l2_id: int, l3_id: int):
         path = "/pages/L2-category-page-root" + \

python_picnic_api2/session.py

@@ -5,6 +5,30 @@ class PicnicAuthError(Exception):
     """Indicates an error when authenticating to the Picnic API."""
 
 
+class Picnic2FARequired(Exception):
+    """Indicates that two-factor authentication is required."""
+
+    def __init__(
+        self,
+        message: str = "Two-factor authentication required",
+        response: dict = None,
+    ):
+        super().__init__(message)
+        self.response = response or {}
+
+
+class Picnic2FAError(Exception):
+    """Indicates an error during two-factor authentication (e.g. invalid OTP)."""
+
+    def __init__(
+        self,
+        message: str = "Two-factor authentication failed",
+        code: str = None,
+    ):
+        super().__init__(message)
+        self.code = code
+
+
 class PicnicAPISession(Session):
     AUTH_HEADER = "x-picnic-auth"
 
@@ -52,4 +76,4 @@ class PicnicAPISession(Session):
         return response
 
 
-__all__ = ["PicnicAuthError", "PicnicAPISession"]
+__all__ = ["PicnicAuthError", "Picnic2FARequired", "Picnic2FAError", "PicnicAPISession"]

{python_picnic_api2-1.3.2.dist-info → python_picnic_api2-1.3.4.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: python-picnic-api2
-Version: 1.3.2
+Version: 1.3.4
 Project-URL: homepage, https://github.com/codesalatdev/python-picnic-api
 Project-URL: repository, https://github.com/codesalatdev/python-picnic-api
 Author-email: Mike Brink <mjh.brink@icloud.com>, CodeSalat <pypi@codesalat.dev>
 Maintainer-email: CodeSalat <pypi@codesalat.dev>
 License: Apache-2.0
 License-File: LICENSE.md
-Requires-Python: >=3.11
+Requires-Python: >=3.13
 Requires-Dist: requests>=2.24.0
 Requires-Dist: typing-extensions>=4.12.2
 Description-Content-Type: text/x-rst

python_picnic_api2-1.3.4.dist-info/RECORD

@@ -0,0 +1,8 @@
+python_picnic_api2/__init__.py,sha256=_yT2GUMnhnNIGlYDzBxerDtlN08PzUOG00mhNCoPlGU,229
+python_picnic_api2/client.py,sha256=Bxp4WrABcGL7lheDsJRu0gSabq7AcTdsADGuikFL0bI,10804
+python_picnic_api2/helper.py,sha256=_cHhC1YCzZj7FlnR5tdvu825UOB5etcIdm23lezrw8Y,5022
+python_picnic_api2/session.py,sha256=2nhlyJ2MXR1yHQRxw85B-KXF4zt8L5__KrI-T_VvURg,2388
+python_picnic_api2-1.3.4.dist-info/METADATA,sha256=FOrKfeXQ9L110lcNOaX7oCHJvcquZyj4D3WrYyU-Y6c,3370
+python_picnic_api2-1.3.4.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+python_picnic_api2-1.3.4.dist-info/licenses/LICENSE.md,sha256=CUvt2ilcBwKAfRAnoA4RNPTLcdUj3En21LPK9YkFMGg,11358
+python_picnic_api2-1.3.4.dist-info/RECORD,,

{python_picnic_api2-1.3.2.dist-info → python_picnic_api2-1.3.4.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.29.0
 Root-Is-Purelib: true
 Tag: py3-none-any

python_picnic_api2-1.3.2.dist-info/RECORD

@@ -1,8 +0,0 @@
-python_picnic_api2/__init__.py,sha256=smjQNoqBSj_opj6Kk5Q3e4q-rW5Optnpuo4YZuEngzs,135
-python_picnic_api2/client.py,sha256=oRGCTlzuz9xzBJUH4iL2jjQzqURxd-C0WK_DdJQbRjQ,8282
-python_picnic_api2/helper.py,sha256=_cHhC1YCzZj7FlnR5tdvu825UOB5etcIdm23lezrw8Y,5022
-python_picnic_api2/session.py,sha256=UVUaKNyyz2S6RQGE9o2CNXxcGiAn8Dy9TJv7PTl_JbY,1741
-python_picnic_api2-1.3.2.dist-info/METADATA,sha256=Q7-5cHhVtzG6W3T-ydSJlB3IAkNls0PrdHRVJmzj-00,3370
-python_picnic_api2-1.3.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-python_picnic_api2-1.3.2.dist-info/licenses/LICENSE.md,sha256=CUvt2ilcBwKAfRAnoA4RNPTLcdUj3En21LPK9YkFMGg,11358
-python_picnic_api2-1.3.2.dist-info/RECORD,,