diff --git a/custom_components/perfectdraft/__init__.py b/custom_components/perfectdraft/__init__.py index 2291410..1c3590f 100644 --- a/custom_components/perfectdraft/__init__.py +++ b/custom_components/perfectdraft/__init__.py @@ -12,6 +12,7 @@ from .const import ( CONF_ACCESS_TOKEN, CONF_ID_TOKEN, CONF_REFRESH_TOKEN, + CONF_USER_ID, DOMAIN, PLATFORMS, ) @@ -26,9 +27,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: client = PerfectDraftApiClient(session) client.set_tokens( - access_token=entry.data[CONF_ACCESS_TOKEN], + access_token=entry.data.get(CONF_ACCESS_TOKEN), id_token=entry.data.get(CONF_ID_TOKEN), refresh_token=entry.data.get(CONF_REFRESH_TOKEN), + user_id=entry.data.get(CONF_USER_ID), ) coordinator = PerfectDraftDataUpdateCoordinator(hass, client, entry) diff --git a/custom_components/perfectdraft/api.py b/custom_components/perfectdraft/api.py index 6203f0f..60eed2e 100644 --- a/custom_components/perfectdraft/api.py +++ b/custom_components/perfectdraft/api.py @@ -6,7 +6,7 @@ from typing import Any import aiohttp -from .const import API_BASE_URL, API_KEY, RECAPTCHA_ACTION +from .const import API_BASE_URL, API_KEY from .exceptions import ( AuthenticationError, PerfectDraftApiError, @@ -16,7 +16,6 @@ from .exceptions import ( _LOGGER = logging.getLogger(__name__) - class PerfectDraftApiClient: """Async client for api.perfectdraft.com.""" @@ -26,6 +25,7 @@ class PerfectDraftApiClient: self._access_token: str | None = None self._id_token: str | None = None self._refresh_token: str | None = None + self._user_id: str | None = None @property def access_token(self) -> str | None: @@ -35,80 +35,56 @@ class PerfectDraftApiClient: def refresh_token(self) -> str | None: return self._refresh_token + @property + def user_id(self) -> str | None: + return self._user_id + def set_tokens( self, - access_token: str, + access_token: str | None = None, id_token: str | None = None, refresh_token: str | None = None, + user_id: str | None = None, ) -> None: """Restore tokens from persisted config entry data.""" - self._access_token = access_token + if access_token is not None: + self._access_token = access_token if id_token is not None: self._id_token = id_token if refresh_token is not None: self._refresh_token = refresh_token - - async def authenticate( - self, email: str, password: str, recaptcha_token: str - ) -> dict[str, str]: - """Sign in and return the token triple. - - Returns dict with keys AccessToken, IdToken, RefreshToken. - """ - url = f"{self._base}/authentication/sign-in" - payload = { - "email": email, - "password": password, - "recaptchaToken": recaptcha_token, - "recaptchaAction": RECAPTCHA_ACTION, - } - headers = {"x-api-key": API_KEY} - - try: - async with self._session.post( - url, json=payload, headers=headers - ) as resp: - if resp.status == 401 or resp.status == 403: - body = await resp.text() - raise AuthenticationError( - f"Sign-in rejected ({resp.status}): {body}" - ) - if resp.status != 200: - body = await resp.text() - raise PerfectDraftApiError(resp.status, body) - data = await resp.json() - except aiohttp.ClientError as exc: - raise PerfectDraftConnectionError(str(exc)) from exc - - self._access_token = data["AccessToken"] - self._id_token = data["IdToken"] - self._refresh_token = data["RefreshToken"] - - _LOGGER.debug("Authenticated successfully") - return data + if user_id is not None: + self._user_id = user_id async def refresh_access_token( - self, refresh_token: str | None = None - ) -> dict[str, str]: - """Use the refresh token to obtain a new access token. + self, + user_id: str | None = None, + refresh_token: str | None = None, + ) -> dict[str, Any]: + """Refresh tokens via /auth/renewaccesstokens. - The exact endpoint is not yet confirmed; we try the most likely - candidates based on the API's Cognito-style token pattern. + This endpoint does NOT require reCAPTCHA. """ + uid = user_id or self._user_id token = refresh_token or self._refresh_token - if not token: - raise AuthenticationError("No refresh token available") + if not uid or not token: + raise AuthenticationError( + "UserId and RefreshToken are both required for token refresh" + ) - url = f"{self._base}/authentication/refresh" - payload = {"refreshToken": token} - headers = {"x-api-key": API_KEY} + url = f"{self._base}/auth/renewaccesstokens" + payload = {"UserId": uid, "RefreshToken": token} + headers = {"x-api-key": API_KEY, "Content-Type": "application/json"} try: async with self._session.post( url, json=payload, headers=headers ) as resp: - if resp.status in (401, 403): - raise AuthenticationError("Refresh token expired or invalid") + if resp.status in (400, 401, 403): + body = await resp.text() + raise AuthenticationError( + f"Token refresh failed ({resp.status}): {body}" + ) if resp.status != 200: body = await resp.text() raise PerfectDraftApiError(resp.status, body) @@ -120,6 +96,7 @@ class PerfectDraftApiClient: self._id_token = data.get("IdToken", self._id_token) if "RefreshToken" in data: self._refresh_token = data["RefreshToken"] + self._user_id = uid _LOGGER.debug("Token refreshed successfully") return data @@ -130,7 +107,9 @@ class PerfectDraftApiClient: """Make an authenticated API request with automatic 401 retry.""" url = f"{self._base}{path}" headers = kwargs.pop("headers", {}) - headers["x-access-token"] = self._access_token or "" + headers["x-api-key"] = API_KEY + if self._access_token: + headers["x-access-token"] = self._access_token try: async with self._session.request( diff --git a/custom_components/perfectdraft/config_flow.py b/custom_components/perfectdraft/config_flow.py index a9852c1..db0da06 100644 --- a/custom_components/perfectdraft/config_flow.py +++ b/custom_components/perfectdraft/config_flow.py @@ -2,28 +2,23 @@ from __future__ import annotations import logging -from pathlib import Path from typing import Any -import aiohttp import voluptuous as vol from homeassistant import config_entries -from homeassistant.components.http import HomeAssistantView -from homeassistant.const import CONF_EMAIL, CONF_PASSWORD -from homeassistant.core import HomeAssistant, callback +from homeassistant.const import CONF_EMAIL +from homeassistant.core import callback from homeassistant.helpers.aiohttp_client import async_get_clientsession from .const import ( CONF_ACCESS_TOKEN, CONF_ID_TOKEN, - CONF_MACHINE_ID, CONF_REFRESH_TOKEN, CONF_SCAN_INTERVAL, + CONF_USER_ID, DEFAULT_SCAN_INTERVAL, DOMAIN, MIN_SCAN_INTERVAL, - RECAPTCHA_ACTION, - RECAPTCHA_SITE_KEY, ) from .exceptions import ( AuthenticationError, @@ -34,83 +29,6 @@ from .api import PerfectDraftApiClient _LOGGER = logging.getLogger(__name__) -RECAPTCHA_HTML_PATH = Path(__file__).parent / "static" / "recaptcha.html" -RECAPTCHA_CALLBACK_PATH = "/api/perfectdraft/recaptcha_callback" -RECAPTCHA_PAGE_PATH = "/api/perfectdraft/recaptcha" - -_recaptcha_html_cache: str | None = None - - -def _get_recaptcha_html() -> str: - global _recaptcha_html_cache - if _recaptcha_html_cache is None: - raw = RECAPTCHA_HTML_PATH.read_text() - raw = raw.replace("RECAPTCHA_SITE_KEY", RECAPTCHA_SITE_KEY) - raw = raw.replace("RECAPTCHA_ACTION", RECAPTCHA_ACTION) - _recaptcha_html_cache = raw - return _recaptcha_html_cache - - -def _register_views(hass: HomeAssistant) -> None: - """Register the reCAPTCHA views once.""" - key = f"{DOMAIN}_views_registered" - if hass.data.get(key): - return - hass.http.register_view(RecaptchaPageView()) - hass.http.register_view(RecaptchaCallbackView()) - hass.data[key] = True - - -class RecaptchaPageView(HomeAssistantView): - """Serve the reCAPTCHA HTML page.""" - - url = RECAPTCHA_PAGE_PATH - name = "api:perfectdraft:recaptcha" - requires_auth = False - - async def get(self, request): - return aiohttp.web.Response( - text=_get_recaptcha_html(), - content_type="text/html", - ) - - -class RecaptchaCallbackView(HomeAssistantView): - """Receive the reCAPTCHA token from the browser and resume the config flow.""" - - url = RECAPTCHA_CALLBACK_PATH - name = "api:perfectdraft:recaptcha_callback" - requires_auth = False - - async def post(self, request): - hass = request.app["hass"] - try: - data = await request.json() - except Exception: - return aiohttp.web.json_response( - {"error": "invalid body"}, status=400 - ) - - flow_id = data.get("flow_id") - token = data.get("token") - if not flow_id or not token: - return aiohttp.web.json_response( - {"error": "missing flow_id or token"}, status=400 - ) - - # Stash the token where the flow can find it, then signal "done" - hass.data.setdefault(f"{DOMAIN}_recaptcha_tokens", {})[flow_id] = token - - try: - await hass.config_entries.flow.async_configure(flow_id) - except Exception: - _LOGGER.exception("Failed to resume config flow %s", flow_id) - return aiohttp.web.json_response( - {"error": "flow error"}, status=500 - ) - - return aiohttp.web.json_response({"ok": True}) - class PerfectDraftConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): """Handle a config flow for PerfectDraft.""" @@ -119,97 +37,80 @@ class PerfectDraftConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): def __init__(self) -> None: self._email: str | None = None - self._password: str | None = None - self._recaptcha_token: str | None = None + self._user_id: str | None = None + self._refresh_token: str | None = None async def async_step_user( self, user_input: dict[str, Any] | None = None ) -> config_entries.ConfigFlowResult: - """Step 1: collect email and password.""" + """Step 1: collect email (for display/unique ID).""" errors: dict[str, str] = {} if user_input is not None: self._email = user_input[CONF_EMAIL] - self._password = user_input[CONF_PASSWORD] - return await self.async_step_recaptcha() + return await self.async_step_tokens() return self.async_show_form( step_id="user", data_schema=vol.Schema( { vol.Required(CONF_EMAIL): str, - vol.Required(CONF_PASSWORD): str, } ), errors=errors, ) - async def async_step_recaptcha( + async def async_step_tokens( self, user_input: dict[str, Any] | None = None ) -> config_entries.ConfigFlowResult: - """Step 2 (fallback): external step — open browser for reCAPTCHA.""" - _register_views(self.hass) + """Step 2: collect UserId and RefreshToken, validate via refresh.""" + errors: dict[str, str] = {} - callback_url = f"{RECAPTCHA_CALLBACK_PATH}" - page_url = ( - f"{RECAPTCHA_PAGE_PATH}" - f"?callback={callback_url}&flow_id={self.flow_id}" - ) + if user_input is not None: + self._user_id = user_input[CONF_USER_ID].strip() + self._refresh_token = user_input[CONF_REFRESH_TOKEN].strip() - return self.async_external_step(step_id="recaptcha", url=page_url) + session = async_get_clientsession(self.hass) + client = PerfectDraftApiClient(session) - async def async_step_recaptcha_done( - self, user_input: dict[str, Any] | None = None - ) -> config_entries.ConfigFlowResult: - """Called automatically when the external reCAPTCHA step completes.""" - tokens = self.hass.data.get(f"{DOMAIN}_recaptcha_tokens", {}) - self._recaptcha_token = tokens.pop(self.flow_id, None) + try: + data = await client.refresh_access_token( + user_id=self._user_id, + refresh_token=self._refresh_token, + ) + except AuthenticationError as err: + _LOGGER.error("Token validation failed: %s", err) + errors["base"] = "invalid_auth" + except PerfectDraftConnectionError as err: + _LOGGER.error("Connection failed: %s", err) + errors["base"] = "cannot_connect" + except PerfectDraftApiError as err: + _LOGGER.error("API error during validation: %s", err) + errors["base"] = "unknown" + else: + await self.async_set_unique_id(self._email.lower()) + self._abort_if_unique_id_configured() - if not self._recaptcha_token: - return self.async_abort(reason="recaptcha_failed") + return self.async_create_entry( + title=f"PerfectDraft ({self._email})", + data={ + CONF_EMAIL: self._email, + CONF_USER_ID: self._user_id, + CONF_ACCESS_TOKEN: client.access_token, + CONF_ID_TOKEN: data.get("IdToken"), + CONF_REFRESH_TOKEN: client.refresh_token, + }, + ) - return self.async_external_step_done(next_step_id="finish") - - async def async_step_finish( - self, user_input: dict[str, Any] | None = None - ) -> config_entries.ConfigFlowResult: - """Step 3: authenticate with the API and create the config entry.""" - session = async_get_clientsession(self.hass) - client = PerfectDraftApiClient(session) - - try: - await client.authenticate( - self._email, self._password, self._recaptcha_token - ) - except AuthenticationError as err: - _LOGGER.error("Authentication failed: %s", err) - return self.async_abort(reason="invalid_auth") - except PerfectDraftConnectionError as err: - _LOGGER.error("Connection failed: %s", err) - return self.async_abort(reason="cannot_connect") - except PerfectDraftApiError as err: - _LOGGER.error("API error during auth: %s", err) - return self.async_abort(reason="unknown") - - try: - profile = await client.get_user_profile() - except (PerfectDraftApiError, PerfectDraftConnectionError): - return self.async_abort(reason="cannot_connect") - - machine_id = _extract_machine_id(profile) - - await self.async_set_unique_id(self._email.lower()) - self._abort_if_unique_id_configured() - - return self.async_create_entry( - title=f"PerfectDraft ({self._email})", - data={ - CONF_EMAIL: self._email, - CONF_ACCESS_TOKEN: client.access_token, - CONF_ID_TOKEN: client._id_token, - CONF_REFRESH_TOKEN: client.refresh_token, - CONF_MACHINE_ID: machine_id, - }, + return self.async_show_form( + step_id="tokens", + data_schema=vol.Schema( + { + vol.Required(CONF_USER_ID): str, + vol.Required(CONF_REFRESH_TOKEN): str, + } + ), + errors=errors, ) async def async_step_reauth( @@ -217,25 +118,50 @@ class PerfectDraftConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): ) -> config_entries.ConfigFlowResult: """Handle re-authentication when the refresh token expires.""" self._email = entry_data.get(CONF_EMAIL) + self._user_id = entry_data.get(CONF_USER_ID) return await self.async_step_reauth_confirm() async def async_step_reauth_confirm( self, user_input: dict[str, Any] | None = None ) -> config_entries.ConfigFlowResult: - """Ask user to re-enter credentials for reauth.""" + """Ask user to re-enter tokens for reauth.""" errors: dict[str, str] = {} if user_input is not None: - self._email = user_input[CONF_EMAIL] - self._password = user_input[CONF_PASSWORD] - return await self.async_step_recaptcha() + user_id = user_input[CONF_USER_ID].strip() + refresh_token = user_input[CONF_REFRESH_TOKEN].strip() + + session = async_get_clientsession(self.hass) + client = PerfectDraftApiClient(session) + + try: + await client.refresh_access_token( + user_id=user_id, + refresh_token=refresh_token, + ) + except (AuthenticationError, PerfectDraftApiError, PerfectDraftConnectionError) as err: + _LOGGER.error("Reauth failed: %s", err) + errors["base"] = "invalid_auth" + else: + self.hass.config_entries.async_update_entry( + self.context["entry"], + data={ + **self.context["entry"].data, + CONF_USER_ID: user_id, + CONF_ACCESS_TOKEN: client.access_token, + CONF_REFRESH_TOKEN: client.refresh_token, + }, + ) + return self.async_abort(reason="reauth_successful") return self.async_show_form( step_id="reauth_confirm", data_schema=vol.Schema( { - vol.Required(CONF_EMAIL, default=self._email): str, - vol.Required(CONF_PASSWORD): str, + vol.Required( + CONF_USER_ID, default=self._user_id or "" + ): str, + vol.Required(CONF_REFRESH_TOKEN): str, } ), errors=errors, @@ -278,26 +204,3 @@ class PerfectDraftOptionsFlow(config_entries.OptionsFlow): } ), ) - - -def _extract_machine_id(profile: dict[str, Any]) -> str | None: - """Best-effort extraction of the first machine ID from the /api/me response. - - The exact shape is unconfirmed; we try several plausible field names. - """ - if "machine_id" in profile: - return profile["machine_id"] - - for key in ("machines", "perfectdraft_machines", "machineIds"): - machines = profile.get(key) - if isinstance(machines, list) and machines: - item = machines[0] - if isinstance(item, dict): - return item.get("id") or item.get("machine_id") or item.get("machineId") - return str(item) - - _LOGGER.warning( - "Could not extract machine_id from profile response: %s", - list(profile.keys()), - ) - return None diff --git a/custom_components/perfectdraft/const.py b/custom_components/perfectdraft/const.py index d1f9a5f..85da09b 100644 --- a/custom_components/perfectdraft/const.py +++ b/custom_components/perfectdraft/const.py @@ -2,8 +2,6 @@ DOMAIN = "perfectdraft" API_BASE_URL = "https://api.perfectdraft.com" API_KEY = "cAyzERqthCJXYVExjNAhr9CzE8ncLN2cQK3WGK10" -RECAPTCHA_SITE_KEY = "6LcZQiUoAAAAAAO3JUjLiT470c-pNXbWyepuvMtV" -RECAPTCHA_ACTION = "Magento/login" DEFAULT_SCAN_INTERVAL = 900 # 15 minutes MIN_SCAN_INTERVAL = 60 # 1 minute @@ -11,6 +9,7 @@ MIN_SCAN_INTERVAL = 60 # 1 minute CONF_REFRESH_TOKEN = "refresh_token" CONF_ACCESS_TOKEN = "access_token" CONF_ID_TOKEN = "id_token" +CONF_USER_ID = "user_id" CONF_MACHINE_ID = "machine_id" CONF_SCAN_INTERVAL = "scan_interval" diff --git a/custom_components/perfectdraft/recaptcha.py b/custom_components/perfectdraft/recaptcha.py deleted file mode 100644 index 8235164..0000000 --- a/custom_components/perfectdraft/recaptcha.py +++ /dev/null @@ -1,85 +0,0 @@ -"""Server-side reCAPTCHA v3 token generation for PerfectDraft. - -Uses the reCAPTCHA anchor/reload HTTP flow to obtain a token without -requiring a browser on an allowed domain. This works because the -PerfectDraft API uses an Android reCAPTCHA key, and the anchor endpoint -does not enforce domain validation the same way the JS widget does. - -If this approach stops working, the fallback is the browser-based -external step flow. -""" -from __future__ import annotations - -import logging -import re - -import aiohttp - -from .const import RECAPTCHA_SITE_KEY - -_LOGGER = logging.getLogger(__name__) - -ANCHOR_URL = ( - "https://www.google.com/recaptcha/api2/anchor" - f"?ar=1&k={RECAPTCHA_SITE_KEY}&co=aHR0cHM6Ly9wZXJmZWN0ZHJhZnQuY29t" - "&hl=en&v=pCoGBhjs9s8EhFOHJFe8BCfw&size=invisible&cb=1" -) - -RELOAD_URL = "https://www.google.com/recaptcha/api2/reload" - -_TOKEN_RE = re.compile(r'"recaptcha-token"\s+value="([^"]+)"') -_RRESP_RE = re.compile(r'"rresp"\s*,\s*"([^"]+)"') - - -async def async_generate_recaptcha_token( - session: aiohttp.ClientSession, -) -> str | None: - """Attempt to generate a reCAPTCHA token server-side. - - Returns the token string, or None if generation fails. - """ - try: - async with session.get(ANCHOR_URL) as resp: - if resp.status != 200: - _LOGGER.debug("Anchor request failed: %s", resp.status) - return None - html = await resp.text() - - match = _TOKEN_RE.search(html) - if not match: - _LOGGER.debug("Could not find recaptcha-token in anchor response") - return None - - anchor_token = match.group(1) - - payload = { - "v": "pCoGBhjs9s8EhFOHJFe8BCfw", - "reason": "q", - "c": anchor_token, - "k": RECAPTCHA_SITE_KEY, - "co": "aHR0cHM6Ly9wZXJmZWN0ZHJhZnQuY29t", - "hl": "en", - "size": "invisible", - } - - async with session.post(RELOAD_URL, data=payload) as resp: - if resp.status != 200: - _LOGGER.debug("Reload request failed: %s", resp.status) - return None - body = await resp.text() - - match = _RRESP_RE.search(body) - if not match: - _LOGGER.debug("Could not find rresp token in reload response") - return None - - token = match.group(1) - _LOGGER.debug("Generated reCAPTCHA token server-side (length=%d)", len(token)) - return token - - except aiohttp.ClientError as exc: - _LOGGER.debug("reCAPTCHA token generation failed: %s", exc) - return None - except Exception: - _LOGGER.exception("Unexpected error generating reCAPTCHA token") - return None diff --git a/custom_components/perfectdraft/static/recaptcha.html b/custom_components/perfectdraft/static/recaptcha.html deleted file mode 100644 index faea6f2..0000000 --- a/custom_components/perfectdraft/static/recaptcha.html +++ /dev/null @@ -1,85 +0,0 @@ - - -
- - -Completing verification…
-- Verification failed. Please check your network connection and try again. -
-