aioamazondevices 0.1.0__tar.gz → 0.2.0__tar.gz

{aioamazondevices-0.1.0 → aioamazondevices-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioamazondevices
-Version: 0.1.0
+Version: 0.2.0
 Summary: Python library to control Amazon devices
 Home-page: https://github.com/chemelli74/aioamazondevices
 License: Apache Software License 2.0

{aioamazondevices-0.1.0 → aioamazondevices-0.2.0}/pyproject.toml

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

{aioamazondevices-0.1.0 → aioamazondevices-0.2.0}/src/aioamazondevices/__init__.py

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

{aioamazondevices-0.1.0 → aioamazondevices-0.2.0}/src/aioamazondevices/api.py

@@ -5,6 +5,7 @@ import hashlib
 import secrets
 import uuid
 from dataclasses import dataclass
+from pathlib import Path
 from typing import Any
 from urllib.parse import urlencode
 
@@ -39,27 +40,6 @@ class AmazonDevice:
     wifi: str
 
 
-def _build_init_cookies() -> dict[str, str]:
-    """Build initial cookies to prevent captcha in most cases."""
-    token_bytes = secrets.token_bytes(313)
-    frc = base64.b64encode(token_bytes).decode("ascii").rstrip("=")
-
-    map_md_dict = {
-        "device_user_dictionary": [],
-        "device_registration_data": {
-            "software_version": AMAZON_SOFTWARE_VERSION,
-        },
-        "app_identifier": {
-            "app_version": AMAZON_APP_VERSION,
-            "bundle_id": AMAZON_APP_BUNDLE_ID,
-        },
-    }
-    map_md_str = orjson.dumps(map_md_dict).decode("utf-8")
-    map_md = base64.b64encode(map_md_str.encode()).decode().rstrip("=")
-
-    return {"frc": frc, "map-md": map_md, "amzn-app-id": AMAZON_APP_ID}
-
-
 class AmazonEchoApi:
     """Queries Amazon for Echo devices."""
 
@@ -68,25 +48,50 @@ class AmazonEchoApi:
         login_country_code: str,
         login_email: str,
         login_password: str,
+        save_html: bool = False,
     ) -> None:
         """Initialize the scanner."""
-        locale = DOMAIN_BY_COUNTRY.get(login_country_code)
-        domain = locale["domain"] if locale else login_country_code
+        # Force country digits as lower case
+        country_code = login_country_code.lower()
+
+        locale = DOMAIN_BY_COUNTRY.get(country_code)
+        domain = locale["domain"] if locale else country_code
 
         assoc_handle = "amzn_dp_project_dee_ios"
         if not locale:
-            assoc_handle += f"_{login_country_code}"
+            assoc_handle += f"_{country_code}"
         self._assoc_handle = assoc_handle
 
         self._login_email = login_email
         self._login_password = login_password
         self._domain = domain
         self._url = f"https://www.amazon.{domain}"
-        self._cookies = _build_init_cookies()
+        self._cookies = self._build_init_cookies()
         self._headers = DEFAULT_HEADERS
+        self._save_html = save_html
 
         self.session: AsyncClient
 
+    def _build_init_cookies(self) -> dict[str, str]:
+        """Build initial cookies to prevent captcha in most cases."""
+        token_bytes = secrets.token_bytes(313)
+        frc = base64.b64encode(token_bytes).decode("ascii").rstrip("=")
+
+        map_md_dict = {
+            "device_user_dictionary": [],
+            "device_registration_data": {
+                "software_version": AMAZON_SOFTWARE_VERSION,
+            },
+            "app_identifier": {
+                "app_version": AMAZON_APP_VERSION,
+                "bundle_id": AMAZON_APP_BUNDLE_ID,
+            },
+        }
+        map_md_str = orjson.dumps(map_md_dict).decode("utf-8")
+        map_md = base64.b64encode(map_md_str.encode()).decode().rstrip("=")
+
+        return {"frc": frc, "map-md": map_md, "amzn-app-id": AMAZON_APP_ID}
+
     def _create_code_verifier(self, length: int = 32) -> bytes:
         """Create code verifier."""
         verifier = secrets.token_bytes(length)
@@ -97,18 +102,18 @@ class AmazonEchoApi:
         m = hashlib.sha256(verifier)
         return base64.urlsafe_b64encode(m.digest()).rstrip(b"=")
 
-    def _build_client_id(self) -> str:
+    def _build_client_id(self, serial: str) -> str:
         """Build client ID."""
-        serial = uuid.uuid4().hex.upper()
         client_id = serial.encode() + AMAZON_SERIAL_NUMBER
         return client_id.hex()
 
     def _build_oauth_url(
         self,
+        code_verifier: bytes,
+        client_id: str,
     ) -> str:
         """Build the url to login to Amazon as a Mobile device."""
-        client_id = self._build_client_id()
-        code_challenge = self._create_s256_code_challenge(self._create_code_verifier())
+        code_challenge = self._create_s256_code_challenge(code_verifier)
 
         oauth_params = {
             "openid.oa2.response_type": "code",
@@ -180,15 +185,34 @@ class AmazonEchoApi:
             url,
             data=input_data,
         )
+
+        await self._save_to_file(
+            resp.text,
+            url,
+        )
         return BeautifulSoup(resp.content, "html.parser"), resp
 
+    async def _save_to_file(self, html_code: str, url: str) -> None:
+        """Sage HTML data to disk."""
+        if not self._save_html:
+            return
+
+        url_split = url.split("/")
+        filename = f"{url_split[3]}-{url_split[4].split('?')[0]}.html"
+        with Path.open(Path(filename), "w+") as file:
+            file.write(html_code)
+            file.write("\n")
+
     async def login(self, otp_code: str) -> bool:
         """Login to Amazon."""
         _LOGGER.debug("Logging-in for %s [otp code %s]", self._login_email, otp_code)
         self._client_session()
 
+        code_verifier = self._create_code_verifier()
+        client_id = self._build_client_id(uuid.uuid4().hex.upper())
+
         _LOGGER.debug("Build oauth URL")
-        login_url = self._build_oauth_url()
+        login_url = self._build_oauth_url(code_verifier, client_id)
 
         login_soup, _ = await self._session_request("GET", login_url)
         login_method, login_url = self._get_request_from_soup(login_soup)
@@ -196,6 +220,7 @@ class AmazonEchoApi:
         login_inputs["email"] = self._login_email
         login_inputs["password"] = self._login_password
 
+        _LOGGER.debug("Register at %s", login_url)
         login_soup, _ = await self._session_request(
             login_method,
             login_url,