aioamazondevices 3.0.7__tar.gz → 3.0.9__tar.gz

{aioamazondevices-3.0.7 → aioamazondevices-3.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: aioamazondevices
-Version: 3.0.7
+Version: 3.0.9
 Summary: Python library to control Amazon devices
 License: Apache-2.0
 Author: Simone Chemelli

{aioamazondevices-3.0.7 → aioamazondevices-3.0.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aioamazondevices"
-version = "3.0.7"
+version = "3.0.9"
 description = "Python library to control Amazon devices"
 authors = ["Simone Chemelli <simone.chemelli@gmail.com>"]
 license = "Apache-2.0"

{aioamazondevices-3.0.7 → aioamazondevices-3.0.9}/src/aioamazondevices/__init__.py

@@ -1,6 +1,6 @@
 """aioamazondevices library."""
 
-__version__ = "3.0.7"
+__version__ = "3.0.9"
 
 
 from .api import AmazonDevice, AmazonEchoApi

{aioamazondevices-3.0.7 → aioamazondevices-3.0.9}/src/aioamazondevices/api.py

@@ -45,7 +45,12 @@ from .const import (
     SAVE_PATH,
     URI_QUERIES,
 )
-from .exceptions import CannotAuthenticate, CannotRegisterDevice, WrongMethod
+from .exceptions import (
+    CannotAuthenticate,
+    CannotRegisterDevice,
+    RequestFailed,
+    WrongMethod,
+)
 
 
 @dataclass
@@ -267,6 +272,14 @@ class AmazonEchoApi:
         _LOGGER.debug("Cookies from headers: %s", cookies_with_value)
         return cookies_with_value
 
+    async def _ignore_ap_sigin_error(self, response: ClientResponse) -> bool:
+        """Return true if error is due to /ap/sigin endpoint."""
+        # Endpoint 'ap/sigin' replies with error 404
+        # but reports the needed parameters anyway
+        return (
+            response.status == HTTPStatus.NOT_FOUND and "/ap/sigin" in response.url.name
+        )
+
     async def _session_request(
         self,
         method: str,
@@ -290,7 +303,7 @@ class AmazonEchoApi:
             headers.update(csrf)
 
         if json_data:
-            json_header = {"Content-Type": "application/json"}
+            json_header = {"Content-Type": "application/json; charset=utf-8"}
             _LOGGER.debug("Adding %s to headers", json_header)
             headers.update(json_header)
 
@@ -314,6 +327,16 @@ class AmazonEchoApi:
             content_type,
         )
 
+        if resp.status != HTTPStatus.OK:
+            if resp.status in [
+                HTTPStatus.FORBIDDEN,
+                HTTPStatus.PROXY_AUTHENTICATION_REQUIRED,
+                HTTPStatus.UNAUTHORIZED,
+            ]:
+                raise CannotAuthenticate
+            if not self._ignore_ap_sigin_error(resp):
+                raise RequestFailed
+
         await self._save_to_file(
             await resp.text(),
             url,

{aioamazondevices-3.0.7 → aioamazondevices-3.0.9}/src/aioamazondevices/const.py

@@ -20,7 +20,6 @@ DOMAIN_BY_ISO3166_COUNTRY = {
     },
     "jp": {
         "domain": "co.jp",
-        "openid.assoc_handle": "jpflex",
     },
     "br": {
         "domain": "com.br",
@@ -41,8 +40,9 @@ DEFAULT_HEADERS = {
         f"Mozilla/5.0 (iPhone; CPU iPhone OS {AMAZON_CLIENT_OS.replace('.', '_')} like Mac OS X) "  # noqa: E501
         "AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148"
     ),
-    "Accept-Language": "en-US",
+    "Accept-Charset": "utf-8",
     "Accept-Encoding": "gzip",
+    "Accept-Language": "en-US",
     "Connection": "keep-alive",
 }
 CSRF_COOKIE = "csrf"

{aioamazondevices-3.0.7 → aioamazondevices-3.0.9}/src/aioamazondevices/exceptions.py

@@ -23,6 +23,10 @@ class CannotRegisterDevice(AmazonError):
     """Exception raised when device registration fails."""
 
 
+class RequestFailed(AmazonError):
+    """Exception raised when a request fails."""
+
+
 class WrongMethod(AmazonError):
     """Exception raised when the wrong login metho is used."""