files.com 1.0.165 → 1.0.168

package/src/models/File.js

@@ -157,12 +157,14 @@ class File {
       throw new Error('Stream downloads are only available in a NodeJS environment')
     }
 
-    if (!this.download_uri) {
+    const downloadUri = this.getDownloadUri()
+
+    if (!downloadUri) {
       throw new Error('Current object has no download URI')
     }
 
     const { saveUrlToStream } = require('../isomorphic/File.node.js')
-    return saveUrlToStream(this.download_uri, writableStream)
+    return saveUrlToStream(downloadUri, writableStream)
   }
 
   downloadToFile = async destinationPath => {
@@ -170,21 +172,14 @@ class File {
       throw new Error('Disk file downloads are only available in a NodeJS environment')
     }
 
-    if (!this.download_uri) {
+    const downloadUri = this.getDownloadUri()
+
+    if (!downloadUri) {
       throw new Error('Current object has no download URI')
     }
 
     const { saveUrlToFile } = require('../isomorphic/File.node.js')
-    return saveUrlToFile(this.download_uri, destinationPath)
-  }
-
-  static findDownload = async path => {
-    const response = await Api.sendRequest(`/files/${encodeURIComponent(path)}`, 'GET')
-    return new File(response.data)
-  }
-
-  get = async path => {
-    return File.find(path)
+    return saveUrlToFile(downloadUri, destinationPath)
   }
 
   copyTo = async destinationFilePath => {
@@ -408,7 +403,9 @@ class File {
       }
     }
 
-    return Api.sendRequest(`/files/${params['path']}`, 'GET', params, this.options)
+    const response = await Api.sendRequest(`/files/${params['path']}`, 'GET', params, this.options)
+
+    return new File(response?.data, this.options)
   }
 
   // Parameters:
@@ -442,7 +439,9 @@ class File {
       }
     }
 
-    return Api.sendRequest(`/files/${params['path']}`, 'PATCH', params, this.options)
+    const response = await Api.sendRequest(`/files/${params['path']}`, 'PATCH', params, this.options)
+
+    return new File(response?.data, this.options)
   }
 
   // Parameters:
@@ -469,7 +468,9 @@ class File {
       }
     }
 
-    return Api.sendRequest(`/files/${params['path']}`, 'DELETE', params, this.options)
+    const response = await Api.sendRequest(`/files/${params['path']}`, 'DELETE', params, this.options)
+
+    return response?.data
   }
 
   destroy = (params = {}) =>
@@ -513,7 +514,9 @@ class File {
       }
     }
 
-    return Api.sendRequest(`/file_actions/copy/${params['path']}`, 'POST', params, this.options)
+    const response = await Api.sendRequest(`/file_actions/copy/${params['path']}`, 'POST', params, this.options)
+
+    return new FileAction(response?.data, this.options)
   }
 
   // Move file/folder
@@ -553,7 +556,9 @@ class File {
       }
     }
 
-    return Api.sendRequest(`/file_actions/move/${params['path']}`, 'POST', params, this.options)
+    const response = await Api.sendRequest(`/file_actions/move/${params['path']}`, 'POST', params, this.options)
+
+    return new FileAction(response?.data, this.options)
   }
 
   // Begin file upload
@@ -603,7 +608,9 @@ class File {
       }
     }
 
-    return Api.sendRequest(`/file_actions/begin_upload/${params['path']}`, 'POST', params, this.options)
+    const response = await Api.sendRequest(`/file_actions/begin_upload/${params['path']}`, 'POST', params, this.options)
+
+    return response?.data?.map(obj => new FileUploadPart(obj, this.options)) || []
   }
 
   save = () => {

package/src/models/FileComment.js

@@ -86,7 +86,9 @@ class FileComment {
       }
     }
 
-    return Api.sendRequest(`/file_comments/${params['id']}`, 'PATCH', params, this.options)
+    const response = await Api.sendRequest(`/file_comments/${params['id']}`, 'PATCH', params, this.options)
+
+    return new FileComment(response?.data, this.options)
   }
 
   delete = async (params = {}) => {
@@ -111,7 +113,9 @@ class FileComment {
       }
     }
 
-    return Api.sendRequest(`/file_comments/${params['id']}`, 'DELETE', params, this.options)
+    const response = await Api.sendRequest(`/file_comments/${params['id']}`, 'DELETE', params, this.options)
+
+    return response?.data
   }
 
   destroy = (params = {}) =>

package/src/models/FileCommentReaction.js

@@ -73,7 +73,9 @@ class FileCommentReaction {
       }
     }
 
-    return Api.sendRequest(`/file_comment_reactions/${params['id']}`, 'DELETE', params, this.options)
+    const response = await Api.sendRequest(`/file_comment_reactions/${params['id']}`, 'DELETE', params, this.options)
+
+    return response?.data
   }
 
   destroy = (params = {}) =>

package/src/models/FormFieldSet.js

@@ -113,7 +113,9 @@ class FormFieldSet {
       }
     }
 
-    return Api.sendRequest(`/form_field_sets/${params['id']}`, 'PATCH', params, this.options)
+    const response = await Api.sendRequest(`/form_field_sets/${params['id']}`, 'PATCH', params, this.options)
+
+    return new FormFieldSet(response?.data, this.options)
   }
 
   delete = async (params = {}) => {
@@ -138,7 +140,9 @@ class FormFieldSet {
       }
     }
 
-    return Api.sendRequest(`/form_field_sets/${params['id']}`, 'DELETE', params, this.options)
+    const response = await Api.sendRequest(`/form_field_sets/${params['id']}`, 'DELETE', params, this.options)
+
+    return response?.data
   }
 
   destroy = (params = {}) =>

package/src/models/Group.js

@@ -104,7 +104,9 @@ class Group {
       }
     }
 
-    return Api.sendRequest(`/groups/${params['id']}`, 'PATCH', params, this.options)
+    const response = await Api.sendRequest(`/groups/${params['id']}`, 'PATCH', params, this.options)
+
+    return new Group(response?.data, this.options)
   }
 
   delete = async (params = {}) => {
@@ -129,7 +131,9 @@ class Group {
       }
     }
 
-    return Api.sendRequest(`/groups/${params['id']}`, 'DELETE', params, this.options)
+    const response = await Api.sendRequest(`/groups/${params['id']}`, 'DELETE', params, this.options)
+
+    return response?.data
   }
 
   destroy = (params = {}) =>

package/src/models/GroupUser.js

@@ -113,7 +113,9 @@ class GroupUser {
       }
     }
 
-    return Api.sendRequest(`/group_users/${params['id']}`, 'PATCH', params, this.options)
+    const response = await Api.sendRequest(`/group_users/${params['id']}`, 'PATCH', params, this.options)
+
+    return new GroupUser(response?.data, this.options)
   }
 
   // Parameters:
@@ -163,7 +165,9 @@ class GroupUser {
       }
     }
 
-    return Api.sendRequest(`/group_users/${params['id']}`, 'DELETE', params, this.options)
+    const response = await Api.sendRequest(`/group_users/${params['id']}`, 'DELETE', params, this.options)
+
+    return response?.data
   }
 
   destroy = (params = {}) =>

package/src/models/Lock.js

@@ -142,7 +142,9 @@ class Lock {
       }
     }
 
-    return Api.sendRequest(`/locks/${params['path']}`, 'DELETE', params, this.options)
+    const response = await Api.sendRequest(`/locks/${params['path']}`, 'DELETE', params, this.options)
+
+    return response?.data
   }
 
   destroy = (params = {}) =>

package/src/models/Message.js

@@ -124,7 +124,9 @@ class Message {
       }
     }
 
-    return Api.sendRequest(`/messages/${params['id']}`, 'PATCH', params, this.options)
+    const response = await Api.sendRequest(`/messages/${params['id']}`, 'PATCH', params, this.options)
+
+    return new Message(response?.data, this.options)
   }
 
   delete = async (params = {}) => {
@@ -149,7 +151,9 @@ class Message {
       }
     }
 
-    return Api.sendRequest(`/messages/${params['id']}`, 'DELETE', params, this.options)
+    const response = await Api.sendRequest(`/messages/${params['id']}`, 'DELETE', params, this.options)
+
+    return response?.data
   }
 
   destroy = (params = {}) =>

package/src/models/MessageComment.js

@@ -86,7 +86,9 @@ class MessageComment {
       }
     }
 
-    return Api.sendRequest(`/message_comments/${params['id']}`, 'PATCH', params, this.options)
+    const response = await Api.sendRequest(`/message_comments/${params['id']}`, 'PATCH', params, this.options)
+
+    return new MessageComment(response?.data, this.options)
   }
 
   delete = async (params = {}) => {
@@ -111,7 +113,9 @@ class MessageComment {
       }
     }
 
-    return Api.sendRequest(`/message_comments/${params['id']}`, 'DELETE', params, this.options)
+    const response = await Api.sendRequest(`/message_comments/${params['id']}`, 'DELETE', params, this.options)
+
+    return response?.data
   }
 
   destroy = (params = {}) =>

