From 5de2f969e3afd1139131d08e192430efdae68a66 Mon Sep 17 00:00:00 2001
From: Tom Moor <tom.moor@gmail.com>
Date: Mon, 7 Sep 2020 12:17:04 -0700
Subject: [PATCH] fix: Preload membership

---
 server/api/documents.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/server/api/documents.js b/server/api/documents.js
index 3a99c01d8..208193773 100644
--- a/server/api/documents.js
+++ b/server/api/documents.js
@@ -457,7 +457,9 @@ router.post("documents.restore", auth(), async (ctx) => {
     ctx.assertUuid(collectionId, "collectionId must be a uuid");
     authorize(user, "restore", document);
 
-    const collection = await Collection.findByPk(collectionId);
+    const collection = await Collection.scope({
+      method: ["withMembership", user.id],
+    }).findByPk(collectionId);
     authorize(user, "update", collection);
 
     document.collectionId = collectionId;
@@ -948,7 +950,9 @@ router.post("documents.move", auth(), async (ctx) => {
   const document = await Document.findByPk(id, { userId: user.id });
   authorize(user, "move", document);
 
-  const collection = await Collection.findByPk(collectionId);
+  const collection = await Collection.scope({
+    method: ["withMembership", user.id],
+  }).findByPk(collectionId);
   authorize(user, "update", collection);
 
   if (parentDocumentId) {