aioamazondevices 6.1.0__tar.gz → 6.1.2__tar.gz

{aioamazondevices-6.1.0 → aioamazondevices-6.1.2}/PKG-INFO

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

{aioamazondevices-6.1.0 → aioamazondevices-6.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aioamazondevices"
-version = "6.1.0"
+version = "6.1.2"
 requires-python = ">=3.12"
 description = "Python library to control Amazon devices"
 authors = [

{aioamazondevices-6.1.0 → aioamazondevices-6.1.2}/src/aioamazondevices/__init__.py

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

{aioamazondevices-6.1.0 → aioamazondevices-6.1.2}/src/aioamazondevices/api.py

@@ -22,7 +22,7 @@ from aiohttp import (
     ClientSession,
 )
 from bs4 import BeautifulSoup, Tag
-from langcodes import Language
+from langcodes import Language, standardize_tag
 from multidict import MultiDictProxy
 from yarl import URL
 
@@ -163,7 +163,8 @@ class AmazonEchoApi:
         lang_maximized = lang_object.maximize()
 
         self._domain: str = domain
-        self._language = f"{lang_maximized.language}-{lang_maximized.region}"
+        language = f"{lang_maximized.language}-{lang_maximized.territory}"
+        self._language = standardize_tag(language)
 
         # Reset CSRF cookie when changing country
         self._csrf_cookie: str | None = None
@@ -527,15 +528,15 @@ class AmazonEchoApi:
         }
 
         register_url = "https://api.amazon.com/auth/register"
-        _, resp = await self._session_request(
+        _, raw_resp = await self._session_request(
             method=HTTPMethod.POST,
             url=register_url,
             input_data=body,
             json_data=True,
         )
-        resp_json = await resp.json()
+        resp_json = await raw_resp.json()
 
-        if resp.status != HTTPStatus.OK:
+        if raw_resp.status != HTTPStatus.OK:
             msg = resp_json["response"]["error"]["message"]
             _LOGGER.error(
                 "Cannot register device for %s: %s",
@@ -543,7 +544,7 @@ class AmazonEchoApi:
                 msg,
             )
             raise CannotRegisterDevice(
-                f"{await self._http_phrase_error(resp.status)}: {msg}"
+                f"{await self._http_phrase_error(raw_resp.status)}: {msg}"
             )
 
         success_response = resp_json["response"]["success"]
@@ -703,7 +704,7 @@ class AmazonEchoApi:
             _LOGGER.debug(
                 'Cannot find "auth-mfa-otpcode" in html source [%s]', login_url
             )
-            raise CannotAuthenticate
+            raise CannotAuthenticate("MFA OTP code not found on login page")
 
         login_method, login_url = self._get_request_from_soup(login_soup)
 
@@ -742,6 +743,10 @@ class AmazonEchoApi:
             obfuscate_email(self._login_email),
         )
 
+        # Check if session is still authenticated
+        if not await self.auth_check_status():
+            raise CannotAuthenticate("Session no longer authenticated")
+
         return self._login_stored_data
 
     async def _get_alexa_domain(self) -> str:
@@ -1105,21 +1110,21 @@ class AmazonEchoApi:
             "domain": f"www.amazon.{self._domain}",
         }
 
-        response = await self._session.post(
+        raw_resp = await self._session.post(
             "https://api.amazon.com/auth/token",
             data=data,
         )
         _LOGGER.debug(
             "Refresh data response %s with payload %s",
-            response.status,
+            raw_resp.status,
             orjson.dumps(data),
         )
 
-        if response.status != HTTPStatus.OK:
+        if raw_resp.status != HTTPStatus.OK:
             _LOGGER.debug("Failed to refresh data")
             return False, {}
 
-        json_response = await response.json()
+        json_response = await raw_resp.json()
         _LOGGER.debug("Refresh data json:\n%s ", json_response)
 
         if data_type == REFRESH_ACCESS_TOKEN and (