self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-14 18:27:44 +02:00
Code Issues Releases Activity

Server: Clean up share logic

Browse Source
This commit is contained in:
Laurent Cozic 2023-02-09 19:42:16 +00:00
parent e1cd8d9b85
commit 107f2e128e
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
packages/server/src/models/ShareModel.ts
View File

@ -199,6 +199,20 @@ export default class ShareModel extends BaseModel<Share> {
const handleCreated = async (change: Change, item: Item, share: Share) => {
if (!item.jop_share_id) return;
// When a folder is unshared, the share object is deleted, then all
// items that were shared get their 'share_id' property set to an
// empty string. This is all done client side.
//
// However it means that if a share object is deleted but the items
// are not synced, we'll find items that are associated with a share
// that no longer exists. This is fine, but we need to handle it
// properly below, otherwise the share update process will fail.
if (!share) {
logger.warn(`Found an item (${item.id}) associated with a share that no longer exists (${item.jop_share_id}) - skipping it`);
return;
}
const shareUserIds = await this.allShareUserIds(share);
for (const shareUserId of shareUserIds) {
if (shareUserId === change.user_id) continue;
@ -301,25 +315,10 @@ export default class ShareModel extends BaseModel<Share> {
// Item associated with the change may have been
// deleted, so take this into account.
if (item) {
// When a folder is unshared, the share object is
// deleted, then all items that were shared get their
// 'share_id' property set to an empty string. This is
// all done client side.
//
// However it means that if a share object is deleted
// but the items are not synced, we'll find items that
// are associated with a share that no longer exists.
// This is fine, but we need to handle it properly
// below, otherwise the share update process will fail.
const itemShare = shares.find(s => s.id === item.jop_share_id);
if (change.type === ChangeType.Create) {
if (!itemShare) {
logger.warn(`Found an item (${item.id}) associated with a share that no longer exists (${item.jop_share_id}) - skipping it`);
} else {
await handleCreated(change, item, itemShare);
}
await handleCreated(change, item, itemShare);
}
if (change.type === ChangeType.Update) {