amazon-orders 4.9.2__tar.gz → 4.9.4__tar.gz

{amazon_orders-4.9.2 → amazon_orders-4.9.4}/CHANGELOG.md

@@ -4,7 +4,24 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/alexdlaird/amazon-orders/compare/4.9.2...HEAD)
+## [Unreleased](https://github.com/alexdlaird/amazon-orders/compare/4.9.4...HEAD)
+
+## [4.9.4](https://github.com/alexdlaird/amazon-orders/compare/4.9.3...4.9.4) - 2026-10-19
+
+### Added
+
+- `FamilyMember` entity, `AmazonOrders.get_family_members()` and `parse_family_members()`, `family_member_id` on `get_order_history()` and `get_order_history_page()`, and the `family-members` CLI command and `history --family-member-id`, for the Orders of Amazon Household members (e.g. linked Teen accounts).
+- Support for Amazon's new passkey auth flow, continuing with the password.
+
+### Fixed
+
+- Bug fixes and stability improvements.
+
+## [4.9.3](https://github.com/alexdlaird/amazon-orders/compare/4.9.2...4.9.3) - 2026-10-18
+
+### Fixed
+
+- Bug fixes and stability improvements.
 
 ## [4.9.2](https://github.com/alexdlaird/amazon-orders/compare/4.9.1...4.9.2) - 2026-10-15
 

