Introduce new _getOptionalParams helper method for shares

owncloud · Mar 2, 2022 · 837f65f · 837f65f
1 parent 9b0b5a5
commit 837f65f
Showing 1 changed file with 31 additions and 49 deletions.
diff --git a/src/shareManagement.js b/src/shareManagement.js
@@ -94,25 +94,8 @@ class Shares {
     const postData = {
       shareType: this.helpers.OCS_SHARE_TYPE_USER,
       shareWith: username,
-      path: path
-    }
-
-    if (optionalParams) {
-      if (optionalParams.permissions) {
-        postData.permissions = optionalParams.permissions
-      }
-
-      if (optionalParams.expirationDate) {
-        postData.expireDate = optionalParams.expirationDate
-      }
-
-      if (optionalParams.attributes) {
-        postData.attributes = optionalParams.attributes
-      }
-
-      if (optionalParams.remoteUser) {
-        postData.shareType = this.helpers.OCS_SHARE_TYPE_REMOTE
-      }
+      path: path,
+      ...this._getOptionalParams(optionalParams)
     }
 
     return this.helpers._makeOCSrequest('POST', this.helpers.OCS_SERVICE_SHARE, 'shares', postData)
@@ -137,27 +120,14 @@ class Shares {
     const postData = {
       shareType: this.helpers.OCS_SHARE_TYPE_SPACE,
       shareWith: username,
-      space_ref: spaceId
+      space_ref: spaceId,
+      ...this._getOptionalParams(optionalParams)
     }
 
     if (path) {
       postData.path = this.helpers._normalizePath(path)
     }
 
-    if (optionalParams) {
-      if (optionalParams.permissions) {
-        postData.permissions = optionalParams.permissions
-      }
-
-      if (optionalParams.expirationDate) {
-        postData.expireDate = optionalParams.expirationDate
-      }
-
-      if (optionalParams.attributes) {
-        postData.attributes = optionalParams.attributes
-      }
-    }
-
     return this.helpers._makeOCSrequest('POST', this.helpers.OCS_SERVICE_SHARE, 'shares', postData)
       .then(data => {
         const shareData = data.data.ocs.data
@@ -181,21 +151,8 @@ class Shares {
     const postData = {
       shareType: this.helpers.OCS_SHARE_TYPE_GROUP,
       shareWith: groupName,
-      path: path
-    }
-
-    if (optionalParams) {
-      if (optionalParams.permissions) {
-        postData.permissions = optionalParams.permissions
-      }
-
-      if (optionalParams.expirationDate) {
-        postData.expireDate = optionalParams.expirationDate
-      }
-
-      if (optionalParams.attributes) {
-        postData.attributes = optionalParams.attributes
-      }
+      path: path,
+      ...this._getOptionalParams(optionalParams)
     }
 
     return this.helpers._makeOCSrequest('POST', this.helpers.OCS_SERVICE_SHARE, 'shares', postData)
@@ -473,6 +430,31 @@ class Shares {
         return json.ocs.data
       })
   }
+
+  /**
+   * @param {object} optionalParams
+   * @returns {object}
+   */
+  _getOptionalParams (optionalParams) {
+    const data = {}
+    if (optionalParams.permissions) {
+      data.permissions = optionalParams.permissions
+    }
+
+    if (optionalParams.expirationDate) {
+      data.expireDate = optionalParams.expirationDate
+    }
+
+    if (optionalParams.attributes) {
+      data.attributes = optionalParams.attributes
+    }
+
+    if (optionalParams.remoteUser) {
+      data.shareType = this.helpers.OCS_SHARE_TYPE_REMOTE
+    }
+
+    return data
+  }
 }
 
 module.exports = Shares