self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-26 22:41:17 +02:00
Code Issues Releases Activity

Desktop,Mobile: Sync: Fix share not marked as readonly if the recipient has an outgoing share (#11770)

Browse Source
This commit is contained in:
Henry Heino
2025-02-06 09:55:54 -08:00
committed by GitHub
parent a8210225a0
commit a16a66c37b
3 changed files with 78 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
packages/lib/models/utils/readOnly.test.ts
View File

@@ -10,8 +10,7 @@ import { setupDatabaseAndSynchronizer, simulateReadOnlyShareEnv, switchClient, t
import BaseItem from '../BaseItem';
const checkReadOnly = (itemType: ModelType, item: ItemSlice, shareData: ShareState = defaultShareState) => {
const syncUserId = '';
const checkReadOnly = (itemType: ModelType, item: ItemSlice, shareData: ShareState = defaultShareState, syncUserId = '') => {
return itemIsReadOnlySync(itemType, ItemChange.SOURCE_UNSPECIFIED, item, syncUserId, shareData);
};
@@ -22,6 +21,21 @@ const createTestResource = async () => {
await shim.attachFileToNote(note1, tempFile);
};
const makeOwnerOfShare = (shareId: string, syncUserId: string) => {
BaseItem.syncShareCache.shares = BaseItem.syncShareCache.shares.map(share => {
if (share.id === shareId) {
return {
...share,
user: {
id: syncUserId,
email: 'test@example.com',
},
};
}
return share;
});
};
describe('readOnly', () => {
beforeEach(async () => {
await setupDatabaseAndSynchronizer(1);
@@ -64,4 +78,22 @@ describe('readOnly', () => {
expect(checkReadOnly(ModelType.Resource, resource, BaseItem.syncShareCache)).toBe(true);
cleanup();
});
test('should support checking that items are read-only when there are multiple shares', async () => {
const shareId1 = '123456';
const shareId2 = '234567';
const note = await Note.save({ body: 'test', share_id: shareId1 });
const syncUserId = 'test-user-id';
const cleanup = simulateReadOnlyShareEnv([shareId1, shareId2]);
// If the owner of a different share, should be read-only
makeOwnerOfShare(shareId2, syncUserId);
expect(checkReadOnly(ModelType.Note, note as ItemSlice, BaseItem.syncShareCache, syncUserId)).toBe(true);
// If also the owner of the same share, it should not be read-only
makeOwnerOfShare(shareId1, syncUserId);
expect(checkReadOnly(ModelType.Note, note as ItemSlice, BaseItem.syncShareCache, syncUserId)).toBe(false);
cleanup();
});
});

3
packages/lib/models/utils/readOnly.ts
View File

@@ -92,7 +92,8 @@ export const itemIsReadOnlySync = (itemType: ModelType, changeSource: number, it
if (!item.share_id) return false;
// Item belongs to the user
if (shareState.shares.find(s => s.user.id === userId)) return false;
const parentShare = shareState.shares.find(s => s.id === item.share_id);
if (parentShare && parentShare.user?.id === userId) return false;
const shareUser = shareState.shareInvitations.find(si => si.share.id === item.share_id);