aioamazondevices 9.0.2__py3-none-any.whl → 11.0.3__py3-none-any.whl

aioamazondevices/login.py

@@ -10,26 +10,26 @@ from http import HTTPMethod, HTTPStatus
 from typing import Any, cast
 from urllib.parse import parse_qs, urlencode
 
-import orjson
 from bs4 import BeautifulSoup, Tag
 from multidict import MultiDictProxy
 from yarl import URL
 
 from .const.http import (
-    AMAZON_APP_BUNDLE_ID,
     AMAZON_APP_NAME,
     AMAZON_APP_VERSION,
     AMAZON_CLIENT_OS,
     AMAZON_DEVICE_SOFTWARE_VERSION,
     AMAZON_DEVICE_TYPE,
     DEFAULT_SITE,
-    REFRESH_ACCESS_TOKEN,
     REFRESH_AUTH_COOKIES,
+    URI_DEVICES,
     URI_SIGNIN,
 )
+from .const.metadata import MAX_CUSTOMER_ACCOUNT_RETRIES
 from .exceptions import (
     CannotAuthenticate,
     CannotRegisterDevice,
+    CannotRetrieveData,
     WrongMethod,
 )
 from .http_wrapper import AmazonHttpWrapper, AmazonSessionStateData
@@ -257,18 +257,16 @@ class AmazonLogin:
         device_login_data = await self._login_mode_interactive_oauth(otp_code)
 
         login_data = await self._register_device(device_login_data)
-        self._session_state_data.load_login_stored_data(login_data)
+        self._session_state_data.login_stored_data = login_data
 
         await self._domain_refresh_auth_cookies()
 
+        await self.obtain_account_customer_id()
+
         self._session_state_data.login_stored_data.update(
             {"site": f"https://www.amazon.{self._session_state_data.domain}"}
         )
 
-        # Can take a little while to register device but we need it
-        # to be able to pickout account customer ID
-        await asyncio.sleep(2)
-
         return self._session_state_data.login_stored_data
 
     async def _login_mode_interactive_oauth(
@@ -340,6 +338,8 @@ class AmazonLogin:
             obfuscate_email(self._session_state_data.login_email),
         )
 
+        await self.obtain_account_customer_id()
+
         return self._session_state_data.login_stored_data
 
     async def _get_alexa_domain(self) -> str:
@@ -359,7 +359,7 @@ class AmazonLogin:
 
     async def _refresh_auth_cookies(self) -> None:
         """Refresh cookies after domain swap."""
