aioamazondevices 3.1.22__py3-none-any.whl → 3.2.0__py3-none-any.whl

aioamazondevices/__init__.py

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

aioamazondevices/api.py

@@ -56,6 +56,7 @@ from .exceptions import (
     CannotConnect,
     CannotRegisterDevice,
     CannotRetrieveData,
+    WrongCountry,
     WrongMethod,
 )
 from .utils import obfuscate_email, scrub_fields
@@ -146,6 +147,15 @@ class AmazonEchoApi:
         self.session: ClientSession
         self._devices: dict[str, Any] = {}
 
+        lang_object = Language.make(territory=self._login_country_code.upper())
+        lang_maximized = lang_object.maximize()
+        self._language = f"{lang_maximized.language}-{lang_maximized.region}"
+        _LOGGER.debug(
+            "Initialize library with domain <%s> and language <%s>",
+            self._domain,
+            self._language,
+        )
+
     def _load_website_cookies(self) -> dict[str, str]:
         """Get website cookies, if avaliables."""
         if not self._login_stored_data:
@@ -210,22 +220,23 @@ class AmazonEchoApi:
         code_challenge = self._create_s256_code_challenge(code_verifier)
 
         oauth_params = {
-            "openid.oa2.response_type": "code",
-            "openid.oa2.code_challenge_method": "S256",
-            "openid.oa2.code_challenge": code_challenge,
             "openid.return_to": f"https://www.amazon.{self._domain}/ap/maplanding",
+            "openid.oa2.code_challenge_method": "S256",
             "openid.assoc_handle": self._assoc_handle,
             "openid.identity": "http://specs.openid.net/auth/2.0/identifier_select",
+            "pageId": self._assoc_handle,
             "accountStatusPolicy": "P1",
             "openid.claimed_id": "http://specs.openid.net/auth/2.0/identifier_select",
             "openid.mode": "checkid_setup",
             "openid.ns.oa2": "http://www.amazon.com/ap/ext/oauth/2",
             "openid.oa2.client_id": f"device:{client_id}",
+            "language": self._language.replace("-", "_"),
             "openid.ns.pape": "http://specs.openid.net/extensions/pape/1.0",
+            "openid.oa2.code_challenge": code_challenge,
             "openid.oa2.scope": "device_auth_access",
-            "forceMobileLayout": "true",
             "openid.ns": "http://specs.openid.net/auth/2.0",
             "openid.pape.max_auth_age": "0",
+            "openid.oa2.response_type": "code",
         }
 
         return (
@@ -273,8 +284,10 @@ class AmazonEchoApi:
         """Create HTTP client session."""
         if not hasattr(self, "session") or self.session.closed:
             _LOGGER.debug("Creating HTTP session (aiohttp)")
+            headers = DEFAULT_HEADERS
+            headers.update({"Accept-Language": self._language})
             self.session = ClientSession(
-                headers=DEFAULT_HEADERS,
+                headers=headers,
                 cookies=self._cookies,
             )
 
@@ -323,6 +336,7 @@ class AmazonEchoApi:
         )
 
         headers = DEFAULT_HEADERS
+        headers.update({"Accept-Language": self._language})
         if self._csrf_cookie and CSRF_COOKIE not in headers:
             csrf = {CSRF_COOKIE: self._csrf_cookie}
             _LOGGER.debug("Adding <%s> to headers", csrf)
@@ -512,6 +526,31 @@ 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(
@@ -685,6 +724,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]:
@@ -703,6 +745,8 @@ class AmazonEchoApi:
 
         self._client_session()
 
+        await self._check_country()
+
         return self._login_stored_data
 
     async def close(self) -> None:
@@ -842,10 +886,6 @@ class AmazonEchoApi:
         message_source: AmazonMusicSource | None = None,
     ) -> None:
         """Send message to specific device."""
-        lang_object = Language.make(territory=self._login_country_code.upper())
-        lang_maximized = lang_object.maximize()
-        locale = f"{lang_maximized.language}-{lang_maximized.region}"
-
         if not self._login_stored_data:
             _LOGGER.warning("Trying to send message before login")
             return
@@ -853,7 +893,7 @@ class AmazonEchoApi:
         base_payload = {
             "deviceType": device.device_type,
             "deviceSerialNumber": device.serial_number,
-            "locale": locale,
+            "locale": self._language,
             "customerId": device.device_owner_customer_id,
         }
 
@@ -888,7 +928,7 @@ class AmazonEchoApi:
                 "expireAfter": "PT5S",
                 "content": [
                     {
-                        "locale": locale,
+                        "locale": self._language,
                         "display": {
                             "title": "Home Assistant",
                             "body": message_body,

aioamazondevices/const.py

@@ -84,7 +84,6 @@ DEFAULT_HEADERS = {
     ),
     "Accept-Charset": "utf-8",
     "Accept-Encoding": "gzip",
-    "Accept-Language": "en-US",
     "Connection": "keep-alive",
 }
 CSRF_COOKIE = "csrf"

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.22.dist-info → aioamazondevices-3.2.0.dist-info}/METADATA

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

aioamazondevices-3.2.0.dist-info/RECORD

@@ -0,0 +1,11 @@
+aioamazondevices/__init__.py,sha256=2bsaWXIfe39pE5Jjw25d1t7wCVNWK36dLG4zXoSQZpU,276
+aioamazondevices/api.py,sha256=W4LyCmiWCSJlHzpTSAQkb8DMcZbBQxJufZ3lnSasiik,38648
+aioamazondevices/const.py,sha256=J47aHAfoA6rRgHDvn-q_S4xp8MrC6O1rEk1ZeRnN-8E,8529
+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.0.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
+aioamazondevices-3.2.0.dist-info/METADATA,sha256=7d6AfzuC3n4IVSV1FWk37dR_Ruej_mCc1coKc5KE_yY,5234
+aioamazondevices-3.2.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+aioamazondevices-3.2.0.dist-info/RECORD,,

aioamazondevices-3.1.22.dist-info/RECORD

@@ -1,11 +0,0 @@
-aioamazondevices/__init__.py,sha256=1zTgfVFS9BIXxS-1ghlWzAXzlEs643PyJVEr2SeZxws,277
-aioamazondevices/api.py,sha256=6R7eHx48qRqWmLmC657R7vvED75mqS7WvCFh01ixLzk,37149
-aioamazondevices/const.py,sha256=w4tyAkGRbMX0s1NA1iOeuQ2yAB2v9Xqa56jLa4sQ9vg,8561
-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.22.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
-aioamazondevices-3.1.22.dist-info/METADATA,sha256=NKuOQKxX6VK34vpsmrajPQlOa4b0pR-glSj3zaoKGiY,5235
-aioamazondevices-3.1.22.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-aioamazondevices-3.1.22.dist-info/RECORD,,