aioamazondevices 3.1.23__py3-none-any.whl → 3.2.1__py3-none-any.whl

aioamazondevices/__init__.py

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

aioamazondevices/api.py

@@ -32,6 +32,7 @@ from .const import (
     AMAZON_DEVICE_TYPE,
     BIN_EXTENSION,
     CSRF_COOKIE,
+    DEFAULT_AGENT,
     DEFAULT_ASSOC_HANDLE,
     DEFAULT_HEADERS,
     DEVICE_TO_IGNORE,
@@ -56,6 +57,7 @@ from .exceptions import (
     CannotConnect,
     CannotRegisterDevice,
     CannotRetrieveData,
+    WrongCountry,
     WrongMethod,
 )
 from .utils import obfuscate_email, scrub_fields
@@ -160,7 +162,17 @@ class AmazonEchoApi:
         if not self._login_stored_data:
             return {}
 
-        return cast("dict", self._login_stored_data["website_cookies"])
+        website_cookies: dict[str, Any] = self._login_stored_data["website_cookies"]
+        website_cookies.update(
+            {
+                "session-token": self._login_stored_data["store_authentication_cookie"][
+                    "cookie"
+                ]
+            }
+        )
+        website_cookies.update({"lc-acbit": self._language})
+
+        return website_cookies
 
     def _serial_number(self) -> str:
         """Get or calculate device serial number."""
@@ -324,6 +336,7 @@ class AmazonEchoApi:
         url: str,
         input_data: dict[str, Any] | None = None,
         json_data: bool = False,
+        amazon_user_agent: bool = True,
     ) -> tuple[BeautifulSoup, ClientResponse]:
         """Return request response context data."""
         _LOGGER.debug(
@@ -336,6 +349,9 @@ class AmazonEchoApi:
 
         headers = DEFAULT_HEADERS
         headers.update({"Accept-Language": self._language})
+        if not amazon_user_agent:
+            _LOGGER.debug("Changing User-Agent to %s", DEFAULT_AGENT)
+            headers.update({"User-Agent": DEFAULT_AGENT})
         if self._csrf_cookie and CSRF_COOKIE not in headers:
             csrf = {CSRF_COOKIE: self._csrf_cookie}
             _LOGGER.debug("Adding <%s> to headers", csrf)
@@ -525,11 +541,37 @@ class AmazonEchoApi:
         await self._save_to_file(login_data, "login_data", JSON_EXTENSION)
         return login_data
 
+    async def _check_country(self) -> None:
+        """Check if user selected country matches Amazon account country."""
+        url = f"https://alexa.amazon.{self._domain}/api/users/me"
+        _, resp_me = await self._session_request(HTTPMethod.GET, url)
+
+        if resp_me.status != HTTPStatus.OK:
+            raise CannotAuthenticate
+
+        resp_me_json = await resp_me.json()
+        market = resp_me_json["marketPlaceDomainName"]
+        language = resp_me_json["marketPlaceLocale"]
+
+        _domain = f"https://www.amazon.{self._domain}"
+
+        if market != _domain or language != self._language:
+            _LOGGER.debug(
+                "Selected country <%s> doesn't matches Amazon account:\n%s\n vs \n%s",
+                self._login_country_code.upper(),
+                {"site  ": _domain, "locale": self._language},
+                {"market": market, "locale": language},
+            )
+            raise WrongCountry
+
+        _LOGGER.debug("User selected country matches Amazon account one")
+
     async def _get_devices_ids(self) -> list[dict[str, str]]:
         """Retrieve devices entityId and applianceId."""
         _, raw_resp = await self._session_request(
             "GET",
             url=f"https://alexa.amazon.{self._domain}{URI_IDS}",
+            amazon_user_agent=False,
         )
         json_data = await raw_resp.json()
 
@@ -698,6 +740,9 @@ class AmazonEchoApi:
         self._login_stored_data = register_device
 
         _LOGGER.info("Register device: %s", scrub_fields(register_device))
+
+        await self._check_country()
+
         return register_device
 
     async def login_mode_stored_data(self) -> dict[str, Any]:
@@ -716,6 +761,8 @@ class AmazonEchoApi:
 
         self._client_session()
 
+        await self._check_country()
+
         return self._login_stored_data
 
     async def close(self) -> None:

aioamazondevices/const.py

@@ -86,6 +86,7 @@ DEFAULT_HEADERS = {
     "Accept-Encoding": "gzip",
     "Connection": "keep-alive",
 }
+DEFAULT_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36 Edg/138.0.0.0"  # noqa: E501
 CSRF_COOKIE = "csrf"
 
 NODE_DEVICES = "devices"

aioamazondevices/exceptions.py

@@ -25,3 +25,7 @@ class CannotRegisterDevice(AmazonError):
 
 class WrongMethod(AmazonError):
     """Exception raised when the wrong login metho is used."""
+
+
+class WrongCountry(AmazonError):
+    """Exceptio nraised when Amazon country."""

{aioamazondevices-3.1.23.dist-info → aioamazondevices-3.2.1.dist-info}/METADATA

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

aioamazondevices-3.2.1.dist-info/RECORD

@@ -0,0 +1,11 @@
+aioamazondevices/__init__.py,sha256=ylzOup7JB2cQ19iiOzvj0UaBpJlY2v4hV0fxxJyVeqo,276
+aioamazondevices/api.py,sha256=8wXIou_9WeFjbNS4_qPbQ8YFWUfN8EdIbivQ-UWSGDI,39218
+aioamazondevices/const.py,sha256=q2TlD1O4jPtQ-hIxCCZuD-uoXCFNudF11JSjSC2hClY,8687
+aioamazondevices/exceptions.py,sha256=CfOFKDvE_yl5BFoFcpTOuDfgRi_2oAtKk-nNJgfWBAs,726
+aioamazondevices/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+aioamazondevices/sounds.py,sha256=01pVCDFIuhrLypXInw4JNuHsC6zjMLsuKocet1R6we8,13409
+aioamazondevices/utils.py,sha256=RzuKRhnq_8ymCoJMoQJ2vBYyuew06RSWpqQWmqdNczE,2019
+aioamazondevices-3.2.1.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
+aioamazondevices-3.2.1.dist-info/METADATA,sha256=qS7EZlIpIOa1F0BMNwW0Z3iAI_g5vFlXv3WSitr7NqI,5234
+aioamazondevices-3.2.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+aioamazondevices-3.2.1.dist-info/RECORD,,

aioamazondevices-3.1.23.dist-info/RECORD

@@ -1,11 +0,0 @@
-aioamazondevices/__init__.py,sha256=mZIaRiUx4hb3bx5kIhZc9PX7hxD-qnhod-h81ENTXac,277
-aioamazondevices/api.py,sha256=J4e85fBrHIWPeTvP7TYsezvdHKQ0I_Pqz3HCcdmF6J8,37542
-aioamazondevices/const.py,sha256=J47aHAfoA6rRgHDvn-q_S4xp8MrC6O1rEk1ZeRnN-8E,8529
-aioamazondevices/exceptions.py,sha256=JDnSFi_7oEhqK31sHXf0S_cyMoMjiRJuLp4ow7mYgLY,643
-aioamazondevices/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aioamazondevices/sounds.py,sha256=01pVCDFIuhrLypXInw4JNuHsC6zjMLsuKocet1R6we8,13409
-aioamazondevices/utils.py,sha256=RzuKRhnq_8ymCoJMoQJ2vBYyuew06RSWpqQWmqdNczE,2019
-aioamazondevices-3.1.23.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
-aioamazondevices-3.1.23.dist-info/METADATA,sha256=xEheLDnUfjp1pQbgAMvDsWmOcG5xnDnU8eZfmYSWg4A,5235
-aioamazondevices-3.1.23.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-aioamazondevices-3.1.23.dist-info/RECORD,,