uiprotect 6.6.3__tar.gz → 6.6.4__tar.gz

{uiprotect-6.6.3 → uiprotect-6.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uiprotect
-Version: 6.6.3
+Version: 6.6.4
 Summary: Python API for Unifi Protect (Unofficial)
 Home-page: https://github.com/uilibs/uiprotect
 Author: UI Protect Maintainers

{uiprotect-6.6.3 → uiprotect-6.6.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "uiprotect"
-version = "6.6.3"
+version = "6.6.4"
 description = "Python API for Unifi Protect (Unofficial)"
 authors = ["UI Protect Maintainers <ui@koston.org>"]
 readme = "README.md"

{uiprotect-6.6.3 → uiprotect-6.6.4}/src/uiprotect/data/devices.py

@@ -2014,17 +2014,18 @@ class Camera(ProtectMotionDeviceModel):
         Datetime of screenshot is approximate. It may be +/- a few seconds.
         """
         # Use READ_LIVE if dt is None, otherwise READ_MEDIA
-        permission = (
-            PermissionNode.READ_LIVE if dt is None else PermissionNode.READ_MEDIA
-        )
-        if not self._api.bootstrap.auth_user.can(
-            ModelType.CAMERA,
-            permission,
-            self,
-        ):
-            action = "read live" if dt is None else "read media"
+        auth_user = self._api.bootstrap.auth_user
+        if dt is None:
+            if not (
+                auth_user.can(ModelType.CAMERA, PermissionNode.READ_LIVE, self)
+                or auth_user.can(ModelType.CAMERA, PermissionNode.READ_MEDIA, self)
+            ):
+                raise NotAuthorized(
+                    f"Do not have permission to read live or media for camera: {self.id}"
+                )
+        elif not auth_user.can(ModelType.CAMERA, PermissionNode.READ_MEDIA, self):
             raise NotAuthorized(
-                f"Do not have permission to {action} for camera: {self.id}"
+                f"Do not have permission to read media for camera: {self.id}"
             )
 
         if height is None and width is None and self.high_camera_channel is not None:
@@ -2046,18 +2047,19 @@ class Camera(ProtectMotionDeviceModel):
         if not self.feature_flags.has_package_camera:
             raise BadRequest("Device does not have package camera")
 
+        auth_user = self._api.bootstrap.auth_user
         # Use READ_LIVE if dt is None, otherwise READ_MEDIA
-        permission = (
-            PermissionNode.READ_LIVE if dt is None else PermissionNode.READ_MEDIA
-        )
-        if not self._api.bootstrap.auth_user.can(
-            ModelType.CAMERA,
-            permission,
-            self,
-        ):
-            action = "read live" if dt is None else "read media"
+        if dt is None:
+            if not (
+                auth_user.can(ModelType.CAMERA, PermissionNode.READ_LIVE, self)
+                or auth_user.can(ModelType.CAMERA, PermissionNode.READ_MEDIA, self)
+            ):
+                raise NotAuthorized(
+                    f"Do not have permission to read live or media for camera: {self.id}"
+                )
+        elif not auth_user.can(ModelType.CAMERA, PermissionNode.READ_MEDIA, self):
             raise NotAuthorized(
-                f"Do not have permission to {action} for camera: {self.id}"
+                f"Do not have permission to read media for camera: {self.id}"
             )
 
         if height is None and width is None and self.package_camera_channel is not None: