Merge pull request #4216 from owncloud/feature/reshare-permission

owncloud · Oct 26, 2020 · 97f6870 · 97f6870
2 parents cfb85cf + 2b45fdc
commit 97f6870
Show file tree

Hide file tree

Showing 29 changed files with 380 additions and 340 deletions.
diff --git a/apps/files/src/components/Collaborators/CollaboratorsEditOptions.vue b/apps/files/src/components/Collaborators/CollaboratorsEditOptions.vue
@@ -6,14 +6,16 @@
       :selected-role="role"
       @roleSelected="selectRole"
     />
-    <label v-if="$_ocCollaborators_hasAdditionalPermissions" class="oc-label">
-      <translate>Additional permissions:</translate>
-    </label>
-    <additional-permissions
-      :available-permissions="role.additionalPermissions"
-      :collaborators-permissions="collaboratorsPermissions"
-      @permissionChecked="checkAdditionalPermissions"
-    />
+    <template v-if="$_ocCollaborators_hasAdditionalPermissions">
+      <label v-if="selectedRole.name !== 'advancedRole'" class="oc-label">
+        <translate>Additional permissions:</translate>
+      </label>
+      <additional-permissions
+        :available-permissions="role.additionalPermissions"
+        :collaborators-permissions="collaboratorsPermissions"
+        @permissionChecked="checkAdditionalPermissions"
+      />
+    </template>
     <div v-if="expirationSupported">
       <label for="files-collaborators-collaborator-expiration-input">
         <translate>Expiration date:</translate>
