uiprotect 0.4.0__py3-none-any.whl → 0.5.0__py3-none-any.whl

uiprotect/api.py

@@ -161,6 +161,7 @@ class BaseApiClient:
     _last_token_cookie_decode: dict[str, Any] | None = None
     _session: aiohttp.ClientSession | None = None
     _loaded_session: bool = False
+    _cookiename = "TOKEN"
 
     headers: dict[str, str] | None = None
     _websocket: Websocket | None = None
@@ -204,6 +205,10 @@ class BaseApiClient:
 
         self._update_url()
 
+    def _update_cookiename(self, cookie: SimpleCookie) -> None:
+        if "UOS_TOKEN" in cookie:
+            self._cookiename = "UOS_TOKEN"
+
     def _update_url(self) -> None:
         """Updates the url after changing _host or _port."""
         if self._port != 443:
@@ -475,7 +480,6 @@ class BaseApiClient:
             response = await self.request("post", url=url, json=auth)
             self.set_header("cookie", response.headers.get("set-cookie", ""))
             self._is_authenticated = True
-            await self._update_last_token_cookie(response)
             _LOGGER.debug("Authenticated successfully!")
 
     async def _update_last_token_cookie(self, response: aiohttp.ClientResponse) -> None:
@@ -488,9 +492,10 @@ class BaseApiClient:
         ):
             self.set_header("x-csrf-token", csrf_token)
             await self._update_last_token_cookie(response)
+            self._update_cookiename(response.cookies)
 
         if (
-            token_cookie := response.cookies.get("TOKEN")
+            token_cookie := response.cookies.get(self._cookiename)
         ) and token_cookie != self._last_token_cookie:
             self._last_token_cookie = token_cookie
             if self.store_sessions:
@@ -520,6 +525,7 @@ class BaseApiClient:
         config["sessions"] = config.get("sessions", {})
         config["sessions"][session_hash] = {
             "metadata": dict(cookie),
+            "cookiename": self._cookiename,
             "value": cookie.value,
             "csrf": self.headers.get("x-csrf-token") if self.headers else None,
         }
@@ -561,12 +567,15 @@ class BaseApiClient:
             return None
 
         cookie = SimpleCookie()
-        cookie["TOKEN"] = session.get("value")
+        cookie_name = session.get("cookiename")
+        if cookie_name is None:
+            return None
+        cookie[cookie_name] = session.get("value")
         for key, value in session.get("metadata", {}).items():
-            cookie["TOKEN"][key] = value
+            cookie[cookie_name][key] = value
 
-        cookie_value = _COOKIE_RE.sub("", str(cookie["TOKEN"]))
-        self._last_token_cookie = cookie["TOKEN"]
+        cookie_value = _COOKIE_RE.sub("", str(cookie[cookie_name]))
+        self._last_token_cookie = cookie[cookie_name]
         self._last_token_cookie_decode = None
         self._is_authenticated = True
         self.set_header("cookie", cookie_value)

uiprotect/utils.py

@@ -234,11 +234,11 @@ def convert_unifi_data(value: Any, field: ModelField) -> Any:
                 return value
         if type_ == datetime:
             return from_js_time(value)
-        if type_ in _CREATE_TYPES or (isclass(type_) and issubclass(type_, Enum)):
+        if type_ in _CREATE_TYPES or _is_enum_type(type_):
             # cannot do this check too soon because some types cannot be used in isinstance
             if isinstance(value, type_):
                 return value
-            # handle edge case for improperly formated UUIDs
+            # handle edge case for improperly formatted UUIDs
             # 00000000-0000-00 0- 000-000000000000
             if type_ == UUID and value == _BAD_UUID:
                 value = "0" * 32
@@ -247,6 +247,12 @@ def convert_unifi_data(value: Any, field: ModelField) -> Any:
     return value
 
 
+@lru_cache
+def _is_enum_type(type_: Any) -> bool:
+    """Checks if type is an Enum."""
+    return isclass(type_) and issubclass(type_, Enum)
+
+
 def serialize_unifi_obj(value: Any, levels: int = -1) -> Any:
     """Serializes UFP data"""
     if unifi_dict := getattr(value, "unifi_dict", None):

{uiprotect-0.4.0.dist-info → uiprotect-0.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uiprotect
-Version: 0.4.0
+Version: 0.5.0
 Summary: Python API for Unifi Protect (Unofficial)
 Home-page: https://github.com/uilibs/uiprotect
 License: MIT

{uiprotect-0.4.0.dist-info → uiprotect-0.5.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 uiprotect/__init__.py,sha256=tzcxK6cOIIkFEtST4Zjq3bafYTFWtwnaL92DgypjFi8,307
 uiprotect/__main__.py,sha256=T69KE5W4zek6qeNEL8_Fq2DEfBc04SqSuIOJpiW4ydE,471
-uiprotect/api.py,sha256=7ET5UEpi5djVXGmbRLGpz2ww8-DuT1f_zFubmiR2Ovw,65670
+uiprotect/api.py,sha256=G2cvwLuanzvZ7dGfJOlAMvbKSBIsb7t3uOPB-KyT8gk,66006
 uiprotect/cli/__init__.py,sha256=tmwtYrhM8rjOw8noKD6NALl_2Nu3xIycDuQyEKD5oMk,8832
 uiprotect/cli/backup.py,sha256=Mtjd2f0w7zjIeLkJILKxiBnZJYXypzC9gpyAmBZ8sq0,36746
 uiprotect/cli/base.py,sha256=dE6vYb4nLAYbUdHwcKkN7I3iXqTjz84jfHGnsLmk_Ds,7762
@@ -28,10 +28,10 @@ uiprotect/release_cache.json,sha256=NamnSFy78hOWY0DPO87J9ELFCAN6NnVquv8gQO75ZG4,
 uiprotect/stream.py,sha256=V4aJfVWpSUsWE1PQrXH8F7obQQi1ukPAZ7PzwABjt0I,4942
 uiprotect/test_util/__init__.py,sha256=sSEXu6_pwdYNQSCYtftpX1Dy1S8XYOvhrpECYRxeKJE,18596
 uiprotect/test_util/anonymize.py,sha256=AGYELhDC4BrdK0deI6zh5jFp3SuM_HvAWLeoxFHSiwg,8486
-uiprotect/utils.py,sha256=xP8t0wEBIGS___LUYRNnQuXvUbjKDbsOnnSwWDzphSw,18124
+uiprotect/utils.py,sha256=1HB-rtzdTxsRzEY_vnzdJZOzyruci7lOkQDfr8D1L_8,18244
 uiprotect/websocket.py,sha256=iMTdchymaCgVHsmY1bRbxkcymqt6WQircIHYNxCu178,7289
-uiprotect-0.4.0.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
-uiprotect-0.4.0.dist-info/METADATA,sha256=1NRqhJzgvOha1OGPOpbp46MUiKzd4KxZs94IP2nH4GA,10984
-uiprotect-0.4.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uiprotect-0.4.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
-uiprotect-0.4.0.dist-info/RECORD,,
+uiprotect-0.5.0.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
+uiprotect-0.5.0.dist-info/METADATA,sha256=lofryisrm6u9ASPQ0r77MqHKRqWNUE1XkAzuUrlBBYI,10984
+uiprotect-0.5.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uiprotect-0.5.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
+uiprotect-0.5.0.dist-info/RECORD,,