fix: Policies on archived documents disallow unarchive (#6862)

2024-05-01 21:02:01 -04:00
parent 3298a1cd7d
commit 8dc530a50f
4 changed files with 35 additions and 15 deletions
--- a/server/policies/document.ts
+++ b/server/policies/document.ts
@@ -147,7 +147,7 @@ allow(User, "pinToHome", Document, (actor, document) =>
    isTeamMutable(actor),
    !document?.isDraft,
    !document?.template,
-    !document?.isDeleted
+    !!document?.isActive
  )
 );

@@ -157,7 +157,11 @@ allow(User, "delete", Document, (actor, document) =>
    isTeamMutable(actor),
    !actor.isGuest,
    !document?.isDeleted,
-    or(can(actor, "update", document), !document?.collection)
+    or(
+      can(actor, "unarchive", document),
+      can(actor, "update", document),
+      !document?.collection
+    )
  )
 );