-        _, json_token_resp = await self._refresh_data(REFRESH_AUTH_COOKIES)
+        _, json_token_resp = await self._http_wrapper.refresh_data(REFRESH_AUTH_COOKIES)
 
         # Need to take cookies from response and create them as cookies
         website_cookies = self._session_state_data.login_stored_data[
@@ -391,55 +391,49 @@ class AmazonLogin:
             await self._http_wrapper.clear_csrf_cookie()
             await self._refresh_auth_cookies()
 
-    async def _refresh_data(self, data_type: str) -> tuple[bool, dict]:
-        """Refresh data."""
-        if not self._session_state_data.login_stored_data:
-            _LOGGER.debug("No login data available, cannot refresh")
-            return False, {}
-
-        data = {
-            "app_name": AMAZON_APP_NAME,
-            "app_version": AMAZON_APP_VERSION,
-            "di.sdk.version": "6.12.4",
-            "source_token": self._session_state_data.login_stored_data["refresh_token"],
-            "package_name": AMAZON_APP_BUNDLE_ID,
-            "di.hw.version": "iPhone",
-            "platform": "iOS",
-            "requested_token_type": data_type,
-            "source_token_type": "refresh_token",
-            "di.os.name": "iOS",
-            "di.os.version": AMAZON_CLIENT_OS,
-            "current_version": "6.12.4",
-            "previous_version": "6.12.4",
-            "domain": f"www.amazon.{self._session_state_data.domain}",
-        }
-
-        _, raw_resp = await self._http_wrapper.session_request(
-            method=HTTPMethod.POST,
-            url="https://api.amazon.com/auth/token",
-            input_data=data,
-            json_data=False,
-        )
-        _LOGGER.debug(
-            "Refresh data response %s with payload %s",
-            raw_resp.status,
-            orjson.dumps(data),
-        )
-
-        if raw_resp.status != HTTPStatus.OK:
-            _LOGGER.debug("Failed to refresh data")
-            return False, {}
-
-        json_response = await self._http_wrapper.response_to_json(raw_resp, data_type)
+    async def obtain_account_customer_id(self) -> None:
+        """Find account customer id."""
+        for retry_count in range(MAX_CUSTOMER_ACCOUNT_RETRIES):
+            if not self._session_state_data.account_customer_id:
+                await asyncio.sleep(2)  # allow time for device to be registered
 
-        if data_type == REFRESH_ACCESS_TOKEN and (
-            new_token := json_response.get(REFRESH_ACCESS_TOKEN)
-        ):
-            self._session_state_data.login_stored_data[REFRESH_ACCESS_TOKEN] = new_token
-            return True, json_response
-
-        if data_type == REFRESH_AUTH_COOKIES:
-            return True, json_response
+            _LOGGER.debug(
+                "Lookup customer account ID (attempt %d/%d)",
+                retry_count + 1,
+                MAX_CUSTOMER_ACCOUNT_RETRIES,
+            )
+            _, raw_resp = await self._http_wrapper.session_request(
+                method=HTTPMethod.GET,
+                url=f"https://alexa.amazon.{self._session_state_data.domain}{URI_DEVICES}",
+            )
 
-        _LOGGER.debug("Unexpected refresh data response")
-        return False, {}
+            json_data = await self._http_wrapper.response_to_json(raw_resp, "devices")
+
+            for device in json_data.get("devices", []):
+                dev_serial = device.get("serialNumber")
+                if not dev_serial:
+                    _LOGGER.warning(
+                        "Skipping device without serial number: %s",
+                        device["accountName"],
+                    )
+                    continue
+                if device["deviceType"] != AMAZON_DEVICE_TYPE:
+                    continue
+
+                this_device_serial = self._session_state_data.login_stored_data[
+                    "device_info"
+                ]["device_serial_number"]
+
+                for subdevice in device["appDeviceList"]:
+                    if subdevice["serialNumber"] == this_device_serial:
+                        account_owner_customer_id = device["deviceOwnerCustomerId"]
+                        _LOGGER.debug(
+                            "Setting account owner: %s",
+                            account_owner_customer_id,
+                        )
+                        self._session_state_data.account_customer_id = (
+                            account_owner_customer_id
+                        )
+                        return
+        if not self._session_state_data.account_customer_id:
+            raise CannotRetrieveData("Cannot find account owner customer ID")

aioamazondevices/structures.py

@@ -37,7 +37,7 @@ class AmazonDevice:
     device_type: str
     device_owner_customer_id: str
     household_device: bool
-    device_cluster_members: list[str]
+    device_cluster_members: dict[str, str | None]
     online: bool
     serial_number: str
     software_version: str

{aioamazondevices-9.0.2.dist-info → aioamazondevices-11.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aioamazondevices
-Version: 9.0.2
+Version: 11.0.3
 Summary: Python library to control Amazon devices
 License-Expression: Apache-2.0
 License-File: LICENSE

aioamazondevices-11.0.3.dist-info/RECORD

@@ -0,0 +1,23 @@
+aioamazondevices/__init__.py,sha256=Q_uFYFnNYMzrZjtqxHRSTatCd-pn44lYmk0nn0Q3rOY,277
+aioamazondevices/api.py,sha256=CQ_CQMhpwHryTX8Utqmw8AVKvi56UmD3xpozIXTe0Uc,19888
+aioamazondevices/const/__init__.py,sha256=xQt8Smq2Ojjo30KKdev_gxDkcpY9PJlArTUXKel8oqs,38
+aioamazondevices/const/devices.py,sha256=-W4yBSeACIsG3z_8MC_jrQoFJN1NZMe4c62XPee6q1k,11285
+aioamazondevices/const/http.py,sha256=tgsRJWfx_SFRBk6T7TiClP02qIsPN4wShfMqRbZcQio,1204
+aioamazondevices/const/metadata.py,sha256=zfia4dzEJQ1NPKiVzL-BslOngBRPSpL_vX0DPvIBhSg,1250
+aioamazondevices/const/queries.py,sha256=weCYmUJedNyx1P8z_tG_6cHGMjICUVo6KOckkl4P_-w,1900
+aioamazondevices/const/schedules.py,sha256=GohhoXSGxXEq_fEycSBsjaDJdIxuMtvspLVqaCmJjOU,1378
+aioamazondevices/const/sounds.py,sha256=hdrXYKEuSOCw7fDdylvqLcDqD5poHzhgXEnUwq_TwDE,1923
+aioamazondevices/exceptions.py,sha256=gRYrxNAJnrV6uRuMx5e76VMvtNKyceXd09q84pDBBrI,638
+aioamazondevices/http_wrapper.py,sha256=MrPiWisER2piJy02yiP5eAP6SDuq-i10lIp5DN_epYc,14467
+aioamazondevices/implementation/__init__.py,sha256=HU18CNdQaDYFksyHi8BL0a0FK0_knqo60ueOxH3zvgo,47
+aioamazondevices/implementation/dnd.py,sha256=UrYSavcaddpYY7JA3aGXEjw7TCNaVERnEcunNcvheac,2065
+aioamazondevices/implementation/notification.py,sha256=b9pvajZvdn-ykISuYFb9-BW4bVczUQGnnnuctJ9_kZY,8674
+aioamazondevices/implementation/sequence.py,sha256=xDOzQouGrsPAAPjBfHkDIAuC0fTEB5uqi8QR4VmNHYs,5650
+aioamazondevices/login.py,sha256=NNbZjaSC32uOGsKNkSx-URA4DIEGpCZSLp2Ey5xFv9U,17375
+aioamazondevices/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+aioamazondevices/structures.py,sha256=2duKj9kiknFQHVGOysh0pWTQagTT-IDStCskayrwYSE,1425
+aioamazondevices/utils.py,sha256=V6b5_CNJ5LtVBl9KSitr14nNle4mNDkZVojGhKfy60A,2373
+aioamazondevices-11.0.3.dist-info/METADATA,sha256=BxEuuS0OxVpBisq1ViK3xhejCOdQBAwu_1b7glFrQSg,8308
+aioamazondevices-11.0.3.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+aioamazondevices-11.0.3.dist-info/licenses/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
+aioamazondevices-11.0.3.dist-info/RECORD,,

aioamazondevices-9.0.2.dist-info/RECORD

@@ -1,19 +0,0 @@
-aioamazondevices/__init__.py,sha256=-N24hqmuP5X5yZml6w5ASarPp5QOcX9uWEHMHmbHpVY,276
-aioamazondevices/api.py,sha256=Jwl6yx6gLjfPto6TNuP_e9rkl6qskzRPzDuGmV0kOAc,32729
-aioamazondevices/const/__init__.py,sha256=xQt8Smq2Ojjo30KKdev_gxDkcpY9PJlArTUXKel8oqs,38
-aioamazondevices/const/devices.py,sha256=yy4bKdvsy4HUIMVlCe-1SJboZqH060nyhcf_ZuES23Y,11056
-aioamazondevices/const/http.py,sha256=PMgfVl1K2vr_W3jkbD719x03aYte5mTObcPhRBayh7U,1151
-aioamazondevices/const/metadata.py,sha256=KbH184fSBZ5AvZAjas92qiAEwiSwWz4xSssznWhOWbI,1066
-aioamazondevices/const/queries.py,sha256=weCYmUJedNyx1P8z_tG_6cHGMjICUVo6KOckkl4P_-w,1900
-aioamazondevices/const/schedules.py,sha256=GohhoXSGxXEq_fEycSBsjaDJdIxuMtvspLVqaCmJjOU,1378
-aioamazondevices/const/sounds.py,sha256=hdrXYKEuSOCw7fDdylvqLcDqD5poHzhgXEnUwq_TwDE,1923
-aioamazondevices/exceptions.py,sha256=gRYrxNAJnrV6uRuMx5e76VMvtNKyceXd09q84pDBBrI,638
-aioamazondevices/http_wrapper.py,sha256=0gTjxXiqgK-lFSN5KW2PyxuQipp8JTfRPLYUsNnyp3E,11828
-aioamazondevices/login.py,sha256=Imkh78JsOiQEtTYXdU1yPC0CSh0nRGpxwLOQzCwfBiA,17247
-aioamazondevices/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aioamazondevices/structures.py,sha256=cGDUSsC9gNcA_rvAZhUwM5gCQ5U2nLl9HwMI4Mhnmyc,1413
-aioamazondevices/utils.py,sha256=V6b5_CNJ5LtVBl9KSitr14nNle4mNDkZVojGhKfy60A,2373
-aioamazondevices-9.0.2.dist-info/METADATA,sha256=pSXcilz1pm-goAp1GJvt5rLyDfXyT5qHLM00OmHmA00,8307
-aioamazondevices-9.0.2.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-aioamazondevices-9.0.2.dist-info/licenses/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
-aioamazondevices-9.0.2.dist-info/RECORD,,