coop-cloud-chaos-patchs/outline
coop-cloud-chaos-patchs
/
outline
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: Incorrect policy returned for parent share

This commit is contained in:
Tom Moor 2021-11-07 15:44:37 -08:00
parent dcec3dd4ec
commit 7bc7d7cd6b
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/policies/share.js
View File

@ -12,7 +12,7 @@ allow(User, "read", Share, (user, share) => {
allow(User, "update", Share, (user, share) => { allow(User, "update", Share, (user, share) => {
if (user.isViewer) return false; if (user.isViewer) return false;
// only the user who can share the document publicaly can update the share. // only the user who can share the document publicly can update the share.
if (cannot(user, "share", share.document)) return false; if (cannot(user, "share", share.document)) return false;
return user.teamId === share.teamId; return user.teamId === share.teamId;
}); });

4
server/routes/api/shares.js
View File

@ -62,7 +62,9 @@ router.post("shares.info", auth(), async (ctx) => {
const parentIds = document?.collection?.getDocumentParents(documentId); const parentIds = document?.collection?.getDocumentParents(documentId);
const parentShare = parentIds const parentShare = parentIds
? await Share.findOne({ ? await Share.scope({
method: ["withCollection", user.id],
}).findOne({
where: { where: {
documentId: parentIds, documentId: parentIds,
teamId: user.teamId, teamId: user.teamId,

2
server/routes/api/shares.test.js
View File

@ -424,6 +424,8 @@ describe("#shares.info", () => {
expect(body.data.shares[0].documentId).toBe(document.id); expect(body.data.shares[0].documentId).toBe(document.id);
expect(body.data.shares[0].published).toBe(true); expect(body.data.shares[0].published).toBe(true);
expect(body.data.shares[0].includeChildDocuments).toBe(true); expect(body.data.shares[0].includeChildDocuments).toBe(true);
expect(body.policies.length).toBe(1);
expect(body.policies[0].abilities.update).toBe(true);
}); });
it("should not return share for parent document with includeChildDocuments=false", async () => { it("should not return share for parent document with includeChildDocuments=false", async () => {