Check for ReadWriteDelete password enforcement

owncloud · Apr 27, 2022 · 633819f · 633819f
1 parent 259b445
commit 633819f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Links/CreateForm.vue b/packages/web-app-files/src/components/SideBar/Shares/Links/CreateForm.vue
@@ -187,15 +187,19 @@ export default {
 
       const canRead = currentRole.role.hasPermission(SharePermissions.read)
       const canCreate = currentRole.role.hasPermission(SharePermissions.create)
+      const canDelete = currentRole.role.hasPermission(SharePermissions.delete)
 
       if (this.passwordEnforced.read_only === true) {
-        return canRead && !canCreate
+        return canRead && !canCreate && !canDelete
       }
       if (this.passwordEnforced.upload_only === true) {
-        return !canRead && canCreate
+        return !canRead && canCreate && !canDelete
       }
       if (this.passwordEnforced.read_write === true) {
-        return canRead && canCreate
+        return canRead && canCreate && !canDelete
+      }
+      if (this.passwordEnforced.read_write_delete === true) {
+        return canRead && canCreate && canDelete
       }
       return false
     },

diff --git a/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue b/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue
@@ -366,15 +366,19 @@ export default {
 
       const canRead = currentRole.role.hasPermission(SharePermissions.read)
       const canCreate = currentRole.role.hasPermission(SharePermissions.create)
+      const canDelete = currentRole.role.hasPermission(SharePermissions.delete)
 
       if (this.passwordEnforced.read_only === true) {
-        return canRead && !canCreate
+        return canRead && !canCreate && !canDelete
       }
       if (this.passwordEnforced.upload_only === true) {
-        return !canRead && canCreate
+        return !canRead && canCreate && !canDelete
       }
       if (this.passwordEnforced.read_write === true) {
-        return canRead && canCreate
+        return canRead && canCreate && !canDelete
+      }
+      if (this.passwordEnforced.read_write_delete === true) {
+        return canRead && canCreate && canDelete
       }
       return false
     },