package/src/models/MessageCommentReaction.js

@@ -66,7 +66,9 @@ class MessageCommentReaction {
       }
     }
 
-    return Api.sendRequest(`/message_comment_reactions/${params['id']}`, 'DELETE', params, this.options)
+    const response = await Api.sendRequest(`/message_comment_reactions/${params['id']}`, 'DELETE', params, this.options)
+
+    return response?.data
   }
 
   destroy = (params = {}) =>

package/src/models/MessageReaction.js

@@ -66,7 +66,9 @@ class MessageReaction {
       }
     }
 
-    return Api.sendRequest(`/message_reactions/${params['id']}`, 'DELETE', params, this.options)
+    const response = await Api.sendRequest(`/message_reactions/${params['id']}`, 'DELETE', params, this.options)
+
+    return response?.data
   }
 
   destroy = (params = {}) =>

package/src/models/Notification.js

@@ -144,7 +144,9 @@ class Notification {
       }
     }
 
-    return Api.sendRequest(`/notifications/${params['id']}`, 'PATCH', params, this.options)
+    const response = await Api.sendRequest(`/notifications/${params['id']}`, 'PATCH', params, this.options)
+
+    return new Notification(response?.data, this.options)
   }
 
   delete = async (params = {}) => {
@@ -169,7 +171,9 @@ class Notification {
       }
     }
 
-    return Api.sendRequest(`/notifications/${params['id']}`, 'DELETE', params, this.options)
+    const response = await Api.sendRequest(`/notifications/${params['id']}`, 'DELETE', params, this.options)
+
+    return response?.data
   }
 
   destroy = (params = {}) =>

package/src/models/Permission.js

@@ -101,7 +101,9 @@ class Permission {
       }
     }
 
-    return Api.sendRequest(`/permissions/${params['id']}`, 'DELETE', params, this.options)
+    const response = await Api.sendRequest(`/permissions/${params['id']}`, 'DELETE', params, this.options)
+
+    return response?.data
   }
 
   destroy = (params = {}) =>

package/src/models/Project.js

@@ -72,7 +72,9 @@ class Project {
       }
     }
 
-    return Api.sendRequest(`/projects/${params['id']}`, 'PATCH', params, this.options)
+    const response = await Api.sendRequest(`/projects/${params['id']}`, 'PATCH', params, this.options)
+
+    return new Project(response?.data, this.options)
   }
 
   delete = async (params = {}) => {
@@ -97,7 +99,9 @@ class Project {
       }
     }
 
-    return Api.sendRequest(`/projects/${params['id']}`, 'DELETE', params, this.options)
+    const response = await Api.sendRequest(`/projects/${params['id']}`, 'DELETE', params, this.options)
+
+    return response?.data
   }
 
   destroy = (params = {}) =>

package/src/models/PublicKey.js

@@ -96,7 +96,9 @@ class PublicKey {
       }
     }
 
-    return Api.sendRequest(`/public_keys/${params['id']}`, 'PATCH', params, this.options)
+    const response = await Api.sendRequest(`/public_keys/${params['id']}`, 'PATCH', params, this.options)
+
+    return new PublicKey(response?.data, this.options)
   }
 
   delete = async (params = {}) => {
@@ -121,7 +123,9 @@ class PublicKey {
       }
     }
 
-    return Api.sendRequest(`/public_keys/${params['id']}`, 'DELETE', params, this.options)
+    const response = await Api.sendRequest(`/public_keys/${params['id']}`, 'DELETE', params, this.options)
+
+    return response?.data
   }
 
   destroy = (params = {}) =>

package/src/models/RemoteServer.js

@@ -551,7 +551,9 @@ class RemoteServer {
       }
     }
 
-    return Api.sendRequest(`/remote_servers/${params['id']}`, 'PATCH', params, this.options)
+    const response = await Api.sendRequest(`/remote_servers/${params['id']}`, 'PATCH', params, this.options)
+
+    return new RemoteServer(response?.data, this.options)
   }
 
   delete = async (params = {}) => {
@@ -576,7 +578,9 @@ class RemoteServer {
       }
     }
 
-    return Api.sendRequest(`/remote_servers/${params['id']}`, 'DELETE', params, this.options)
+    const response = await Api.sendRequest(`/remote_servers/${params['id']}`, 'DELETE', params, this.options)
+
+    return response?.data
   }
 
   destroy = (params = {}) =>

package/src/models/Request.js

@@ -101,7 +101,9 @@ class Request {
       }
     }
 