{amazon_orders-4.9.2/amazon_orders.egg-info → amazon_orders-4.9.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amazon-orders
-Version: 4.9.2
+Version: 4.9.4
 Summary: A Python library (and CLI) for Amazon order history, line items, and transactions
 Author-email: Alex Laird <contact@alexlaird.com>
 Maintainer-email: Alex Laird <contact@alexlaird.com>
@@ -77,6 +77,7 @@ Dynamic: license-file
 <p align="center"><img alt="amazon-orders - A Python library (and CLI) for Amazon order history" src="https://amazon-orders.readthedocs.io/_images/logo.png" /></p>
 
 [![Version](https://img.shields.io/pypi/v/amazon-orders)](https://pypi.org/project/amazon-orders)
+[![PyPI - Downloads](https://img.shields.io/pypi/dm/amazon-orders)](https://pypistats.org/packages/amazon-orders)
 [![Python Versions](https://img.shields.io/pypi/pyversions/amazon-orders.svg)](https://pypi.org/project/amazon-orders)
 [![Coverage](https://img.shields.io/codecov/c/github/alexdlaird/amazon-orders)](https://codecov.io/gh/alexdlaird/amazon-orders)
 [![Build](https://img.shields.io/github/actions/workflow/status/alexdlaird/amazon-orders/build.yml)](https://github.com/alexdlaird/amazon-orders/actions/workflows/build.yml)
@@ -151,9 +152,10 @@ amazon-orders history --last-3-months
 
 ### Output Formats
 
-The `history`, `order`, `transactions`, `order-transactions`, and `gift-card-activity` commands accept
-`--output`, which renders Orders, Transactions, and Gift Card activity as `text` (the default), `json`,
-`yaml`, or `csv`. Progress messages are written to `stderr`, so redirecting `stdout` captures only the data.
+The `history`, `order`, `transactions`, `order-transactions`, `gift-card-activity`, and `family-members` commands
+accept `--output`, which renders Orders, Transactions, Gift Card activity, and Amazon Household members as `text` (the
+default), `json`, `yaml`, or `csv`. Progress messages are written to `stderr`, so redirecting `stdout` captures only
+the data.
 
 ```sh
 amazon-orders history --year 2023 --output json > orders.json
@@ -232,6 +234,9 @@ as shown above. Any MCP client gets the same as tools through
 [`amazon-orders-mcp`](https://github.com/alexdlaird/amazon-orders-mcp#readme), a server built on `amazon-orders` — see
 its README for setup.
 
+The server signs you in with a browser, so it needs a display. Without one, use the CLI or library with
+[Automating Authentication](#automating-authentication).
+
 ## Documentation
 
 For more advanced usage, `amazon-orders`'s official documentation is available

{amazon_orders-4.9.2 → amazon_orders-4.9.4}/README.md

@@ -1,6 +1,7 @@
 <p align="center"><img alt="amazon-orders - A Python library (and CLI) for Amazon order history" src="https://amazon-orders.readthedocs.io/_images/logo.png" /></p>
 
 [![Version](https://img.shields.io/pypi/v/amazon-orders)](https://pypi.org/project/amazon-orders)
+[![PyPI - Downloads](https://img.shields.io/pypi/dm/amazon-orders)](https://pypistats.org/packages/amazon-orders)
 [![Python Versions](https://img.shields.io/pypi/pyversions/amazon-orders.svg)](https://pypi.org/project/amazon-orders)
 [![Coverage](https://img.shields.io/codecov/c/github/alexdlaird/amazon-orders)](https://codecov.io/gh/alexdlaird/amazon-orders)
 [![Build](https://img.shields.io/github/actions/workflow/status/alexdlaird/amazon-orders/build.yml)](https://github.com/alexdlaird/amazon-orders/actions/workflows/build.yml)
@@ -75,9 +76,10 @@ amazon-orders history --last-3-months
 
 ### Output Formats
 
-The `history`, `order`, `transactions`, `order-transactions`, and `gift-card-activity` commands accept
-`--output`, which renders Orders, Transactions, and Gift Card activity as `text` (the default), `json`,
-`yaml`, or `csv`. Progress messages are written to `stderr`, so redirecting `stdout` captures only the data.
+The `history`, `order`, `transactions`, `order-transactions`, `gift-card-activity`, and `family-members` commands
+accept `--output`, which renders Orders, Transactions, Gift Card activity, and Amazon Household members as `text` (the
+default), `json`, `yaml`, or `csv`. Progress messages are written to `stderr`, so redirecting `stdout` captures only
+the data.
 
 ```sh
 amazon-orders history --year 2023 --output json > orders.json
@@ -156,6 +158,9 @@ as shown above. Any MCP client gets the same as tools through
 [`amazon-orders-mcp`](https://github.com/alexdlaird/amazon-orders-mcp#readme), a server built on `amazon-orders` — see
 its README for setup.
 
+The server signs you in with a browser, so it needs a display. Without one, use the CLI or library with
+[Automating Authentication](#automating-authentication).
+
 ## Documentation
 
 For more advanced usage, `amazon-orders`'s official documentation is available

{amazon_orders-4.9.2 → amazon_orders-4.9.4/amazon_orders.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amazon-orders
-Version: 4.9.2
+Version: 4.9.4
 Summary: A Python library (and CLI) for Amazon order history, line items, and transactions
 Author-email: Alex Laird <contact@alexlaird.com>
 Maintainer-email: Alex Laird <contact@alexlaird.com>
@@ -77,6 +77,7 @@ Dynamic: license-file
 <p align="center"><img alt="amazon-orders - A Python library (and CLI) for Amazon order history" src="https://amazon-orders.readthedocs.io/_images/logo.png" /></p>
 
 [![Version](https://img.shields.io/pypi/v/amazon-orders)](https://pypi.org/project/amazon-orders)
+[![PyPI - Downloads](https://img.shields.io/pypi/dm/amazon-orders)](https://pypistats.org/packages/amazon-orders)
 [![Python Versions](https://img.shields.io/pypi/pyversions/amazon-orders.svg)](https://pypi.org/project/amazon-orders)
 [![Coverage](https://img.shields.io/codecov/c/github/alexdlaird/amazon-orders)](https://codecov.io/gh/alexdlaird/amazon-orders)
 [![Build](https://img.shields.io/github/actions/workflow/status/alexdlaird/amazon-orders/build.yml)](https://github.com/alexdlaird/amazon-orders/actions/workflows/build.yml)
@@ -151,9 +152,10 @@ amazon-orders history --last-3-months
 
 ### Output Formats
 
-The `history`, `order`, `transactions`, `order-transactions`, and `gift-card-activity` commands accept
-`--output`, which renders Orders, Transactions, and Gift Card activity as `text` (the default), `json`,
-`yaml`, or `csv`. Progress messages are written to `stderr`, so redirecting `stdout` captures only the data.
+The `history`, `order`, `transactions`, `order-transactions`, `gift-card-activity`, and `family-members` commands
+accept `--output`, which renders Orders, Transactions, Gift Card activity, and Amazon Household members as `text` (the
+default), `json`, `yaml`, or `csv`. Progress messages are written to `stderr`, so redirecting `stdout` captures only
+the data.
 
 ```sh
 amazon-orders history --year 2023 --output json > orders.json
@@ -232,6 +234,9 @@ as shown above. Any MCP client gets the same as tools through
 [`amazon-orders-mcp`](https://github.com/alexdlaird/amazon-orders-mcp#readme), a server built on `amazon-orders` — see
 its README for setup.
 
+The server signs you in with a browser, so it needs a display. Without one, use the CLI or library with
+[Automating Authentication](#automating-authentication).
+
 ## Documentation
 
 For more advanced usage, `amazon-orders`'s official documentation is available

{amazon_orders-4.9.2 → amazon_orders-4.9.4}/amazon_orders.egg-info/SOURCES.txt

@@ -34,6 +34,7 @@ amazonorders/contrib/waf/base.py
 amazonorders/contrib/waf/capsolver.py
 amazonorders/contrib/waf/twocaptcha.py
 amazonorders/entity/__init__.py
+amazonorders/entity/family_member.py
 amazonorders/entity/gift_card_activity.py
 amazonorders/entity/item.py
 amazonorders/entity/order.py

{amazon_orders-4.9.2 → amazon_orders-4.9.4}/amazonorders/__init__.py

@@ -1,3 +1,3 @@
 __copyright__ = "Copyright (c) 2024-2025 Alex Laird"
 __license__ = "MIT"
-__version__ = "4.9.2"
+__version__ = "4.9.4"

{amazon_orders-4.9.2 → amazon_orders-4.9.4}/amazonorders/cli.py

@@ -302,7 +302,11 @@ def amazon_orders_cli(ctx: Context,
               help="Get the full details for each Order in the history. "
                    "This will execute an additional request per Order.")
 @click.option("--order-filter", "order_filter", default=None,
-              help="The order type filter to use.")
+              help="The order type filter to use, e.g. digital-orders for Kindle and other digital purchases, "
+                   "which the default history doesn't include.")
+@click.option("--family-member-id", "family_member_id", default=None,
+              help="Get the Orders of this Amazon Household member, such as a linked Teen account, instead. "
+                   "See the family-members command for IDs.")
 @click.option("-o", "--output", type=click.Choice(OutputFormatter.OUTPUT_FORMATS), default="text",
               help="The output format. Defaults to text.")
 def history(ctx: Context,
@@ -322,6 +326,7 @@ def history(ctx: Context,
         single_page = kwargs["single_page"]
         full_details = kwargs["full_details"]
         order_filter = kwargs["order_filter"]
+        family_member_id = kwargs["family_member_id"]
         output = kwargs["output"]
 
         exclusive_flags = [year, last_3_months, last_30_days]
@@ -365,6 +370,7 @@ Order History for {filter_description}{optional_start_index}{optional_full_detai
                                                      keep_paging=not single_page,
                                                      time_filter=time_filter,
                                                      order_filter=order_filter,
+                                                     family_member_id=family_member_id,
                                                      progress_with_total=progress)
         end_time = time.time()
 
@@ -525,6 +531,39 @@ Transaction History for {days} days
         ctx.fail(str(e))
 
 
+@amazon_orders_cli.command("family-members")
+@click.pass_context
+@click.option("-o", "--output", type=click.Choice(OutputFormatter.OUTPUT_FORMATS), default="text",
+              help="The output format. Defaults to text.")
+def family_members(ctx: Context, **kwargs: Any) -> None:
+    """
+    Get the Amazon Household members whose Orders this account can view, such as linked Teen accounts.
+    """
+    amazon_session = ctx.obj["amazon_session"]
+
+    try:
+        CliAuth(amazon_session).authenticate()
+
+        config = ctx.obj["conf"]
+        amazon_orders = AmazonOrders(amazon_session,
+                                     config=config)
+
+        start_time = time.time()
+        members = amazon_orders.get_family_members()
+        end_time = time.time()
+
+        click.echo(config.output_cls(config).format(members, kwargs["output"]))
+
+        click.echo(
+            "... {total} Amazon Household members parsed in {time} seconds.\n".format(
+                total=len(members), time=int(end_time - start_time)), err=True)
+    except AmazonOrdersAuthRedirectError:
+        IOClick.echo_session_expired()
+    except AmazonOrdersError as e:
+        logger.debug("An error occurred.", exc_info=True)
+        ctx.fail(str(e))
+
+
 @amazon_orders_cli.command()
 @click.pass_context
 def gift_card_balance(ctx: Context) -> None:

{amazon_orders-4.9.2 → amazon_orders-4.9.4}/amazonorders/constants.py

@@ -69,6 +69,7 @@ class Constants:
     ORDER_INVOICE_URL = f"{BASE_URL}/gp/css/summary/print.html"
     HISTORY_FILTER_QUERY_PARAM = "timeFilter"
     ORDER_FILTER_QUERY_PARAM = "orderFilter"
+    FAMILY_MEMBER_QUERY_PARAM = "familyMemberId"
     HISTORY_PAGE_QUERY_PARAM = "page"
     HISTORY_START_INDEX_QUERY_PARAM = "startIndex"
     ORDER_ID_QUERY_PARAM = "orderID"

amazon_orders-4.9.4/amazonorders/entity/family_member.py

@@ -0,0 +1,48 @@
+__copyright__ = "Copyright (c) 2024-2025 Alex Laird"
+__license__ = "MIT"
+
+import logging
+from typing import Optional
+
+from bs4 import Tag
+
+from amazonorders.conf import AmazonOrdersConfig
+from amazonorders.entity.parsable import Parsable
+
+logger = logging.getLogger(__name__)
+
+
+class FamilyMember(Parsable):
+    """
+    A member of the Amazon Household whose Orders the account can view, such as a linked Teen account. Pass its
+    :attr:`id` as ``family_member_id`` to :func:`~amazonorders.orders.AmazonOrders.get_order_history` to get their
+    Orders.
+    """
+
+    def __init__(self,
+                 parsed: Tag,
+                 config: AmazonOrdersConfig) -> None:
+        super().__init__(parsed, config)
+
+        #: The FamilyMember ID, Amazon's ``familyMemberId``.
+        self.id: Optional[str] = self.safe_parse(self._parse_id)
+        #: The FamilyMember name.
+        self.name: Optional[str] = self.safe_parse(self._parse_name)
+
+    def __repr__(self) -> str:
+        return f"<FamilyMember {self.id}: \"{self.name}\">"
+
+    def __str__(self) -> str:  # pragma: no cover
+        return f"FamilyMember {self.id}: {self.name}"
+
+    def _parse_id(self) -> Optional[str]:
+        value = self.parsed.get(self.config.selectors.FAMILY_MEMBER_ID_ATTR)
+        return str(value).strip() if value else None
+
+    def _parse_name(self) -> Optional[str]:
+        # Amazon renders a NUL byte between the name and the suffix, e.g. "Jane Doe\x00's Orders"
+        value = self.parsed.text.replace("\x00", " ").strip()
+        suffix = self.config.selectors.FIELD_FAMILY_MEMBER_NAME_SUFFIX
+        if suffix and suffix in value:
+            value = value.split(suffix)[0]
+        return value.strip() or None

{amazon_orders-4.9.2 → amazon_orders-4.9.4}/amazonorders/entity/order.py

@@ -252,7 +252,18 @@ class Order(Parsable):
         tag = util.select_one(self.parsed, self.config.selectors.FIELD_ORDER_PAYMENT_METHOD_SELECTOR)
         if tag is None:
             return None
-        return tag.attrs.get("alt") or tag.text.strip()
+        return tag.attrs.get("alt") or self._without_masked_digits(tag.text).strip()
+
+    def _without_masked_digits(self,
+                               text: str) -> str:
+        """
+        The payment method's name, when Amazon shows it in one line with the masked digits that follow it.
+        """
+        match = re.search(self.config.selectors.FIELD_ORDER_PAYMENT_METHOD_LAST_4_REGEX, text)
+        if match and match.start() > 0:
+            return text[:match.start()]
+
+        return text
 
     def _parse_masked_digits(self,
                              selector: Union[str, list],

{amazon_orders-4.9.2 → amazon_orders-4.9.4}/amazonorders/forms.py

@@ -6,7 +6,7 @@ import re
 from abc import ABC
 from io import BytesIO
 from typing import Any, Dict, NoReturn, Optional, TYPE_CHECKING, Union
-from urllib.parse import urlparse
+from urllib.parse import urljoin, urlparse
 
 import pyotp
 from PIL import Image
@@ -190,7 +190,8 @@ class AuthForm(ABC):
 
         error_tag = util.select_one(form_response.parsed, self.error_selector)
         if error_tag:
-            error_msg = f"Error from Amazon: {util.cleanup_html_text(error_tag.text)}"
+            error_text = util.cleanup_html_text(error_tag.get_text("\n"))
+            error_msg = f"Error from Amazon: {error_text}"
 
             if self.critical:
                 raise AmazonOrdersAuthError(error_msg)
@@ -226,10 +227,23 @@ class SignInForm(AuthForm):
                 "Check if Amazon changed their login flow."
             )  # pragma: no cover
 
-        additional_attrs.update({self.solution_attr_key: self.amazon_session.username,
-                                 "password": self.amazon_session.password})
+        additional_attrs[self.solution_attr_key] = self.amazon_session.username
+        if not self._collects_email_only():
+            additional_attrs["password"] = self.amazon_session.password
         self.data.update(additional_attrs)
 
+    def _collects_email_only(self) -> bool:
+        """
+        Whether the ``<form>`` is the email-first step of sign-in, which posts to the claim URL and asks for the
+        password on the page that follows. A browser sends only the email here, and Amazon's current sign-in rejects
+        a password sent along with it.
+        """
+        if not self.form:
+            return False
+
+        action_path = urlparse(str(self.form.get("action", ""))).path
+        return action_path == urlparse(self.config.constants.SIGN_IN_CLAIM_URL).path
+
 
 class ClaimForm(AuthForm):
     def __init__(self,
@@ -259,10 +273,64 @@ class ClaimForm(AuthForm):
                 "Check if Amazon changed their login flow."
             )  # pragma: no cover
 
-        additional_attrs.update({self.solution_attr_key: self.amazon_session.username,
-                                 "password": self.amazon_session.password})
+        if self._asks_for_email():
+            additional_attrs[self.solution_attr_key] = self.amazon_session.username
+        additional_attrs["password"] = self.amazon_session.password
         self.data.update(additional_attrs)
 
+    def _asks_for_email(self) -> bool:
+        """
+        Whether the ``<form>`` has a field for the email. The older sign-in asks for it again with the password, while
+        the newer one already has it from the step before and asks for the password alone.
+        """
+        return bool(self.form and self.form.find("input", attrs={"name": self.solution_attr_key}))
+
+
+class PasskeyForm(AuthForm):
+    """
+    The page that offers a passkey before the password, when the account has one. A passkey needs the user's device,
+    so this declines it and follows the page's link to the password instead.
+    """
+
+    def __init__(self,
+                 config: AmazonOrdersConfig,
+                 selector: Optional[str] = None) -> None:
+        if not selector:
+            selector = config.selectors.PASSKEY_FORM_SELECTOR
+
+        super().__init__(config, selector, critical=True)
+
+        #: The link to the password instead of the passkey.
+        self.password_challenge_link: Optional[Tag] = None
+
+    def select_form(self,
+                    amazon_session: "AmazonSession",
+                    parsed: Tag) -> bool:
+        if not super().select_form(amazon_session, parsed):
+            return False
+
+        self.password_challenge_link = util.select_one(parsed,
+                                                       self.config.selectors.PASSKEY_PASSWORD_CHALLENGE_LINK_SELECTOR)
+        return self.password_challenge_link is not None
+
+    def submit(self, last_response: Response) -> AmazonSessionResponse:
+        if not self.amazon_session or not self.password_challenge_link:
+            raise AmazonOrdersError(
+                "Call AuthForm.select_form() first."
+            )  # pragma: no cover
+
+        url = urljoin(last_response.url, str(self.password_challenge_link["href"]))
+        password_response = self.amazon_session.get(url, persist_cookies=True)
+
+        self._handle_errors(password_response)
+        self.clear_form()
+
+        return password_response
+
+    def clear_form(self) -> None:
+        super().clear_form()
+        self.password_challenge_link = None
+
 
 class IntentForm(AuthForm):
     def __init__(self,
@@ -392,12 +460,23 @@ class MfaForm(AuthForm):
             otp = self.amazon_session.io.prompt("Enter the one-time passcode from your preferred 2FA method")
             self.amazon_session.io.echo("")
 
-        additional_attrs.update({self.solution_attr_key: otp,
-                                 "rememberDevice": ""})
+        additional_attrs[self.solution_attr_key] = otp
+        if not self._posts_to_claim():
+            additional_attrs["rememberDevice"] = ""
+            if "deviceId" not in self.data:
+                additional_attrs["deviceId"] = ""
         self.data.update(additional_attrs)
 
-        if "deviceId" not in self.data:
-            self.data["deviceId"] = ""
+    def _posts_to_claim(self) -> bool:
+        """
+        Whether the ``<form>`` is part of the newer sign-in that posts under the claim URL, which takes the code alone,
+        without the older form's device fields.
+        """
+        if not self.form:
+            return False
+
+        action_path = urlparse(str(self.form.get("action", ""))).path
+        return action_path.startswith(urlparse(self.config.constants.SIGN_IN_CLAIM_URL).path)
 
 
 class CaptchaForm(AuthForm):

{amazon_orders-4.9.2 → amazon_orders-4.9.4}/amazonorders/orders.py

@@ -12,6 +12,7 @@ from bs4 import BeautifulSoup, Tag
 
 from amazonorders import util
 from amazonorders.conf import AmazonOrdersConfig
+from amazonorders.entity.family_member import FamilyMember
 from amazonorders.entity.order import Order
 from amazonorders.entity.tracking import Tracking
 from amazonorders.exception import AmazonOrdersError, AmazonOrdersNotFoundError, AmazonOrdersUnavailableError
@@ -96,6 +97,20 @@ class AmazonOrders:
             raise AmazonOrdersError("Could not parse Order details. Check if Amazon changed the HTML.")
         return order
 
+    @classmethod
+    def parse_family_members(cls,
+                             html: str,
+                             config: AmazonOrdersConfig) -> List[FamilyMember]:
+        """
+        Parse the Amazon Household members from an already-fetched Order history page, without a session driving
+        the fetch. Useful for parsing HTML obtained elsewhere and for network-free testing.
+
+        :param html: The Order history page HTML to parse.
+        :param config: The config providing the selectors used for parsing.
+        :return: The parsed FamilyMembers, or an empty list if the page lists none.
+        """
+        return cls._parse_family_members(BeautifulSoup(html, config.bs4_parser), config)
+
     def get_order(self,
                   order_id: str,
                   clone: Optional[Order] = None) -> Order:
@@ -251,6 +266,23 @@ class AmazonOrders:
 
         return invoice_response
 
+    def get_family_members(self) -> List[FamilyMember]:
+        """
+        Get the members of the Amazon Household whose Orders this account can view, such as linked Teen accounts,
+        from the Order history's member filter. Pass a member's
+        :attr:`~amazonorders.entity.family_member.FamilyMember.id` as ``family_member_id`` to
+        :func:`get_order_history` to get their Orders.
+
+        :return: The FamilyMembers, or an empty list if the account has none.
+        """
+        if not self.amazon_session.is_authenticated:
+            raise AmazonOrdersError("Call AmazonSession.login() to authenticate first.")
+
+        page_response = self.amazon_session.get(self.config.constants.ORDER_HISTORY_URL)
+        self.amazon_session.check_response(page_response)
+
+        return self._parse_family_members(page_response.parsed, self.config)
+
     def get_order_history(self,
                           year: Optional[int] = None,
                           start_index: Optional[int] = None,
@@ -259,7 +291,8 @@ class AmazonOrders:
                           time_filter: Optional[str] = None,
                           order_filter: Optional[str] = None,
                           progress: Optional[Callable[[int], None]] = None,
-                          progress_with_total: Optional[Callable[[int, Optional[int]], None]] = None) -> List[Order]:
+                          progress_with_total: Optional[Callable[[int, Optional[int]], None]] = None,
+                          family_member_id: Optional[str] = None) -> List[Order]:
         """
         Get the Amazon Order history for a given time period.
 
@@ -275,18 +308,21 @@ class AmazonOrders:
         :param time_filter: The time filter to use. Supported values are ``"last30"`` (last 30 days),
             ``"months-3"`` (past 3 months), or ``"year-YYYY"`` (specific year). If provided, this takes
             precedence over the ``year`` parameter.
-        :param order_filter: The order type filter to use. If provided, appended alongside the time filter.
+        :param order_filter: The order type filter to use, e.g. ``"digital-orders"`` for Kindle and other digital
+            purchases, which the default history doesn't include. If provided, appended alongside the time filter.
         :param progress: Called after each page of history is fetched, with the number of Orders found so far
             (before their full details are fetched, if ``full_details`` is ``True``).
         :param progress_with_total: Like ``progress``, but also called with the number of Orders expected in total,
             from the count Amazon shows on the history page. The total is ``None`` if Amazon doesn't show one, or if
             ``order_filter`` is provided, since Amazon's count may not reflect it.
+        :param family_member_id: The ID of an Amazon Household member whose Orders to get, such as a linked Teen
+            account, from :func:`get_family_members`.
         :return: A list of the requested Orders.
         """
         if not self.amazon_session.is_authenticated:
             raise AmazonOrdersError("Call AmazonSession.login() to authenticate first.")
 
-        next_page = self._order_history_url(year, start_index, time_filter, order_filter)
+        next_page = self._order_history_url(year, start_index, time_filter, order_filter, family_member_id)
         current_index = int(start_index) if start_index else 0
 
         orders, _, _ = asyncio.run(self._build_orders_async(next_page, keep_paging, full_details, current_index,
@@ -304,7 +340,8 @@ class AmazonOrders:
                                limit: Optional[int] = None,
                                cursor: Optional[Dict[str, Any]] = None,
                                progress: Optional[Callable[[int], None]] = None,
-                               progress_with_total: Optional[Callable[[int, Optional[int]], None]] = None
+                               progress_with_total: Optional[Callable[[int, Optional[int]], None]] = None,
+                               family_member_id: Optional[str] = None
                                ) -> PagedResults[Order]:
         """
         Get a batch of the Amazon Order history for a given time period, with a cursor to fetch the next batch.
@@ -318,7 +355,8 @@ class AmazonOrders:
             request per Order.
         :param time_filter: The time filter to use, as in :func:`get_order_history`. Ignored if ``cursor`` is
             provided.
-        :param order_filter: The order type filter to use. Ignored if ``cursor`` is provided.
+        :param order_filter: The order type filter to use, as in :func:`get_order_history`. Ignored if ``cursor`` is
+            provided.
         :param limit: Stop fetching history pages once at least this many Orders are collected. Whole pages are
             fetched, so the batch can hold up to a page more than ``limit``. ``None`` fetches every page.
         :param cursor: The :attr:`~amazonorders.paging.PagedResults.cursor` of the previous batch, to fetch the
@@ -327,6 +365,8 @@ class AmazonOrders:
             this batch (before their full details are fetched, if ``full_details`` is ``True``).
         :param progress_with_total: Like ``progress``, but also called with the number of Orders expected in this
             batch, as in :func:`get_order_history`, and at most ``limit`` until the batch ends.
+        :param family_member_id: The ID of an Amazon Household member whose Orders to get, as in
+            :func:`get_order_history`. Ignored if ``cursor`` is provided.
         :return: The batch of Orders, and the cursor for the next one.
         """
         if not self.amazon_session.is_authenticated:
@@ -337,9 +377,11 @@ class AmazonOrders:
             start_index = cursor["start_index"]
             time_filter = cursor["time_filter"]
             order_filter = cursor["order_filter"]
+            family_member_id = cursor.get("family_member_id")
         time_filter = self._history_filter_value(year, time_filter)
 
-        next_page: Optional[str] = self._order_history_url(None, start_index, time_filter, order_filter)
+        next_page: Optional[str] = self._order_history_url(None, start_index, time_filter, order_filter,
+                                                           family_member_id)
         current_index = int(start_index) if start_index else 0
 
         orders, next_page, current_index = asyncio.run(
@@ -349,6 +391,7 @@ class AmazonOrders:
             "start_index": current_index,
             "time_filter": time_filter,
             "order_filter": order_filter,
+            **({"family_member_id": family_member_id} if family_member_id else {}),
         } if next_page else None
 
         return PagedResults(orders, next_cursor)
@@ -383,7 +426,8 @@ class AmazonOrders:
                            year: Optional[int],
                            start_index: Optional[int],
                            time_filter: Optional[str],
-                           order_filter: Optional[str]) -> str:
+                           order_filter: Optional[str],
+                           family_member_id: Optional[str] = None) -> str:
         constants = self.config.constants
         filter_value = self._history_filter_value(year, time_filter)
         page = int(start_index) // constants.ORDER_HISTORY_PAGE_SIZE if start_index else 0
@@ -396,16 +440,28 @@ class AmazonOrders:
             f"&{constants.ORDER_FILTER_QUERY_PARAM}={quote(order_filter, safe='')}"
             if order_filter else ""
         )
+        optional_family_member = (
+            f"&{constants.FAMILY_MEMBER_QUERY_PARAM}={quote(family_member_id, safe='')}"
+            if family_member_id else ""
+        )
         return (
-            "{url}?{query_param}={filter_value}{optional_order_filter}{optional_page}"
+            "{url}?{query_param}={filter_value}{optional_order_filter}{optional_family_member}{optional_page}"
         ).format(
             url=constants.ORDER_HISTORY_URL,
             query_param=constants.HISTORY_FILTER_QUERY_PARAM,
             filter_value=filter_value,
             optional_order_filter=optional_order_filter,
+            optional_family_member=optional_family_member,
             optional_page=optional_page
         )
 
+    @staticmethod
+    def _parse_family_members(parsed: Tag,
+                              config: AmazonOrdersConfig) -> List[FamilyMember]:
+        members = [FamilyMember(tag, config)
+                   for tag in util.select(parsed, config.selectors.FAMILY_MEMBER_ENTITY_SELECTOR)]
+        return [member for member in members if member.id]
+
     @staticmethod
     def _parse_order_count(order_count_tag: Optional[Tag],
                            config: AmazonOrdersConfig) -> Optional[int]:

{amazon_orders-4.9.2 → amazon_orders-4.9.4}/amazonorders/output.py

@@ -105,7 +105,7 @@ Order #{order_number}
 
         order_str += f"\n  Shipments: {order.shipments}"
         order_str += f"\n  Order Details Link: {order.order_details_link}"
-        if order.grand_total:
+        if order.grand_total is not None:
             order_str += f"\n  Grand Total: {self.config.constants.format_currency(order.grand_total)}"
         order_str += f"\n  Order Placed Date: {order.order_placed_date}"
         if order.recipient:
@@ -147,7 +147,7 @@ Order #{order_number}
         """
         transaction_str = f"Transaction: {transaction.completed_date}"
         transaction_str += f"\n  Order #{transaction.order_number}"
-        if transaction.grand_total:
+        if transaction.grand_total is not None:
             transaction_str += f"\n  Grand Total: {self.config.constants.format_currency(transaction.grand_total)}"
         transaction_str += f"\n  Order Details Link: {transaction.order_details_link}"
 

{amazon_orders-4.9.2 → amazon_orders-4.9.4}/amazonorders/selectors.py

@@ -95,19 +95,22 @@ class Selectors:
     AWS_WAF_CHALLENGE_SCRIPT_SELECTOR = 'script[src*="awswaf.com"]'
 
     SIGN_IN_FORM_SELECTOR = "form[name='signIn']"
+    NAV_GREETING_SELECTOR = "#nav-link-accountList-nav-line-1"
     SIGN_IN_EMAIL_INPUT_SELECTOR = "input[name='email']"
-    CLAIM_FORM_SELECTOR = "form[name='signIn'].auth-validate-form"
+    CLAIM_FORM_SELECTOR = ["form[name='signIn'].auth-validate-form", "form#unified-password-form"]
     INTENT_FORM_SELECTOR = "form#intent-confirmation-form"
     INTENT_MESSAGE_SELECTOR = "div#intent-confirmation-container"
     MFA_DEVICE_SELECT_FORM_SELECTOR = "form#auth-select-device-form"
+    PASSKEY_FORM_SELECTOR = "form#unified-passkey-form"
+    PASSKEY_PASSWORD_CHALLENGE_LINK_SELECTOR = "a[href*='selectedChallengeType=password']"
     MFA_DEVICE_SELECT_INPUT_SELECTOR = "input[name='otpDeviceContext']"
     MFA_DEVICE_SELECT_INPUT_SELECTOR_VALUE = "value"
     MFA_DEVICE_SELECT_LABEL_SELECTOR = "span.a-label.a-radio-label"
-    MFA_FORM_SELECTOR = "form#auth-mfa-form"
+    MFA_FORM_SELECTOR = ["form#auth-mfa-form", "form#unified-otp-form"]
     CAPTCHA_1_FORM_SELECTOR = "form.cvf-widget-form-captcha"
     CAPTCHA_2_FORM_SELECTOR = ["form:has(input[id^='captchacharacters'])", "form[action$='validateCaptcha']"]
     CAPTCHA_OTP_FORM_SELECTOR = "form#verification-code-form"
-    DEFAULT_ERROR_TAG_SELECTOR = "div#auth-error-message-box"
+    DEFAULT_ERROR_TAG_SELECTOR = "div#auth-error-message-box:not(.aok-hidden *)"
     CAPTCHA_1_ERROR_SELECTOR = "div.cvf-widget-alert"
     CAPTCHA_2_ERROR_SELECTOR = "div.a-alert-info"
 
@@ -117,6 +120,16 @@ class Selectors:
 
     NEXT_PAGE_LINK_SELECTOR = "ul.a-pagination li.a-last a"
 
+    ##########################################################################
+    # CSS selectors for Amazon Household family members
+    ##########################################################################
+
+    #: The Order history's "My Orders" / "<name>'s Orders" dropdown; the account's own entry has an empty value
+    FAMILY_MEMBER_ENTITY_SELECTOR = ["select#family-member-filter option[value]:not([value=''])",
+                                     "select[name='familyMemberId'] option[value]:not([value=''])"]
+    FAMILY_MEMBER_ID_ATTR = "value"
+    FIELD_FAMILY_MEMBER_NAME_SUFFIX = "'s Orders"
+
     ##########################################################################
     # CSS selectors for Entities and Fields
     #
@@ -249,10 +262,12 @@ class Selectors:
                                         "div:is(.a-span3, .a-span12)"]
     FIELD_ORDER_PLACED_DATE_SUFFIX = "Order #"
     FIELD_ORDER_PAYMENT_METHOD_SELECTOR = ["[data-testid='payment-instrument-name']",
-                                           "img.pmts-payment-credit-card-instrument-logo"]
+                                           "img.pmts-payment-credit-card-instrument-logo",
+                                           "[data-testid='payment-instrument-message']"]
     FIELD_ORDER_PAYMENT_METHOD_LAST_4_SELECTOR = ["[data-testid='payment-instrument-number']",
-                                                  "span:has(img.pmts-payment-credit-card-instrument-logo):last-child"]
-    FIELD_ORDER_PAYMENT_METHOD_LAST_4_REGEX = r"(?:ending in\s+|^\s*)(\d+)"
+                                                  "span:has(img.pmts-payment-credit-card-instrument-logo):last-child",
+                                                  "[data-testid='payment-instrument-message']"]
+    FIELD_ORDER_PAYMENT_METHOD_LAST_4_REGEX = r"(?:ending in\s+|^\s*|•+\s*)(\d+)"
     FIELD_ORDER_SUBTOTALS_TAG_ITERATOR_SELECTOR = ["[data-component='orderSubtotals'] div.a-row",
                                                    "div#od-subtotals div.a-row",
                                                    "[data-component='chargeSummary'] div.od-line-item-row"]

{amazon_orders-4.9.2 → amazon_orders-4.9.4}/amazonorders/session.py

@@ -17,8 +17,8 @@ from requests.utils import dict_from_cookiejar
 from amazonorders.conf import AmazonOrdersConfig, cookies_file_lock, debug_output_file_lock
 from amazonorders.exception import AmazonOrdersAuthError, AmazonOrdersError, AmazonOrdersAuthRedirectError
 from amazonorders.forms import (AuthForm, AcicAuthBlocker, CaptchaForm, JSAuthBlocker, MfaDeviceSelectForm, MfaForm,
-                                SignInForm, ClaimForm, IntentForm)
-from amazonorders.util import AmazonSessionResponse, load_class
+                                SignInForm, ClaimForm, IntentForm, PasskeyForm)
+from amazonorders.util import AmazonSessionResponse, load_class, select_one
 
 logger = logging.getLogger(__name__)
 
@@ -169,6 +169,7 @@ class AmazonSession:
         return [ClaimForm(config),
                 IntentForm(config),
                 SignInForm(config),
+                PasskeyForm(config),
                 MfaDeviceSelectForm(config),
                 MfaForm(config),
                 CaptchaForm(config),
@@ -313,11 +314,9 @@ class AmazonSession:
         form_found = False
         attempts = 0
         while not self.is_authenticated and attempts < self.config.max_auth_attempts:
-            # TODO: BeautifulSoup doesn't let us query for #nav-item-signout, maybe because it's dynamic on the page,
-            #  but we should find a better way to do this
+            greeting = select_one(last_response.parsed, self.config.selectors.NAV_GREETING_SELECTOR)
             if self.auth_cookies_stored() or \
-                    (self.config.constants.SIGNED_OUT_TEXT not in last_response.response.text and
-                     "nav-item-signout" in last_response.response.text):
+                    (greeting is not None and self.config.constants.SIGNED_OUT_TEXT not in greeting.get_text()):
                 self.is_authenticated = True
                 break