PyViCare 2.60.0__tar.gz → 2.60.2__tar.gz

{pyvicare-2.60.0 → pyvicare-2.60.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyViCare
-Version: 2.60.0
+Version: 2.60.2
 Summary: Library to communicate with the Viessmann ViCare API.
 License: Apache-2.0
 License-File: LICENSE

{pyvicare-2.60.0 → pyvicare-2.60.2}/PyViCare/PyViCare.py

@@ -8,7 +8,7 @@ from PyViCare.PyViCareDeviceConfig import PyViCareDeviceConfig
 from PyViCare.PyViCareOAuthManager import ViCareOAuthManager
 from PyViCare.PyViCareRoomControl import RoomControl
 from PyViCare.PyViCareService import ViCareDeviceAccessor, ViCareService
-from PyViCare.PyViCareUtils import PyViCareInvalidDataError, PyViCareNotSupportedFeatureError
+from PyViCare.PyViCareUtils import PyViCareInvalidDataError
 
 logger = logging.getLogger(__name__)
 logger.addHandler(logging.NullHandler())
@@ -86,7 +86,7 @@ class PyViCare:
             room_control = RoomControl(device_config.service)
             try:
                 actor_map = room_control.buildActorRoomMap()
-            except (KeyError, IndexError, PyViCareNotSupportedFeatureError):
+            except Exception:  # pylint: disable=broad-exception-caught
                 logger.debug("Could not build actor map for %s", device_config.getModel(), exc_info=True)
                 continue
 

{pyvicare-2.60.0 → pyvicare-2.60.2}/PyViCare/PyViCareOAuthManager.py

@@ -1,16 +1,19 @@
 import logging
 import os
 import pickle
+import warnings
 from contextlib import suppress
 from pickle import UnpicklingError
 
 import requests
 from authlib.common.security import generate_token
+from authlib.integrations.base_client.errors import OAuthError
 from authlib.integrations.requests_client import OAuth2Session
 
 from PyViCare.PyViCareAbstractOAuthManager import (
     AUTHORIZE_URL,
     SCOPE_IOT,
+    SCOPE_OFFLINE_ACCESS,
     SCOPE_USER,
     TOKEN_URL,
     AbstractViCareOAuthManager,
@@ -24,6 +27,79 @@ logger.addHandler(logging.NullHandler())
 REDIRECT_URI = "vicare://oauth-callback/everest"
 
 
+def obtain_token_via_basic_auth_pkce(
+    client_id: str, username: str, password: str
+) -> dict[str, object]:
+    """Obtain an OAuth2 token via PKCE auth-code flow with HTTP Basic auth.
+
+    .. deprecated::
+        One-shot migration helper for Home Assistant's password-to-OAuth2
+        migration (see home-assistant/core#165621). Scheduled for removal
+        once the migration window has closed. New code should use the
+        standard OAuth2 auth-code flow.
+
+    Viessmann's authorization endpoint accepts HTTP Basic auth and returns
+    the auth code in the redirect Location header (no browser involved).
+    Useful for one-shot migration from stored username/password to OAuth2,
+    so users don't need to re-authenticate interactively.
+
+    Requests scopes ``IoT`` and ``offline_access`` (sufficient for all
+    PyViCare API endpoints; ``offline_access`` is required to receive a
+    refresh token).
+
+    Returns the token dict (access_token, refresh_token, expires_at, etc.)
+    on success, or an empty dict on any failure (auth server unreachable,
+    credentials rejected, token exchange failed). Failures are logged at
+    WARNING level.
+    """
+    warnings.warn(
+        "obtain_token_via_basic_auth_pkce is a one-shot migration helper "
+        "for Home Assistant's password-to-OAuth2 migration and is scheduled "
+        "for removal. New code should use the standard OAuth2 auth-code flow.",
+        DeprecationWarning,
+        stacklevel=2,
+    )
+    oauth = OAuth2Session(
+        client_id,
+        redirect_uri=REDIRECT_URI,
+        scope=[SCOPE_IOT, SCOPE_OFFLINE_ACCESS],
+        code_challenge_method="S256",
+    )
+    code_verifier = generate_token(48)
+    auth_url, _ = oauth.create_authorization_url(
+        AUTHORIZE_URL, code_verifier=code_verifier
+    )
+
+    try:
+        response = requests.post(
+            auth_url,
+            headers={"Content-Type": "application/x-www-form-urlencoded"},
+            auth=(username, password),
+            allow_redirects=False,
+            timeout=15,
+        )
+    except requests.RequestException:
+        logger.warning("Failed to reach Viessmann auth server")
+        return {}
+
+    if response.status_code != 302 or "Location" not in response.headers:
+        logger.warning("Basic-auth authorization failed")
+        return {}
+
+    try:
+        oauth.fetch_token(
+            TOKEN_URL,
+            authorization_response=response.headers["Location"],
+            code_verifier=code_verifier,
+            timeout=15,
+        )
+    except (requests.RequestException, OAuthError, KeyError, ValueError):
+        logger.warning("Token exchange failed")
+        return {}
+
+    return dict(oauth.token)
+
+
 class ViCareOAuthManager(AbstractViCareOAuthManager):
     def __init__(self, username, password, client_id, token_file):
         self.username = username

{pyvicare-2.60.0 → pyvicare-2.60.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "PyViCare"
-version = "2.60.0"
+version = "2.60.2"
 description = "Library to communicate with the Viessmann ViCare API."
 authors = [
   "Simon Gillet <mail+pyvicare@gillet.ninja>"
@@ -27,6 +27,7 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
   "Programming Language :: Python :: 3",
   "License :: OSI Approved :: Apache Software License",
   "Topic :: Software Development :: Libraries :: Python Modules",