myPyllant 0.4.2__tar.gz → 0.4.3__tar.gz

{mypyllant-0.4.2 → mypyllant-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: myPyllant
-Version: 0.4.2
+Version: 0.4.3
 Summary: A Python library to interact with the API behind the myVAILLANT app
 Project-URL: Homepage, https://github.com/signalkraft/myPyllant
 Project-URL: Bug Tracker, https://github.com/signalkraft/myPyllant/issues

{mypyllant-0.4.2 → mypyllant-0.4.3}/src/myPyllant/api.py

@@ -84,13 +84,15 @@ class MyPyllantAPI:
             raise ValueError(
                 f"Invalid brand, must be one of {', '.join(BRANDS.keys())}"
             )
-        if country and country not in COUNTRIES[brand].keys():
-            raise RealmInvalid(
-                f"Invalid country, {BRANDS[brand]} only supports {', '.join(COUNTRIES[brand].keys())}"
-            )
-        if not country and brand in COUNTRIES and COUNTRIES[brand]:
-            # If a brand has countries defined, a country needs to be provided
-            raise RealmInvalid(f"{BRANDS[brand]} requires country to be passed")
+        if brand in COUNTRIES:
+            # Only need to valid country, if the brand exists as a key in COUNTRIES
+            if not country:
+                raise RealmInvalid(f"{BRANDS[brand]} requires country to be passed")
+            elif country not in COUNTRIES[brand].keys():
+                raise RealmInvalid(
+                    f"Invalid country, {BRANDS[brand]} only supports {', '.join(COUNTRIES[brand].keys())}"
+                )
+
         self.username = username
         self.password = password
         self.country = country

{mypyllant-0.4.2 → mypyllant-0.4.3}/src/myPyllant/tests/test_api.py

@@ -4,7 +4,7 @@ from datetime import datetime, timedelta, tzinfo
 import pytest
 from freezegun import freeze_time
 
-from myPyllant.api import MyPyllantAPI
+from myPyllant.api import MyPyllantAPI, RealmInvalid
 from myPyllant.models import (
     Device,
     DeviceData,
@@ -29,7 +29,7 @@ def get_test_data():
     return test_data
 
 
-async def test_login(mypyllant_aioresponses) -> None:
+async def test_login_vaillant(mypyllant_aioresponses) -> None:
     with mypyllant_aioresponses() as _:
         async with MyPyllantAPI(
             "test@example.com", "test", "vaillant", "germany"
@@ -40,6 +40,27 @@ async def test_login(mypyllant_aioresponses) -> None:
             assert "Authorization" in mocked_api.get_authorized_headers()
 
 
+async def test_login_bulex(mypyllant_aioresponses) -> None:
+    with mypyllant_aioresponses() as _:
+        async with MyPyllantAPI(
+            "test@example.com", "test", "bulex", None
+        ) as mocked_api:
+            assert isinstance(mocked_api.oauth_session_expires, datetime)
+            assert mocked_api.oauth_session_expires > datetime.now()
+            assert mocked_api.access_token == "access_token"
+            assert "Authorization" in mocked_api.get_authorized_headers()
+
+
+async def test_login_invalid_country(mypyllant_aioresponses) -> None:
+    with pytest.raises(RealmInvalid):
+        MyPyllantAPI("test@example.com", "test", "sdbg", "germany")
+
+
+async def test_login_country_missing(mypyllant_aioresponses) -> None:
+    with pytest.raises(RealmInvalid):
+        MyPyllantAPI("test@example.com", "test", "sdbg")
+
+
 async def test_refresh_token(mypyllant_aioresponses, mocked_api) -> None:
     with mypyllant_aioresponses() as _:
         with freeze_time(datetime.now() + timedelta(hours=1)):

{mypyllant-0.4.2 → mypyllant-0.4.3}/src/myPyllant/tests/utils.py

@@ -18,11 +18,17 @@ def _mypyllant_aioresponses():
 
             # auth endpoints
             self.get(
-                re.compile(r".*openid-connect/auth\?"),
+                re.compile(r".*vaillant-germany-b2c/protocol/openid-connect/auth\?"),
                 body=f"{LOGIN_URL.format(realm=get_realm('vaillant', 'germany'))}?test=test",
                 status=200,
                 repeat=True,
             )
+            self.get(
+                re.compile(r".*bulex-b2c/protocol/openid-connect/auth\?"),
+                body=f"{LOGIN_URL.format(realm=get_realm('bulex'))}?test=test",
+                status=200,
+                repeat=True,
+            )
             self.post(
                 re.compile(r".*login-actions/authenticate\?"),
                 status=200,

{mypyllant-0.4.2 → mypyllant-0.4.3}/src/myPyllant/utils.py

@@ -60,12 +60,14 @@ def datetime_parse(date_string: str) -> datetime:
     return datetime.strptime(date_string, "%Y-%m-%dT%H:%M:%SZ")
 
 
-def get_realm(brand: str, country: str) -> str:
+def get_realm(brand: str, country: str | None = None) -> str:
     """
     Vaillant and SDBG use `brand-country-b2c` as the realm, Bulex doesn't use a country
     """
     if brand == "bulex":
         return f"{brand}-b2c"
+    elif not country:
+        return f"{brand}-b2c"
     else:
         return f"{brand}-{country}-b2c"