diff --git a/apps/files_sharing/src/files_actions/acceptShareAction.spec.ts b/apps/files_sharing/src/files_actions/acceptShareAction.spec.ts index f2e40c220f2..9598db7f543 100644 --- a/apps/files_sharing/src/files_actions/acceptShareAction.spec.ts +++ b/apps/files_sharing/src/files_actions/acceptShareAction.spec.ts @@ -144,13 +144,12 @@ describe('Accept share action execute tests', () => { vi.spyOn(eventBus, 'emit') const file = new File({ - id: 1, + id: 123, source: 'https://cloud.domain.com/remote.php/dav/files/admin/foobar.txt', owner: 'admin', mime: 'text/plain', permissions: Permission.READ, attributes: { - id: 123, share_type: ShareType.User, }, root: '/files/admin', @@ -176,13 +175,12 @@ describe('Accept share action execute tests', () => { vi.spyOn(eventBus, 'emit') const file = new File({ - id: 1, + id: 123, source: 'https://cloud.domain.com/remote.php/dav/files/admin/foobar.txt', owner: 'admin', mime: 'text/plain', permissions: Permission.READ, attributes: { - id: 123, remote: 3, share_type: ShareType.User, }, @@ -209,26 +207,24 @@ describe('Accept share action execute tests', () => { vi.spyOn(eventBus, 'emit') const file1 = new File({ - id: 1, + id: 123, source: 'https://cloud.domain.com/remote.php/dav/files/admin/foo.txt', owner: 'admin', mime: 'text/plain', permissions: Permission.READ, attributes: { - id: 123, share_type: ShareType.User, }, root: '/files/admin', }) const file2 = new File({ - id: 2, + id: 456, source: 'https://cloud.domain.com/remote.php/dav/files/admin/bar.txt', owner: 'admin', mime: 'text/plain', permissions: Permission.READ, attributes: { - id: 456, share_type: ShareType.User, }, root: '/files/admin', @@ -257,13 +253,12 @@ describe('Accept share action execute tests', () => { }) const file = new File({ - id: 1, + id: 123, source: 'https://cloud.domain.com/remote.php/dav/files/admin/foobar.txt', owner: 'admin', mime: 'text/plain', permissions: Permission.READ, attributes: { - id: 123, share_type: ShareType.User, }, root: '/files/admin', diff --git a/apps/files_sharing/src/files_actions/acceptShareAction.ts b/apps/files_sharing/src/files_actions/acceptShareAction.ts index 3822d17bb1d..a9ddb18a9be 100644 --- a/apps/files_sharing/src/files_actions/acceptShareAction.ts +++ b/apps/files_sharing/src/files_actions/acceptShareAction.ts @@ -25,7 +25,7 @@ export const action: IFileAction = { const isRemote = !!node.attributes.remote const url = generateOcsUrl('apps/files_sharing/api/v1/{shareBase}/pending/{id}', { shareBase: isRemote ? 'remote_shares' : 'shares', - id: node.attributes.id, + id: node.id, }) await axios.post(url) diff --git a/apps/files_sharing/src/files_actions/rejectShareAction.spec.ts b/apps/files_sharing/src/files_actions/rejectShareAction.spec.ts index a4daf78a654..638b088ee13 100644 --- a/apps/files_sharing/src/files_actions/rejectShareAction.spec.ts +++ b/apps/files_sharing/src/files_actions/rejectShareAction.spec.ts @@ -188,13 +188,12 @@ describe('Reject share action execute tests', () => { vi.spyOn(eventBus, 'emit') const file = new File({ - id: 1, + id: '123', source: 'https://cloud.domain.com/remote.php/dav/files/admin/foobar.txt', owner: 'admin', mime: 'text/plain', permissions: Permission.READ, attributes: { - id: 123, share_type: ShareType.User, }, root: '/files/admin', @@ -220,13 +219,12 @@ describe('Reject share action execute tests', () => { vi.spyOn(eventBus, 'emit') const file = new File({ - id: 1, + id: '123', source: 'https://cloud.domain.com/remote.php/dav/files/admin/foobar.txt', owner: 'admin', mime: 'text/plain', permissions: Permission.READ, attributes: { - id: 123, remote: 3, share_type: ShareType.User, }, @@ -253,26 +251,24 @@ describe('Reject share action execute tests', () => { vi.spyOn(eventBus, 'emit') const file1 = new File({ - id: 1, + id: '123', source: 'https://cloud.domain.com/remote.php/dav/files/admin/foo.txt', owner: 'admin', mime: 'text/plain', permissions: Permission.READ, attributes: { - id: 123, share_type: ShareType.User, }, root: '/files/admin', }) const file2 = new File({ - id: 2, + id: '456', source: 'https://cloud.domain.com/remote.php/dav/files/admin/bar.txt', owner: 'admin', mime: 'text/plain', permissions: Permission.READ, attributes: { - id: 456, share_type: ShareType.User, }, root: '/files/admin', @@ -301,13 +297,12 @@ describe('Reject share action execute tests', () => { }) const file = new File({ - id: 1, + id: 123, source: 'https://cloud.domain.com/remote.php/dav/files/admin/foobar.txt', owner: 'admin', mime: 'text/plain', permissions: Permission.READ, attributes: { - id: 123, share_type: ShareType.User, }, root: '/files/admin', diff --git a/apps/files_sharing/src/files_actions/rejectShareAction.ts b/apps/files_sharing/src/files_actions/rejectShareAction.ts index 40a02076d34..62cfb559482 100644 --- a/apps/files_sharing/src/files_actions/rejectShareAction.ts +++ b/apps/files_sharing/src/files_actions/rejectShareAction.ts @@ -42,7 +42,7 @@ export const action: IFileAction = { const node = nodes[0] const isRemote = !!node.attributes.remote const shareBase = isRemote ? 'remote_shares' : 'shares' - const id = node.attributes.id + const id = node.id let url: string if (node.attributes.accepted === 0) { url = generateOcsUrl('apps/files_sharing/api/v1/{shareBase}/pending/{id}', { diff --git a/apps/files_sharing/src/files_actions/restoreShareAction.spec.ts b/apps/files_sharing/src/files_actions/restoreShareAction.spec.ts index 01dcbc5d8d6..959eeb0ac28 100644 --- a/apps/files_sharing/src/files_actions/restoreShareAction.spec.ts +++ b/apps/files_sharing/src/files_actions/restoreShareAction.spec.ts @@ -145,13 +145,12 @@ describe('Restore share action execute tests', () => { vi.spyOn(eventBus, 'emit') const file = new File({ - id: 1, + id: '123', source: 'https://cloud.domain.com/remote.php/dav/files/admin/foobar.txt', owner: 'admin', mime: 'text/plain', permissions: Permission.READ, attributes: { - id: 123, share_type: ShareType.User, }, root: '/files/admin', @@ -177,26 +176,24 @@ describe('Restore share action execute tests', () => { vi.spyOn(eventBus, 'emit') const file1 = new File({ - id: 1, + id: '123', source: 'https://cloud.domain.com/remote.php/dav/files/admin/foo.txt', owner: 'admin', mime: 'text/plain', permissions: Permission.READ, attributes: { - id: 123, share_type: ShareType.User, }, root: '/files/admin', }) const file2 = new File({ - id: 2, + id: '456', source: 'https://cloud.domain.com/remote.php/dav/files/admin/bar.txt', owner: 'admin', mime: 'text/plain', permissions: Permission.READ, attributes: { - id: 456, share_type: ShareType.User, }, root: '/files/admin', @@ -224,13 +221,12 @@ describe('Restore share action execute tests', () => { .mockImplementation(() => { throw new Error('Mock error') }) const file = new File({ - id: 1, + id: '123', source: 'https://cloud.domain.com/remote.php/dav/files/admin/foobar.txt', owner: 'admin', mime: 'text/plain', permissions: Permission.READ, attributes: { - id: 123, share_type: ShareType.User, }, root: '/files/admin', diff --git a/apps/files_sharing/src/files_actions/restoreShareAction.ts b/apps/files_sharing/src/files_actions/restoreShareAction.ts index cbf3f1e41cb..2edb65e27a4 100644 --- a/apps/files_sharing/src/files_actions/restoreShareAction.ts +++ b/apps/files_sharing/src/files_actions/restoreShareAction.ts @@ -24,7 +24,7 @@ export const action: IFileAction = { try { const node = nodes[0] const url = generateOcsUrl('apps/files_sharing/api/v1/deletedshares/{id}', { - id: node.attributes.id, + id: node.id, }) await axios.post(url)