Merge pull request #821 from sickelap/fix_embedded_media_access

fix embedded media access
LibrePhotos · Apr 15, 2023 · e0202e8 · e0202e8
2 parents 5d84c5a + 54bed47
commit e0202e8
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/api/views/views.py b/api/views/views.py
@@ -381,12 +381,16 @@ def get(self, request, path, fname, format=None):
             except Exception:
                 return HttpResponse(status=404)
         if path.lower() == "embedded_media":
+            jwt = request.COOKIES.get("jwt")
+            query = Q(public=True)
+            if jwt is not None:
+                try:
+                    token = AccessToken(jwt)
+                    user = User.objects.filter(id=token["user_id"]).only("id").first()
+                    query = Q(owner=user)
+                except TokenError:
+                    pass
             try:
-                query = (
-                    Q(owner=request.user)
-                    if request.user.is_authenticated
-                    else Q(public=True)
-                )
                 photo = Photo.objects.filter(query, image_hash=fname).first()
                 if not photo or photo.main_file.embedded_media.count() < 1:
                     raise Photo.DoesNotExist()