diff --git a/package-lock.json b/package-lock.json index 1d301e3c..99b3ed51 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1197,9 +1197,9 @@ }, "dependencies": { "tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", + "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" } } }, @@ -1356,9 +1356,9 @@ } }, "box-node-sdk": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/box-node-sdk/-/box-node-sdk-2.7.1.tgz", - "integrity": "sha512-pU2RNm4Kb20+InHccbgTZPoNBaRZ81QLGtaHVNHjD/Vdop2wTUI6djv2Xma4D+zgX+pL7tbPpP1TVwhcWLIX/g==", + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/box-node-sdk/-/box-node-sdk-2.7.2.tgz", + "integrity": "sha512-OxIGk3PDmW6p1skEZR2lJXzalGotfb8+BUJ2faQzhyvlX+wLxct1ffjFH8y43ffhi0BK0+HbjYMUJssbyAiyAg==", "requires": { "@types/bluebird": "^3.5.35", "@types/node": "^15.3.1", diff --git a/package.json b/package.json index d8737592..aa4de002 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "@oclif/plugin-help": "^2.2.1", "@oclif/plugin-not-found": "^1.2.0", "archiver": "^3.0.0", - "box-node-sdk": "^2.7.1", + "box-node-sdk": "^2.7.2", "chalk": "^2.4.1", "cli-progress": "^2.1.0", "csv": "^3.1.0", diff --git a/src/commands/files/share.js b/src/commands/files/share.js index 6ed93944..d4b35b76 100644 --- a/src/commands/files/share.js +++ b/src/commands/files/share.js @@ -16,7 +16,7 @@ class FilesShareCommand extends BoxCommand { let sharedLinksModule = new SharedLinksModule(this.client); let updatedItem = await sharedLinksModule.createSharedLink(args, flags); - await this.output(updatedItem.shared_link); + await this.output(updatedItem); } } diff --git a/src/commands/folders/share.js b/src/commands/folders/share.js index 9e5f7e37..0270c06d 100644 --- a/src/commands/folders/share.js +++ b/src/commands/folders/share.js @@ -16,7 +16,7 @@ class FoldersShareCommand extends BoxCommand { let sharedLinksModule = new SharedLinksModule(this.client); let updatedItem = await sharedLinksModule.createSharedLink(args, flags); - await this.output(updatedItem.shared_link); + await this.output(updatedItem); } } diff --git a/src/commands/shared-links/create.js b/src/commands/shared-links/create.js index 5da27393..3fc1b3bb 100644 --- a/src/commands/shared-links/create.js +++ b/src/commands/shared-links/create.js @@ -7,10 +7,10 @@ const SharedLinksModule = require('../../modules/shared-links'); class SharedLinksCreateCommand extends BoxCommand { async run() { const { flags, args } = this.parse(SharedLinksCreateCommand); - + let sharedLinksModule = new SharedLinksModule(this.client); let updatedItem = await sharedLinksModule.createSharedLink(args, flags); - await this.output(updatedItem.shared_link); + await this.output(updatedItem); } } diff --git a/src/modules/shared-links.js b/src/modules/shared-links.js index 2b61e567..5784bd38 100644 --- a/src/modules/shared-links.js +++ b/src/modules/shared-links.js @@ -22,7 +22,7 @@ class SharedLinksModule { * @returns {Promise} A promise resolving to the updated item object */ createSharedLink(args, flags) { - let updates = { shared_link: { permissions: {} } }; + let updates = { shared_link: { permissions: {} }, fields: 'shared_link' }; if (flags.access) { updates.shared_link.access = flags.access; diff --git a/test/commands/files.test.js b/test/commands/files.test.js index b2b7f336..f7473b49 100644 --- a/test/commands/files.test.js +++ b/test/commands/files.test.js @@ -1120,7 +1120,7 @@ describe('Files', () => { test .nock(TEST_API_ROOT, api => api - .put(`/2.0/files/${fileId}`, sharedLinkBody) + .put(`/2.0/files/${fileId}?fields=shared_link`, sharedLinkBody) .reply(200, createSharedLinkFixture) ) .stdout() @@ -1140,7 +1140,7 @@ describe('Files', () => { test .nock(TEST_API_ROOT, api => api - .put(`/2.0/files/${fileId}`, sharedLinkBody) + .put(`/2.0/files/${fileId}?fields=shared_link`, sharedLinkBody) .reply(200, createSharedLinkFixture) ) .stdout() @@ -1159,7 +1159,7 @@ describe('Files', () => { test .nock(TEST_API_ROOT, api => api - .put(`/2.0/files/${fileId}`, { + .put(`/2.0/files/${fileId}?fields=shared_link`, { shared_link: { permissions: {}, unshared_at: unsharedDate, @@ -1181,7 +1181,7 @@ describe('Files', () => { test .nock(TEST_API_ROOT, api => api - .put(`/2.0/files/${fileId}`, { + .put(`/2.0/files/${fileId}?fields=shared_link`, { shared_link: { permissions: {}, unshared_at: unsharedDate, diff --git a/test/commands/folders.test.js b/test/commands/folders.test.js index 91ce6a8c..2450a20e 100644 --- a/test/commands/folders.test.js +++ b/test/commands/folders.test.js @@ -908,7 +908,7 @@ describe('Folders', () => { test .nock(TEST_API_ROOT, api => api - .put(`/2.0/folders/${folderId}`, sharedLinkBody) + .put(`/2.0/folders/${folderId}?fields=shared_link`, sharedLinkBody) .reply(200, createSharedLinkFixture) ) .stdout() @@ -927,7 +927,7 @@ describe('Folders', () => { test .nock(TEST_API_ROOT, api => api - .put(`/2.0/folders/${folderId}`, sharedLinkBody) + .put(`/2.0/folders/${folderId}?fields=shared_link`, sharedLinkBody) .reply(200, createSharedLinkFixture) ) .stdout() @@ -945,7 +945,7 @@ describe('Folders', () => { test .nock(TEST_API_ROOT, api => api - .put(`/2.0/folders/${folderId}`, { + .put(`/2.0/folders/${folderId}?fields=shared_link`, { shared_link: { permissions: {}, unshared_at: unshareDate, diff --git a/test/commands/shared-links.test.js b/test/commands/shared-links.test.js index 86f90b18..a9c0b9ce 100644 --- a/test/commands/shared-links.test.js +++ b/test/commands/shared-links.test.js @@ -65,7 +65,7 @@ describe('Shared-Links', () => { test .nock(TEST_API_ROOT, (api) => api - .put(`/2.0/files/${fileId}`, fileSharedLinkBody) + .put(`/2.0/files/${fileId}?fields=shared_link`, fileSharedLinkBody) .reply(200, createFileSharedLinkFixture) ) .stdout() @@ -84,7 +84,7 @@ describe('Shared-Links', () => { test .nock(TEST_API_ROOT, (api) => api - .put(`/2.0/files/${fileId}`, fileSharedLinkBody) + .put(`/2.0/files/${fileId}?fields=shared_link`, fileSharedLinkBody) .reply(200, createFileSharedLinkFixture) ) .stdout() @@ -117,7 +117,7 @@ describe('Shared-Links', () => { test .nock(TEST_API_ROOT, (api) => api - .put(`/2.0/folders/${folderId}`, folderSharedLinkBody) + .put(`/2.0/folders/${folderId}?fields=shared_link`, folderSharedLinkBody) .reply(200, createFolderSharedLinkFixture) ) .stdout() @@ -138,7 +138,7 @@ describe('Shared-Links', () => { test .nock(TEST_API_ROOT, (api) => api - .put(`/2.0/folders/${folderId}`, folderSharedLinkBody) + .put(`/2.0/folders/${folderId}?fields=shared_link`, folderSharedLinkBody) .reply(200, createFolderSharedLinkFixture) ) .stdout() diff --git a/test/fixtures/files/put_files_id_shared_link.json b/test/fixtures/files/put_files_id_shared_link.json index 84d3c5a6..b5ca5b7e 100644 --- a/test/fixtures/files/put_files_id_shared_link.json +++ b/test/fixtures/files/put_files_id_shared_link.json @@ -1,60 +1,6 @@ { "type": "file", "id": "1234567890", - "file_version": { - "type": "file_version", - "id": "11223344556677", - "sha1": "97b3dbba6eab7ad0f058240744c8636b7c7bea93" - }, - "sequence_id": "1", - "etag": "1", - "sha1": "97b3dbba6eab7ad0f058240744c8636b7c7bea93", - "name": "Puppy.png", - "description": "", - "size": 106833, - "path_collection": { - "total_count": 2, - "entries": [ - { - "type": "folder", - "id": "0", - "sequence_id": null, - "etag": null, - "name": "All Files" - }, - { - "type": "folder", - "id": "987654321", - "sequence_id": "0", - "etag": "0", - "name": "Collaborated Folder" - } - ] - }, - "created_at": "2016-11-16T22:01:44-08:00", - "modified_at": "2016-11-16T22:01:51-08:00", - "trashed_at": null, - "purged_at": null, - "content_created_at": "2016-10-29T18:33:50-07:00", - "content_modified_at": "2016-10-29T18:33:50-07:00", - "created_by": { - "type": "user", - "id": "1357924680", - "name": "Owner", - "login": "owner@example.com" - }, - "modified_by": { - "type": "user", - "id": "1357924680", - "name": "Owner", - "login": "owner@example.com" - }, - "owned_by": { - "type": "user", - "id": "1357924680", - "name": "Owner", - "login": "owner@example.com" - }, "shared_link": { "url": "https://blosserdemoaccount.box.com/s/7mcmdlavtye5o5i0ue8xmtwh2sx5bv8p", "download_url": "https://blosserdemoaccount.box.com/shared/static/7mcmdlavtye5o5i0ue8xmtwh2sx5bv8p.png", @@ -70,13 +16,5 @@ "can_preview": true, "can_edit": true } - }, - "parent": { - "type": "folder", - "id": "987654321", - "sequence_id": "0", - "etag": "0", - "name": "Collaborated Folder" - }, - "item_status": "active" + } } diff --git a/test/fixtures/folders/put_folders_id_shared_link.json b/test/fixtures/folders/put_folders_id_shared_link.json index f338fa0b..834d3f15 100644 --- a/test/fixtures/folders/put_folders_id_shared_link.json +++ b/test/fixtures/folders/put_folders_id_shared_link.json @@ -1,39 +1,6 @@ { "type": "folder", "id": "0", - "sequence_id": null, - "etag": null, - "name": "All Files", - "created_at": null, - "modified_at": null, - "description": "", - "size": 8183737, - "path_collection": { - "total_count": 0, - "entries": [] - }, - "created_by": { - "type": "user", - "id": "", - "name": "", - "login": "" - }, - "modified_by": { - "type": "user", - "id": "33333", - "name": "Test User", - "login": "testuser@example.com" - }, - "trashed_at": null, - "purged_at": null, - "content_created_at": null, - "content_modified_at": null, - "owned_by": { - "type": "user", - "id": "33333", - "name": "Test User", - "login": "testuser@example.com" - }, "shared_link": { "url": "https://blosserdemoaccount.box.com/s/7mcmdlavtye5o5i0ue8xmtwh2sx5bv8p", "download_url": "https://blosserdemoaccount.box.com/shared/static/7mcmdlavtye5o5i0ue8xmtwh2sx5bv8p.png", @@ -48,79 +15,5 @@ "can_download": true, "can_preview": true } - }, - "folder_upload_email": null, - "parent": null, - "item_status": "active", - "item_collection": { - "total_count": 6, - "entries": [ - { - "type": "folder", - "id": "44444", - "sequence_id": "1", - "etag": "1", - "name": "Collab Folder" - }, - { - "type": "folder", - "id": "55555", - "sequence_id": "0", - "etag": "0", - "name": "Copied Folder" - }, - { - "type": "folder", - "id": "66666", - "sequence_id": "0", - "etag": "0", - "name": "SDK Test Folder" - }, - { - "type": "folder", - "id": "77777", - "sequence_id": "1", - "etag": "1", - "name": "Test Folder" - }, - { - "type": "file", - "id": "88888", - "file_version": { - "type": "file_version", - "id": "888880", - "sha1": "6afc05eae22e994f1c7dd48e58f8895dd9028223" - }, - "sequence_id": "0", - "etag": "0", - "sha1": "6afc05eae22e994f1c7dd48e58f8895dd9028223", - "name": "Copied file.txt" - }, - { - "type": "file", - "id": "99999", - "file_version": { - "type": "file_version", - "id": "999990", - "sha1": "97cc02de7c356f94e3beeb1e0c63f78a6edb01fd" - }, - "sequence_id": "9", - "etag": "9", - "sha1": "97cc02de7c356f94e3beeb1e0c63f78a6edb01fd", - "name": "test file.txt" - } - ], - "offset": 0, - "limit": 100, - "order": [ - { - "by": "type", - "direction": "ASC" - }, - { - "by": "name", - "direction": "ASC" - } - ] } } diff --git a/test/fixtures/output/files_share_json.txt b/test/fixtures/output/files_share_json.txt index 47809f4f..b5ca5b7e 100644 --- a/test/fixtures/output/files_share_json.txt +++ b/test/fixtures/output/files_share_json.txt @@ -1,16 +1,20 @@ { - "url": "https://blosserdemoaccount.box.com/s/7mcmdlavtye5o5i0ue8xmtwh2sx5bv8p", - "download_url": "https://blosserdemoaccount.box.com/shared/static/7mcmdlavtye5o5i0ue8xmtwh2sx5bv8p.png", - "vanity_url": null, - "effective_access": "open", - "is_password_enabled": true, - "unshared_at": null, - "download_count": 0, - "preview_count": 0, - "access": "test", - "permissions": { - "can_download": true, - "can_preview": true, - "can_edit": true + "type": "file", + "id": "1234567890", + "shared_link": { + "url": "https://blosserdemoaccount.box.com/s/7mcmdlavtye5o5i0ue8xmtwh2sx5bv8p", + "download_url": "https://blosserdemoaccount.box.com/shared/static/7mcmdlavtye5o5i0ue8xmtwh2sx5bv8p.png", + "vanity_url": null, + "effective_access": "open", + "is_password_enabled": true, + "unshared_at": null, + "download_count": 0, + "preview_count": 0, + "access": "test", + "permissions": { + "can_download": true, + "can_preview": true, + "can_edit": true + } } } diff --git a/test/fixtures/output/files_share_yaml.txt b/test/fixtures/output/files_share_yaml.txt index 62063e3e..6f7980dd 100644 --- a/test/fixtures/output/files_share_yaml.txt +++ b/test/fixtures/output/files_share_yaml.txt @@ -1,14 +1,17 @@ -URL: 'https://blosserdemoaccount.box.com/s/7mcmdlavtye5o5i0ue8xmtwh2sx5bv8p' -Download URL: >- - https://blosserdemoaccount.box.com/shared/static/7mcmdlavtye5o5i0ue8xmtwh2sx5bv8p.png -Vanity URL: null -Effective Access: open -Is Password Enabled: true -Unshared At: null -Download Count: 0 -Preview Count: 0 -Access: test -Permissions: - Can Download: true - Can Preview: true - Can Edit: true +Type: file +ID: '1234567890' +Shared Link: + URL: 'https://blosserdemoaccount.box.com/s/7mcmdlavtye5o5i0ue8xmtwh2sx5bv8p' + Download URL: >- + https://blosserdemoaccount.box.com/shared/static/7mcmdlavtye5o5i0ue8xmtwh2sx5bv8p.png + Vanity URL: null + Effective Access: open + Is Password Enabled: true + Unshared At: null + Download Count: 0 + Preview Count: 0 + Access: test + Permissions: + Can Download: true + Can Preview: true + Can Edit: true diff --git a/test/fixtures/output/folders_share_json.txt b/test/fixtures/output/folders_share_json.txt index 107b6e09..834d3f15 100644 --- a/test/fixtures/output/folders_share_json.txt +++ b/test/fixtures/output/folders_share_json.txt @@ -1,15 +1,19 @@ { - "url": "https://blosserdemoaccount.box.com/s/7mcmdlavtye5o5i0ue8xmtwh2sx5bv8p", - "download_url": "https://blosserdemoaccount.box.com/shared/static/7mcmdlavtye5o5i0ue8xmtwh2sx5bv8p.png", - "vanity_url": null, - "effective_access": "open", - "is_password_enabled": true, - "unshared_at": null, - "download_count": 0, - "preview_count": 0, - "access": "test", - "permissions": { - "can_download": true, - "can_preview": true + "type": "folder", + "id": "0", + "shared_link": { + "url": "https://blosserdemoaccount.box.com/s/7mcmdlavtye5o5i0ue8xmtwh2sx5bv8p", + "download_url": "https://blosserdemoaccount.box.com/shared/static/7mcmdlavtye5o5i0ue8xmtwh2sx5bv8p.png", + "vanity_url": null, + "effective_access": "open", + "is_password_enabled": true, + "unshared_at": null, + "download_count": 0, + "preview_count": 0, + "access": "test", + "permissions": { + "can_download": true, + "can_preview": true + } } } diff --git a/test/fixtures/output/folders_share_yaml.txt b/test/fixtures/output/folders_share_yaml.txt index 4219a6fe..c2f3a4a9 100644 --- a/test/fixtures/output/folders_share_yaml.txt +++ b/test/fixtures/output/folders_share_yaml.txt @@ -1,13 +1,16 @@ -URL: 'https://blosserdemoaccount.box.com/s/7mcmdlavtye5o5i0ue8xmtwh2sx5bv8p' -Download URL: >- - https://blosserdemoaccount.box.com/shared/static/7mcmdlavtye5o5i0ue8xmtwh2sx5bv8p.png -Vanity URL: null -Effective Access: open -Is Password Enabled: true -Unshared At: null -Download Count: 0 -Preview Count: 0 -Access: test -Permissions: - Can Download: true - Can Preview: true +Type: folder +ID: '0' +Shared Link: + URL: 'https://blosserdemoaccount.box.com/s/7mcmdlavtye5o5i0ue8xmtwh2sx5bv8p' + Download URL: >- + https://blosserdemoaccount.box.com/shared/static/7mcmdlavtye5o5i0ue8xmtwh2sx5bv8p.png + Vanity URL: null + Effective Access: open + Is Password Enabled: true + Unshared At: null + Download Count: 0 + Preview Count: 0 + Access: test + Permissions: + Can Download: true + Can Preview: true