@@ -106,10 +108,7 @@ export default {
     },
 
     $_ocCollaborators_hasAdditionalPermissions() {
-      if (this.selectedRole && this.selectedRole.name !== 'advancedRole') {
-        return Object.keys(this.selectedRole.additionalPermissions).length > 0
-      }
-      return false
+      return this.selectedRole && this.selectedRole.additionalPermissions
     },
 
     role() {

diff --git a/apps/files/src/components/Collaborators/EditCollaborator.vue b/apps/files/src/components/Collaborators/EditCollaborator.vue
@@ -95,7 +95,7 @@ export default {
   },
   computed: {
     ...mapGetters('Files', ['highlightedFile']),
-    ...mapGetters(['user']),
+    ...mapGetters(['user', 'isOcis']),
 
     collaboratorType() {
       const collaboratorShareType = this.collaborator.shareType
@@ -177,7 +177,7 @@ export default {
         client: this.$client,
         share: this.collaborator,
         // Map bitmask to role to get the correct role in case the advanced role was mapped to existing role
-        role: bitmaskToRole(bitmask, this.highlightedFile.type === 'folder'),
+        role: bitmaskToRole(bitmask, this.highlightedFile.type === 'folder', !this.isOcis),
         permissions: bitmask,
         expirationDate: this.expirationDate
       })

diff --git a/apps/files/src/components/FileSharingSidebar.vue b/apps/files/src/components/FileSharingSidebar.vue
@@ -133,6 +133,7 @@ export default {
       'currentFileOutgoingSharesLoading',
       'sharesTreeLoading'
     ]),
+    ...mapGetters(['isOcis']),
     ...mapState('Files', [
       'incomingShares',
       'incomingSharesLoading',
@@ -174,7 +175,7 @@ export default {
       let role = { name: '' }
 
       if (permissions > 0) {
-        role = bitmaskToRole(permissions, isFolder)
+        role = bitmaskToRole(permissions, isFolder, !this.isOcis)
       } else {
         role.name = 'owner'
       }

diff --git a/apps/files/src/helpers/collaboratorRolesDefinition.js b/apps/files/src/helpers/collaboratorRolesDefinition.js
@@ -8,34 +8,29 @@ function returnOriginal(string) {
  * Returns object with collaborator roles
  * @param {boolean} isFolder  Defines if the item is folder
  * @param {function} $gettext  Function to translate neccessary strings
+ * @param {boolean} allowSharePerm Asserts whether share permission is allowed
  * @returns {object}  Collaborator roles
  */
-export default ({ isFolder = false, $gettext = returnOriginal }) => {
+export default ({ isFolder = false, $gettext = returnOriginal, allowSharePerm = false }) => {
   if (isFolder) {
     return {
       viewer: {
         name: 'viewer',
         label: $gettext('Viewer'),
-        description: $gettext('Download and preview'),
-        permissions: ['read'],
-        additionalPermissions: {
-          share: {
-            name: 'share',
-            description: $gettext('Allow re-Sharing')
-          }
-        }
+        description: allowSharePerm
+          ? $gettext('Download, preview and share')
+          : $gettext('Download and preview'),
+        permissions: allowSharePerm ? ['read', 'share'] : ['read']
       },
       editor: {
         name: 'editor',
         label: $gettext('Editor'),
-        description: $gettext('Upload, edit, delete, download and preview'),
-        permissions: ['read', 'update', 'create', 'delete'],
-        additionalPermissions: {
-          share: {
-            name: 'share',
-            description: $gettext('Allow re-Sharing')
-          }
-        }
+        description: allowSharePerm
+          ? $gettext('Upload, edit, delete, download, preview and share')
+          : $gettext('Upload, edit, delete, download and preview'),
+        permissions: allowSharePerm
+          ? ['read', 'update', 'create', 'delete', 'share']
+          : ['read', 'update', 'create', 'delete']
       }
     }
   }
@@ -44,26 +39,18 @@ export default ({ isFolder = false, $gettext = returnOriginal }) => {
     viewer: {
       name: 'viewer',
       label: $gettext('Viewer'),
-      description: $gettext('Download and preview'),
-      permissions: ['read'],
-      additionalPermissions: {
-        share: {
-          name: 'share',
-          description: $gettext('Allow re-Sharing')
-        }
-      }
+      description: allowSharePerm
+        ? $gettext('Download, preview and share')
+        : $gettext('Download and preview'),
+      permissions: allowSharePerm ? ['read', 'share'] : ['read']
     },
     editor: {
       name: 'editor',
       label: $gettext('Editor'),
-      description: $gettext('Edit, download and preview'),
-      permissions: ['read', 'update'],
-      additionalPermissions: {
-        share: {
-          name: 'share',
-          description: $gettext('Allow re-Sharing')
-        }
-      }
+      description: allowSharePerm
+        ? $gettext('Edit, download, preview and share')
+        : $gettext('Edit, download and preview'),
+      permissions: allowSharePerm ? ['read', 'update', 'share'] : ['read', 'update']
     }
   }
 }
diff --git a/apps/files/src/helpers/collaborators.js b/apps/files/src/helpers/collaborators.js
@@ -27,25 +27,28 @@ export function roleToBitmask(role, additionalPermissions = []) {
 
   if (additionalPermissions) {
     for (const additionalPermission of additionalPermissions) {
-      if (role.additionalPermissions[additionalPermission]) {
+      if (role.additionalPermissions && role.additionalPermissions[additionalPermission]) {
         bitmask |= permissionsBitmask[additionalPermission]
       }
     }
   }
 
+  console.log(bitmask)
+
   return bitmask
 }
 
 /**
  * Maps bitmask to role
  * @param {number} bitmask Permissions which are to be mapped to role
  * @param {boolean} isFolder Defines if the item is folder
+ * @param {boolean} allowSharePerm Asserts if the share permission is allowed
  * @returns {object} Role mapped to the bitmask
  */
-export function bitmaskToRole(bitmask, isFolder) {
+export function bitmaskToRole(bitmask, isFolder, allowSharePerm) {
   // TODO: inject the result of "roles()" in the function header and have the caller of bitmaskToRole call roles() with appropriate arguments including translation
   // Not passing in translation as we don't need it
-  const currentRoles = roles({ isFolder: isFolder })
+  const currentRoles = roles({ isFolder: isFolder, allowSharePerm })
   bitmask = parseInt(bitmask, 10)
 
   for (const role in currentRoles) {

diff --git a/apps/files/src/mixins/collaborators.js b/apps/files/src/mixins/collaborators.js
@@ -3,7 +3,7 @@ import roles from '../helpers/collaboratorRolesDefinition'
 
 export default {
   computed: {
-    ...mapGetters(['getToken']),
+    ...mapGetters(['getToken', 'user', 'isOcis']),
     ...mapGetters('Files', ['highlightedFile']),
 
     ownerRole() {
@@ -27,10 +27,6 @@ export default {
         description: this.$gettext('Set detailed permissions'),
         permissions: ['read'],
         additionalPermissions: {
-          share: {
-            name: 'share',
-            description: this.$gettext('Allow re-Sharing')
-          },
           update: {
             name: 'update',
             description: this.$gettext('Allow editing')
@@ -50,13 +46,24 @@ export default {
         }
       }
 
+      if (!this.isOcis) {
+        advancedRole.additionalPermissions.share = {
+          name: 'share',
+          description: this.$gettext('Allow sharing')
+        }
+      }
+
       return advancedRole
     },
 
     roles() {
       const isFolder = this.highlightedFile.type === 'folder'
       const $gettext = this.$gettext
-      const collaboratorRoles = roles({ $gettext, isFolder: isFolder })
+      const collaboratorRoles = roles({
+        $gettext,
+        isFolder: isFolder,
+        allowSharePerm: !this.isOcis
+      })
       collaboratorRoles.advancedRole = this.advancedRole
 
       return collaboratorRoles