-    return Api.sendRequest(`/requests/${params['id']}`, 'DELETE', params, this.options)
+    const response = await Api.sendRequest(`/requests/${params['id']}`, 'DELETE', params, this.options)
+
+    return response?.data
   }
 
   destroy = (params = {}) =>

package/src/models/SsoStrategy.js

@@ -175,7 +175,9 @@ class SsoStrategy {
       }
     }
 
-    return Api.sendRequest(`/sso_strategies/${params['id']}/sync`, 'POST', params, this.options)
+    const response = await Api.sendRequest(`/sso_strategies/${params['id']}/sync`, 'POST', params, this.options)
+
+    return response?.data
   }
 
   // Parameters:

package/src/models/Style.js

@@ -90,7 +90,9 @@ class Style {
       }
     }
 
-    return Api.sendRequest(`/styles/${params['path']}`, 'PATCH', params, this.options)
+    const response = await Api.sendRequest(`/styles/${params['path']}`, 'PATCH', params, this.options)
+
+    return new Style(response?.data, this.options)
   }
 
   delete = async (params = {}) => {
@@ -115,7 +117,9 @@ class Style {
       }
     }
 
-    return Api.sendRequest(`/styles/${params['path']}`, 'DELETE', params, this.options)
+    const response = await Api.sendRequest(`/styles/${params['path']}`, 'DELETE', params, this.options)
+
+    return response?.data
   }
 
   destroy = (params = {}) =>

package/src/models/User.js

@@ -448,7 +448,9 @@ class User {
       }
     }
 
-    return Api.sendRequest(`/users/${params['id']}/unlock`, 'POST', params, this.options)
+    const response = await Api.sendRequest(`/users/${params['id']}/unlock`, 'POST', params, this.options)
+
+    return response?.data
   }
 
   // Resend user welcome email
@@ -474,7 +476,9 @@ class User {
       }
     }
 
-    return Api.sendRequest(`/users/${params['id']}/resend_welcome_email`, 'POST', params, this.options)
+    const response = await Api.sendRequest(`/users/${params['id']}/resend_welcome_email`, 'POST', params, this.options)
+
+    return response?.data
   }
 
   // Trigger 2FA Reset process for user who has lost access to their existing 2FA methods
@@ -500,7 +504,9 @@ class User {
       }
     }
 
-    return Api.sendRequest(`/users/${params['id']}/2fa/reset`, 'POST', params, this.options)
+    const response = await Api.sendRequest(`/users/${params['id']}/2fa/reset`, 'POST', params, this.options)
+
+    return response?.data
   }
 
   // Parameters:
@@ -645,7 +651,9 @@ class User {
       }
     }
 
-    return Api.sendRequest(`/users/${params['id']}`, 'PATCH', params, this.options)
+    const response = await Api.sendRequest(`/users/${params['id']}`, 'PATCH', params, this.options)
+
+    return new User(response?.data, this.options)
   }
 
   delete = async (params = {}) => {
@@ -670,7 +678,9 @@ class User {
       }
     }
 
-    return Api.sendRequest(`/users/${params['id']}`, 'DELETE', params, this.options)
+    const response = await Api.sendRequest(`/users/${params['id']}`, 'DELETE', params, this.options)
+
+    return response?.data
   }
 
   destroy = (params = {}) =>

package/src/models/UserRequest.js

@@ -73,7 +73,9 @@ class UserRequest {
       }
     }
 
-    return Api.sendRequest(`/user_requests/${params['id']}`, 'DELETE', params, this.options)
+    const response = await Api.sendRequest(`/user_requests/${params['id']}`, 'DELETE', params, this.options)
+
+    return response?.data
   }
 
   destroy = (params = {}) =>

package/test/src/index.js

@@ -70,14 +70,18 @@ const testSuite = async () => {
     assert(!!file.path)
     assert(file.display_name === displayName)
 
-    const foundFile = await File.findDownload(destinationPath)
-
+    const foundFile = await File.find(destinationPath)
+    
     assert(foundFile.path === destinationPath)
     assert(foundFile.display_name === displayName)
+    assert(typeof foundFile.getDownloadUri() === 'undefined')
 
     if (!isBrowser()) {
+      const downloadableFile = await foundFile.download()
+      assert(typeof downloadableFile.getDownloadUri() !== 'undefined')
+
       const downloadPath = `./${displayName}`
-      await foundFile.downloadToFile(downloadPath)
+      await downloadableFile.downloadToFile(downloadPath)
 
       const fs = require('fs')
       const originalBuffer = fs.readFileSync(sourceFilePath)