From 07865b50bc7d485ffa202f86f4ec6b01be004e13 Mon Sep 17 00:00:00 2001
From: Lukas Hirt <lukashirt@mail.com>
Date: Tue, 20 Oct 2020 17:39:38 +0200
Subject: [PATCH 01/15] Attach share permission to roles

---
 .../CollaboratorsEditOptions.vue              | 20 +++--
 .../Collaborators/EditCollaborator.vue        |  6 +-
 .../src/components/FileSharingSidebar.vue     |  2 +-
 .../helpers/collaboratorRolesDefinition.js    | 53 +++++------
 apps/files/src/helpers/collaborators.js       |  4 +-
 apps/files/src/mixins/collaborators.js        | 10 ++-
 apps/files/src/store/actions.js               | 87 +++++++++++++++----
 changelog/unreleased/share-permission         |  5 ++
 8 files changed, 120 insertions(+), 67 deletions(-)
 create mode 100644 changelog/unreleased/share-permission

diff --git a/apps/files/src/components/Collaborators/CollaboratorsEditOptions.vue b/apps/files/src/components/Collaborators/CollaboratorsEditOptions.vue
index ff5d357d420..326de94cdc8 100644
--- 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 !== 'advnacedRole'" 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,7 +108,7 @@ export default {
     },
 
     $_ocCollaborators_hasAdditionalPermissions() {
-      if (this.selectedRole && this.selectedRole.name !== 'advancedRole') {
+      if (this.selectedRole && this.selectedRole.additionalPermissions) {
         return Object.keys(this.selectedRole.additionalPermissions).length > 0
       }
       return false
diff --git a/apps/files/src/components/Collaborators/EditCollaborator.vue b/apps/files/src/components/Collaborators/EditCollaborator.vue
index 348033f7f19..4db32c5c0d8 100644
--- a/apps/files/src/components/Collaborators/EditCollaborator.vue
+++ b/apps/files/src/components/Collaborators/EditCollaborator.vue
@@ -177,7 +177,11 @@ 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.user.version.edition !== 'reva'
+        ),
         permissions: bitmask,
         expirationDate: this.expirationDate
       })
diff --git a/apps/files/src/components/FileSharingSidebar.vue b/apps/files/src/components/FileSharingSidebar.vue
index 3a602daff7d..5f2427019f3 100644
--- a/apps/files/src/components/FileSharingSidebar.vue
+++ b/apps/files/src/components/FileSharingSidebar.vue
@@ -174,7 +174,7 @@ export default {
       let role = { name: '' }
 
       if (permissions > 0) {
-        role = bitmaskToRole(permissions, isFolder)
+        role = bitmaskToRole(permissions, isFolder, this.user.version.edition !== 'reva')
       } else {
         role.name = 'owner'
       }
diff --git a/apps/files/src/helpers/collaboratorRolesDefinition.js b/apps/files/src/helpers/collaboratorRolesDefinition.js
index 27e3e6657b8..fd2fb58a236 100644
--- 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
index 1098f760fa8..2cab258e1ab 100644
--- a/apps/files/src/helpers/collaborators.js
+++ b/apps/files/src/helpers/collaborators.js
@@ -42,10 +42,10 @@ export function roleToBitmask(role, additionalPermissions = []) {
  * @param {boolean} isFolder Defines if the item is folder
  * @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
index a4c888d15bf..148a0ab4445 100644
--- 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']),
     ...mapGetters('Files', ['highlightedFile']),
 
     ownerRole() {
@@ -29,7 +29,7 @@ export default {
         additionalPermissions: {
           share: {
             name: 'share',
-            description: this.$gettext('Allow re-Sharing')
+            description: this.$gettext('Allow sharing')
           },
           update: {
             name: 'update',
@@ -56,7 +56,11 @@ export default {
     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.user.version.edition !== 'reva'
+      })
       collaboratorRoles.advancedRole = this.advancedRole
 
       return collaboratorRoles
diff --git a/apps/files/src/store/actions.js b/apps/files/src/store/actions.js
index f3ccc2b56ea..677a90f66e8 100644
--- a/apps/files/src/store/actions.js
+++ b/apps/files/src/store/actions.js
@@ -144,7 +144,7 @@ function _buildFileInTrashbin(file) {
   }
 }
 
-function _aggregateFileShares(data, incomingShares = false) {
+function _aggregateFileShares(data, incomingShares = false, allowSharePerm) {
   // borrowed from owncloud's apps/files_sharing/js/sharedfilelist.js#_makeFilesFromShares(data)
   var files = data
   files = _.chain(files)
@@ -191,7 +191,7 @@ function _aggregateFileShares(data, incomingShares = false) {
         // remove extension from basename like _buildFile does
         file.basename = file.basename.substring(0, file.basename.length - file.extension.length - 1)
       }
-      file.share = _buildShare(share, file)
+      file.share = _buildShare(share, file, allowSharePerm)
 
       return file
     })
@@ -229,11 +229,11 @@ function _aggregateFileShares(data, incomingShares = false) {
   return files
 }
 
-function _buildShare(s, file, $gettext) {
+function _buildShare(s, file, $gettext, allowSharePerm) {
   if (parseInt(s.share_type, 10) === shareTypes.link) {
     return _buildLink(s, $gettext)
   }
-  return _buildCollaboratorShare(s, file)
+  return _buildCollaboratorShare(s, file, allowSharePerm)
 }
 
 function _buildLink(link, $gettext) {
@@ -284,7 +284,7 @@ function _fixAdditionalInfo(data) {
   return data
 }
 
-function _buildCollaboratorShare(s, file) {
+function _buildCollaboratorShare(s, file, allowSharePerm) {
   const share = {
     shareType: parseInt(s.share_type, 10),
     id: s.id
@@ -296,7 +296,7 @@ function _buildCollaboratorShare(s, file) {
     case shareTypes.remote:
     // fall through
     case shareTypes.group: // group share
-      share.role = bitmaskToRole(s.permissions, file.type === 'folder')
+      share.role = bitmaskToRole(s.permissions, file.type === 'folder', allowSharePerm)
       share.permissions = s.permissions
       // FIXME: SDK is returning empty object for additional info when empty
       share.collaborator = {
@@ -496,7 +496,11 @@ export default {
           }
 
           const files = json.ocs.data
-          const uniqueFiles = _aggregateFileShares(files, false)
+          const uniqueFiles = _aggregateFileShares(
+            files,
+            false,
+            context.rootGetters.user.version.edition !== 'reva'
+          )
           context.dispatch('buildFilesSharedFromMe', uniqueFiles)
           context.commit('UPDATE_FOLDER_LOADING', false)
         })
@@ -536,7 +540,11 @@ export default {
             return
           }
           const files = json.ocs.data
-          const uniqueFiles = _aggregateFileShares(files, true)
+          const uniqueFiles = _aggregateFileShares(
+            files,
+            true,
+            context.rootGetters.user.version.edition !== 'reva'
+          )
           context.dispatch('buildFilesSharedFromMe', uniqueFiles)
           context.commit('UPDATE_FOLDER_LOADING', false)
         })
@@ -726,7 +734,12 @@ export default {
         context.commit(
           'CURRENT_FILE_OUTGOING_SHARES_SET',
           data.map(element => {
-            return _buildShare(element.shareInfo, context.getters.highlightedFile, $gettext)
+            return _buildShare(
+              element.shareInfo,
+              context.getters.highlightedFile,
+              $gettext,
+              context.rootGetters.user.version.edition !== 'reva'
+            )
           })
         )
         context.commit('UPDATE_CURRENT_FILE_SHARE_TYPES')
@@ -751,7 +764,11 @@ export default {
         context.commit(
           'INCOMING_SHARES_LOAD',
           data.map(element => {
-            return _buildCollaboratorShare(element.shareInfo, context.getters.highlightedFile)
+            return _buildCollaboratorShare(
+              element.shareInfo,
+              context.getters.highlightedFile,
+              context.rootGetters.user.version.edition !== 'reva'
+            )
           })
         )
         context.commit('INCOMING_SHARES_LOADING', false)
@@ -769,7 +786,10 @@ export default {
     context.commit('INCOMING_SHARES_LOAD', [])
     context.commit('INCOMING_SHARES_ERROR', null)
   },
-  changeShare({ commit, getters }, { client, share, role, permissions, expirationDate }) {
+  changeShare(
+    { commit, getters, rootGetters },
+    { client, share, role, permissions, expirationDate }
+  ) {
     const params = {
       permissions: permissions,
       expireDate: expirationDate
@@ -785,7 +805,11 @@ export default {
       client.shares
         .updateShare(share.id, params)
         .then(updatedShare => {
-          const share = _buildCollaboratorShare(updatedShare.shareInfo, getters.highlightedFile)
+          const share = _buildCollaboratorShare(
+            updatedShare.shareInfo,
+            getters.highlightedFile,
+            rootGetters.user.version.edition !== 'reva'
+          )
           commit('CURRENT_FILE_OUTGOING_SHARES_UPDATE', share)
           resolve(share)
         })
@@ -804,7 +828,11 @@ export default {
         .then(share => {
           context.commit(
             'CURRENT_FILE_OUTGOING_SHARES_ADD',
-            _buildCollaboratorShare(share.shareInfo, context.getters.highlightedFile)
+            _buildCollaboratorShare(
+              share.shareInfo,
+              context.getters.highlightedFile,
+              context.rootGetters.user.version.edition !== 'reva'
+            )
           )
           context.commit('UPDATE_CURRENT_FILE_SHARE_TYPES')
         })
@@ -835,7 +863,11 @@ export default {
       .then(share => {
         context.commit(
           'CURRENT_FILE_OUTGOING_SHARES_ADD',
-          _buildCollaboratorShare(share.shareInfo, context.getters.highlightedFile)
+          _buildCollaboratorShare(
+            share.shareInfo,
+            context.getters.highlightedFile,
+            context.rootGetters.user.version.edition !== 'reva'
+          )
         )
         context.commit('UPDATE_CURRENT_FILE_SHARE_TYPES')
       })
@@ -914,7 +946,12 @@ export default {
             .then(data => {
               data.forEach(element => {
                 sharesTree[queryPath].push({
-                  ..._buildShare(element.shareInfo, { type: 'folder' }, $gettext),
+                  ..._buildShare(
+                    element.shareInfo,
+                    { type: 'folder' },
+                    $gettext,
+                    context.rootGetters.user.version.edition !== 'reva'
+                  ),
                   outgoing: true,
                   indirect: true
                 })
@@ -935,7 +972,11 @@ export default {
             .then(data => {
               data.forEach(element => {
                 sharesTree[queryPath].push({
-                  ..._buildCollaboratorShare(element.shareInfo, { type: 'folder' }),
+                  ..._buildCollaboratorShare(
+                    element.shareInfo,
+                    { type: 'folder' },
+                    context.rootGetters.user.version.edition !== 'reva'
+                  ),
                   incoming: true,
                   indirect: true
                 })
@@ -970,7 +1011,12 @@ export default {
       client.shares
         .shareFileWithLink(path, params)
         .then(data => {
-          const link = _buildShare(data.shareInfo, null, $gettext)
+          const link = _buildShare(
+            data.shareInfo,
+            null,
+            $gettext,
+            context.rootGetters.user.version.edition !== 'reva'
+          )
           context.commit('CURRENT_FILE_OUTGOING_SHARES_ADD', link)
           context.commit('UPDATE_CURRENT_FILE_SHARE_TYPES')
           resolve(link)
@@ -985,7 +1031,12 @@ export default {
       client.shares
         .updateShare(id, params)
         .then(data => {
-          const link = _buildShare(data.shareInfo, null, $gettext)
+          const link = _buildShare(
+            data.shareInfo,
+            null,
+            $gettext,
+            context.rootGetters.user.version.edition !== 'reva'
+          )
           context.commit('CURRENT_FILE_OUTGOING_SHARES_UPDATE', link)
           resolve(link)
         })
diff --git a/changelog/unreleased/share-permission b/changelog/unreleased/share-permission
new file mode 100644
index 00000000000..88216f94120
--- /dev/null
+++ b/changelog/unreleased/share-permission
@@ -0,0 +1,5 @@
+Change: Attach share permission to roles
+
+We've attached the share permission of collaborators to roles. There is no longer a share additional permission.
+
+https://github.com/owncloud/phoenix/pull/4216

From bb05df2280b7ce3d0e4f68ee0b694f883628eb53 Mon Sep 17 00:00:00 2001
From: Lukas Hirt <lukashirt@mail.com>
Date: Tue, 20 Oct 2020 17:44:25 +0200
Subject: [PATCH 02/15] Hide share perm in advanced role in ocis

---
 apps/files/src/mixins/collaborators.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/apps/files/src/mixins/collaborators.js b/apps/files/src/mixins/collaborators.js
index 148a0ab4445..1956220f059 100644
--- a/apps/files/src/mixins/collaborators.js
+++ b/apps/files/src/mixins/collaborators.js
@@ -27,10 +27,6 @@ export default {
         description: this.$gettext('Set detailed permissions'),
         permissions: ['read'],
         additionalPermissions: {
-          share: {
-            name: 'share',
-            description: this.$gettext('Allow sharing')
-          },
           update: {
             name: 'update',
             description: this.$gettext('Allow editing')
@@ -50,6 +46,13 @@ export default {
         }
       }
 
+      if (this.user.version.edition !== 'reva') {
+        advancedRole.additionalPermissions.share = {
+          name: 'share',
+          description: this.$gettext('Allow sharing')
+        }
+      }
+
       return advancedRole
     },
 

From 41c2197819bc4a1ce820bf319c608536c1db2740 Mon Sep 17 00:00:00 2001
From: Lukas Hirt <lukashirt@mail.com>
Date: Wed, 21 Oct 2020 10:24:24 +0200
Subject: [PATCH 03/15] Introduce isOcis getter

---
 .../CollaboratorsEditOptions.vue              |  7 +---
 .../Collaborators/EditCollaborator.vue        |  8 +---
 .../src/components/FileSharingSidebar.vue     |  3 +-
 apps/files/src/helpers/collaborators.js       |  1 +
 apps/files/src/mixins/collaborators.js        |  6 +--
 apps/files/src/store/actions.js               | 40 +++++--------------
 src/pages/account.vue                         |  4 +-
 src/store/app.js                              |  3 +-
 8 files changed, 25 insertions(+), 47 deletions(-)

diff --git a/apps/files/src/components/Collaborators/CollaboratorsEditOptions.vue b/apps/files/src/components/Collaborators/CollaboratorsEditOptions.vue
index 326de94cdc8..6b99a2798ca 100644
--- a/apps/files/src/components/Collaborators/CollaboratorsEditOptions.vue
+++ b/apps/files/src/components/Collaborators/CollaboratorsEditOptions.vue
@@ -7,7 +7,7 @@
       @roleSelected="selectRole"
     />
     <template v-if="$_ocCollaborators_hasAdditionalPermissions">
-      <label v-if="selectedRole.name !== 'advnacedRole'" class="oc-label">
+      <label v-if="selectedRole.name !== 'advancedRole'" class="oc-label">
         <translate>Additional permissions:</translate>
       </label>
       <additional-permissions
@@ -108,10 +108,7 @@ export default {
     },
 
     $_ocCollaborators_hasAdditionalPermissions() {
-      if (this.selectedRole && this.selectedRole.additionalPermissions) {
-        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
index 4db32c5c0d8..ef10e3a353e 100644
--- 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,11 +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',
-          this.user.version.edition !== 'reva'
-        ),
+        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
index 5f2427019f3..f89d3be1f5c 100644
--- 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, this.user.version.edition !== 'reva')
+        role = bitmaskToRole(permissions, isFolder, !this.isOcis)
       } else {
         role.name = 'owner'
       }
diff --git a/apps/files/src/helpers/collaborators.js b/apps/files/src/helpers/collaborators.js
index 2cab258e1ab..146eda7d853 100644
--- a/apps/files/src/helpers/collaborators.js
+++ b/apps/files/src/helpers/collaborators.js
@@ -40,6 +40,7 @@ export function roleToBitmask(role, additionalPermissions = []) {
  * 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, allowSharePerm) {
diff --git a/apps/files/src/mixins/collaborators.js b/apps/files/src/mixins/collaborators.js
index 1956220f059..d017cff50a5 100644
--- 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', 'user']),
+    ...mapGetters(['getToken', 'user', 'isOcis']),
     ...mapGetters('Files', ['highlightedFile']),
 
     ownerRole() {
@@ -46,7 +46,7 @@ export default {
         }
       }
 
-      if (this.user.version.edition !== 'reva') {
+      if (!this.isOcis) {
         advancedRole.additionalPermissions.share = {
           name: 'share',
           description: this.$gettext('Allow sharing')
@@ -62,7 +62,7 @@ export default {
       const collaboratorRoles = roles({
         $gettext,
         isFolder: isFolder,
-        allowSharePerm: this.user.version.edition !== 'reva'
+        allowSharePerm: !this.isOcis
       })
       collaboratorRoles.advancedRole = this.advancedRole
 
diff --git a/apps/files/src/store/actions.js b/apps/files/src/store/actions.js
index 677a90f66e8..b470bfcef92 100644
--- a/apps/files/src/store/actions.js
+++ b/apps/files/src/store/actions.js
@@ -496,11 +496,7 @@ export default {
           }
 
           const files = json.ocs.data
-          const uniqueFiles = _aggregateFileShares(
-            files,
-            false,
-            context.rootGetters.user.version.edition !== 'reva'
-          )
+          const uniqueFiles = _aggregateFileShares(files, false, !context.rootGetters.isOcis)
           context.dispatch('buildFilesSharedFromMe', uniqueFiles)
           context.commit('UPDATE_FOLDER_LOADING', false)
         })
@@ -540,11 +536,7 @@ export default {
             return
           }
           const files = json.ocs.data
-          const uniqueFiles = _aggregateFileShares(
-            files,
-            true,
-            context.rootGetters.user.version.edition !== 'reva'
-          )
+          const uniqueFiles = _aggregateFileShares(files, true, !context.rootGetters.isOcis)
           context.dispatch('buildFilesSharedFromMe', uniqueFiles)
           context.commit('UPDATE_FOLDER_LOADING', false)
         })
@@ -738,7 +730,7 @@ export default {
               element.shareInfo,
               context.getters.highlightedFile,
               $gettext,
-              context.rootGetters.user.version.edition !== 'reva'
+              !context.rootGetters.isOcis
             )
           })
         )
@@ -767,7 +759,7 @@ export default {
             return _buildCollaboratorShare(
               element.shareInfo,
               context.getters.highlightedFile,
-              context.rootGetters.user.version.edition !== 'reva'
+              !context.rootGetters.isOcis
             )
           })
         )
@@ -808,7 +800,7 @@ export default {
           const share = _buildCollaboratorShare(
             updatedShare.shareInfo,
             getters.highlightedFile,
-            rootGetters.user.version.edition !== 'reva'
+            !rootGetters.isOcis
           )
           commit('CURRENT_FILE_OUTGOING_SHARES_UPDATE', share)
           resolve(share)
@@ -831,7 +823,7 @@ export default {
             _buildCollaboratorShare(
               share.shareInfo,
               context.getters.highlightedFile,
-              context.rootGetters.user.version.edition !== 'reva'
+              !context.rootGetters.isOcis
             )
           )
           context.commit('UPDATE_CURRENT_FILE_SHARE_TYPES')
@@ -866,7 +858,7 @@ export default {
           _buildCollaboratorShare(
             share.shareInfo,
             context.getters.highlightedFile,
-            context.rootGetters.user.version.edition !== 'reva'
+            !context.rootGetters.isOcis
           )
         )
         context.commit('UPDATE_CURRENT_FILE_SHARE_TYPES')
@@ -950,7 +942,7 @@ export default {
                     element.shareInfo,
                     { type: 'folder' },
                     $gettext,
-                    context.rootGetters.user.version.edition !== 'reva'
+                    !context.rootGetters.isOcis
                   ),
                   outgoing: true,
                   indirect: true
@@ -975,7 +967,7 @@ export default {
                   ..._buildCollaboratorShare(
                     element.shareInfo,
                     { type: 'folder' },
-                    context.rootGetters.user.version.edition !== 'reva'
+                    !context.rootGetters.isOcis
                   ),
                   incoming: true,
                   indirect: true
@@ -1011,12 +1003,7 @@ export default {
       client.shares
         .shareFileWithLink(path, params)
         .then(data => {
-          const link = _buildShare(
-            data.shareInfo,
-            null,
-            $gettext,
-            context.rootGetters.user.version.edition !== 'reva'
-          )
+          const link = _buildShare(data.shareInfo, null, $gettext, !context.rootGetters.isOcis)
           context.commit('CURRENT_FILE_OUTGOING_SHARES_ADD', link)
           context.commit('UPDATE_CURRENT_FILE_SHARE_TYPES')
           resolve(link)
@@ -1031,12 +1018,7 @@ export default {
       client.shares
         .updateShare(id, params)
         .then(data => {
-          const link = _buildShare(
-            data.shareInfo,
-            null,
-            $gettext,
-            context.rootGetters.user.version.edition !== 'reva'
-          )
+          const link = _buildShare(data.shareInfo, null, $gettext, !context.rootGetters.isOcis)
           context.commit('CURRENT_FILE_OUTGOING_SHARES_UPDATE', link)
           resolve(link)
         })
diff --git a/src/pages/account.vue b/src/pages/account.vue
index 632bb08eddc..10d9209e136 100644
--- a/src/pages/account.vue
+++ b/src/pages/account.vue
@@ -61,9 +61,9 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['user', 'configuration', 'getNavItemsByExtension']),
+    ...mapGetters(['user', 'configuration', 'getNavItemsByExtension', 'isOcis']),
     editUrl() {
-      if (this.user.version.edition === 'reva') {
+      if (this.isOcis) {
         return null
       }
       return this.configuration.server.replace(/\/$/, '') + '/index.php/settings/personal'
diff --git a/src/store/app.js b/src/store/app.js
index a056e3d2a0a..122950d26fa 100644
--- a/src/store/app.js
+++ b/src/store/app.js
@@ -111,7 +111,8 @@ const getters = {
     return state.notifications.data.length && !state.notifications.failed
       ? state.notifications.data
       : false
-  }
+  },
+  isOcis: (state, getters, rootState) => rootState.user.version.edition === 'reva'
 }
 
 export default {

From 44065e21212cb99716143750285c13356541e8ef Mon Sep 17 00:00:00 2001
From: Lukas Hirt <lukashirt@mail.com>
Date: Wed, 21 Oct 2020 12:40:42 +0200
Subject: [PATCH 04/15] Adjust tests

---
 apps/files/src/helpers/collaborators.js       |  4 +-
 .../webUIResharing/reshareUsers.feature       | 45 +++++++++----------
 .../shareFileWithMultipleUsers.feature        | 30 +++++--------
 .../shareWithGroups.feature                   |  8 ++--
 .../shareWithGroups.feature                   |  8 ++--
 .../shareWithUsers.feature                    | 30 ++++++-------
 .../shareWithUsers.feature                    | 28 ++++++------
 7 files changed, 74 insertions(+), 79 deletions(-)

diff --git a/apps/files/src/helpers/collaborators.js b/apps/files/src/helpers/collaborators.js
index 146eda7d853..6b595e8c3c3 100644
--- a/apps/files/src/helpers/collaborators.js
+++ b/apps/files/src/helpers/collaborators.js
@@ -27,12 +27,14 @@ 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
 }
 
diff --git a/tests/acceptance/features/webUIResharing/reshareUsers.feature b/tests/acceptance/features/webUIResharing/reshareUsers.feature
index e3047ffe1d5..c6682a1aaca 100644
--- a/tests/acceptance/features/webUIResharing/reshareUsers.feature
+++ b/tests/acceptance/features/webUIResharing/reshareUsers.feature
@@ -19,7 +19,7 @@ Feature: Resharing shared files with different permissions
     And user "user3" has accepted the share "simple-folder" offered by user "user1"
     And user "user2" has logged in using the webUI
     When the user opens the share dialog for folder "simple-folder" using the webUI
-    Then user "User Three" should be listed as "Viewer" in the collaborators list for folder "simple-folder" on the webUI
+    Then user "User Three" should be listed as "Advanced permissions" in the collaborators list for folder "simple-folder" on the webUI
     And no custom permissions should be set for collaborator "User Three" for folder "simple-folder" on the webUI
 
   Scenario: Reshare a folder without share permissions using API and check if it is listed on the collaborators list for resharer
@@ -30,7 +30,7 @@ Feature: Resharing shared files with different permissions
     And user "user1" has logged in using the webUI
     And the user opens folder "Shares" using the webUI
     When the user opens the share dialog for folder "simple-folder" using the webUI
-    Then user "User Three" should be listed as "Viewer" in the collaborators list for folder "simple-folder" on the webUI
+    Then user "User Three" should be listed as "Advanced permissions" in the collaborators list for folder "simple-folder" on the webUI
     And no custom permissions should be set for collaborator "User Three" for folder "simple-folder" on the webUI
 
   @skipOnOCIS @issue-product-270
@@ -62,11 +62,11 @@ Feature: Resharing shared files with different permissions
       | permissions | <permissions>         |
     Examples:
     | role                 | displayed-role          | collaborators-permissions     | displayed-permissions | permissions                         |
-    | Viewer               | Viewer                  | share                         | share                 | read, share                         |
-    | Editor               | Editor                  | share                         | share                 | all                                 |
+    | Viewer               | Viewer                  | ,                             | ,                     | read, share                         |
+    | Editor               | Editor                  | ,                             | ,                     | all                                 |
     | Advanced permissions | Advanced permissions    | share, create                 | share, create         | read, share, create                 |
     | Advanced permissions | Advanced permissions    | update, share                 | share, update         | read, update, share                 |
-    | Advanced permissions | Editor                  | delete, share, create, update | share                 | read, share, delete, update, create |
+    | Advanced permissions | Editor                  | delete, share, create, update |                       | read, share, delete, update, create |
 
   @skipOnOC10 @issue-product-203
   #after fixing the issue delete this scenario and use the one above by deleting the @skipOnOCIS tag there
@@ -87,12 +87,12 @@ Feature: Resharing shared files with different permissions
       | item_type   | folder         |
       | permissions | <permissions>  |
     Examples:
-      | role                 | displayed-role       | collaborators-permissions     | displayed-permissions | permissions                         |
-      | Viewer               | Viewer               | share                         | share                 | read, share                         |
-      | Editor               | Editor               | share                         | share                 | all                                 |
-      | Advanced permissions | Advanced permissions | share, create                 | share, create, update | read, share, create, update         |
-      | Advanced permissions | Advanced permissions | update, share                 | share, update         | read, update, share                 |
-      | Advanced permissions | Editor               | delete, share, create, update | share                 | read, share, delete, update, create |
+      | role                 | displayed-role       | collaborators-permissions | displayed-permissions | permissions                  |
+      | Viewer               | Viewer               | ,                         | ,                     | read                         |
+      | Editor               | Editor               | ,                         | ,                     | all                          |
+      | Advanced permissions | Advanced permissions | create                    | create                | read, create                 |
+      | Advanced permissions | Advanced permissions | update                    | update                | read, update                 |
+      | Advanced permissions | Editor               | delete, create, update    |                       | read, delete, update, create |
 
   @skipOnOCIS @issue-product-203 @issue-4193
   Scenario Outline: share a received folder with another user with same permissions(including share permissions) and check if the user is displayed in collaborators list for original owner
@@ -123,11 +123,11 @@ Feature: Resharing shared files with different permissions
       | permissions | <permissions>         |
     Examples:
     | role                 | displayed-role          | collaborators-permissions     | displayed-permissions | permissions                         |
-    | Viewer               | Viewer                  | share                         | share                 | read, share                         |
-    | Editor               | Editor                  | share                         | share                 | all                                 |
+    | Viewer               | Viewer                  | ,                             | ,                     | read, share                         |
+    | Editor               | Editor                  | ,                             | ,                     | all                                 |
     | Advanced permissions | Advanced permissions    | share, create                 | share, create         | read, share, create                 |
     | Advanced permissions | Advanced permissions    | update, share                 | share, update         | read, update, share                 |
-    | Advanced permissions | Editor                  | delete, share, create, update | share                 | read, share, delete, update, create |
+    | Advanced permissions | Editor                  | delete, share, create, update | ,                     | read, share, delete, update, create |
 
   @skipOnOC10 @issue-product-203 @issue-ocis-717
   #after fixing the issue delete this scenario and use the one above by deleting the @skipOnOCIS tag there
@@ -158,12 +158,12 @@ Feature: Resharing shared files with different permissions
       | item_type   | folder         |
       | permissions | <permissions>  |
     Examples:
-      | role                 | displayed-role       | collaborators-permissions     | displayed-permissions | permissions                         |
-      | Viewer               | Viewer               | share                         | share                 | read, share                         |
-      | Editor               | Editor               | share                         | share                 | all                                 |
-      | Advanced permissions | Advanced permissions | share, create                 | share, update, create | read, share, create, update         |
-      | Advanced permissions | Advanced permissions | update, share                 | share, update         | read, update, share                 |
-      | Advanced permissions | Editor               | delete, share, create, update | share                 | read, share, delete, update, create |
+      | role                 | displayed-role       | collaborators-permissions | displayed-permissions | permissions                  |
+      | Viewer               | Viewer               | ,                         | ,                     | read                         |
+      | Editor               | Editor               | ,                         | ,                     | all                          |
+      | Advanced permissions | Advanced permissions | create                    | create                | read, create                 |
+      | Advanced permissions | Advanced permissions | update                    | update                | read, update                 |
+      | Advanced permissions | Editor               | delete, create, update    | ,                     | read, delete, update, create |
 
   @skipOnOCIS @issue-product-203 @issue-4193
   Scenario: share a folder with another user with share permissions and reshare without share permissions to different user, and check if user is displayed for original sharer
@@ -177,7 +177,6 @@ Feature: Resharing shared files with different permissions
     Then user "User Three" should be listed as "Viewer" in the collaborators list for folder "simple-folder" on the webUI
     And no custom permissions should be set for collaborator "User Three" for folder "simple-folder" on the webUI
     And user "User One" should be listed as "Viewer" in the collaborators list for folder "simple-folder" on the webUI
-    And custom permissions "share" should be set for user "User One" for folder "simple-folder" on the webUI
     And user "user1" should have received a share with these details:
       | field       | value                 |
       | uid_owner   | user2                 |
@@ -191,7 +190,7 @@ Feature: Resharing shared files with different permissions
       | share_with  | user3                 |
       | file_target | /Shares/simple-folder |
       | item_type   | folder                |
-      | permissions | read                  |
+      | permissions | read, share           |
 
   @skipOnOC10 @issue-product-203
   #after fixing the issue delete this scenario and use the one above by deleting the @skipOnOCIS tag there
@@ -236,7 +235,7 @@ Feature: Resharing shared files with different permissions
       | share_with  | user3                 |
       | file_target | /Shares/simple-folder |
       | item_type   | folder                |
-      | permissions | read                  |
+      | permissions | read, share           |
 
   @skipOnOC10 @issue-product-203
   #after fixing the issue delete this scenario and use the one above by deleting the @skipOnOCIS tag there
diff --git a/tests/acceptance/features/webUISharingFilePermissionMultipleUsers/shareFileWithMultipleUsers.feature b/tests/acceptance/features/webUISharingFilePermissionMultipleUsers/shareFileWithMultipleUsers.feature
index cc563a06b9b..c966a4a51d4 100644
--- a/tests/acceptance/features/webUISharingFilePermissionMultipleUsers/shareFileWithMultipleUsers.feature
+++ b/tests/acceptance/features/webUISharingFilePermissionMultipleUsers/shareFileWithMultipleUsers.feature
@@ -55,15 +55,13 @@ Feature: Sharing files with multiple internal users with different permissions
     And user "User Four" should not be listed in the collaborators list on the webUI
     And as "user4" file "/Shares/lorem.txt" should not exist
     Examples:
-      | role                 | displayed-role | extra-permissions | displayed-permissions | actual-permissions  |
-      | Viewer               | Viewer         | share             | share                 | read, share         |
-      | Viewer               | Viewer         | ,                 | ,                     | read                |
-      | Editor               | Editor         | share             | share                 | share, read, update |
-      | Editor               | Editor         | ,                 | ,                     | read, update        |
-      | Advanced permissions | Viewer         | ,                 | ,                     | read                |
-      | Advanced permissions | Viewer         | share             | share                 | read, share         |
-      | Advanced permissions | Editor         | update            | ,                     | read, update        |
-      | Advanced permissions | Editor         | share, update     | share                 | read, update, share |
+      | role                 | displayed-role               | extra-permissions | displayed-permissions | actual-permissions         |
+      | Viewer               | Viewer                       | ,                 | ,                     | read, share                |
+      | Editor               | Editor                       | ,                 | ,                     | read, update, share        |
+      | Advanced permissions | Advanced permissions         | ,                 | ,                     | read                       |
+      | Advanced permissions | Viewer                       | share             | ,                     | read, share                |
+      | Advanced permissions | Advanced permissions         | update            | update                | read, update               |
+      | Advanced permissions | Editor                       | share, update     | ,                     | read, update, share        |
 
   @skipOnOC10 @issue-product-203
   #after fixing the issue delete this scenario and use the one above by deleting the @skipOnOCIS tag there
@@ -110,12 +108,8 @@ Feature: Sharing files with multiple internal users with different permissions
     And user "User Four" should not be listed in the collaborators list on the webUI
     And as "user4" file "/Shares/lorem.txt" should not exist
     Examples:
-      | role                 | displayed-role | extra-permissions | displayed-permissions | actual-permissions  |
-      | Viewer               | Viewer         | share             | share                 | read, share         |
-      | Viewer               | Viewer         | ,                 | ,                     | read                |
-      | Editor               | Editor         | share             | share                 | share, read, update |
-      | Editor               | Editor         | ,                 | ,                     | read, update        |
-      | Advanced permissions | Viewer         | ,                 | ,                     | read                |
-      | Advanced permissions | Viewer         | share             | share                 | read, share         |
-      | Advanced permissions | Editor         | update            | ,                     | read, update        |
-      | Advanced permissions | Editor         | share, update     | share                 | read, update, share |
+      | role                 | displayed-role       | extra-permissions | displayed-permissions | actual-permissions  |
+      | Viewer               | Viewer               | ,                 | ,                     | read                |
+      | Editor               | Editor               | ,                 | ,                     | read, update        |
+      | Advanced permissions | Viewer               | ,                 | ,                     | read                |
+      | Advanced permissions | Advanced permissions | update            | update                | read, update        |
diff --git a/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature b/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature
index 204697d60de..ceb726d5d36 100644
--- a/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature
+++ b/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature
@@ -65,10 +65,10 @@ Feature: Sharing files and folders with internal groups
     Then folder "simple-folder" should be marked as shared by "User Three" on the webUI
     And file "testimage.jpg" should be marked as shared by "User Three" on the webUI
     Examples:
-      | set-role             | expected-role | permissions-folder         | permissions-file |
-      | Viewer               | Viewer        | read                       | read             |
-      | Editor               | Editor        | read,update,create, delete | read,update      |
-      | Advanced permissions | Viewer        | read                       | read             |
+      | set-role             | expected-role        | permissions-folder              | permissions-file  |
+      | Viewer               | Viewer               | read,share                      | read,share        |
+      | Editor               | Editor               | read,update,create,delete,share | read,update,share |
+      | Advanced permissions | Advanced permissions | read                            | read              |
 
   @skip @issue-4102
   Scenario: share a file with an internal group a member overwrites and unshares the file
diff --git a/tests/acceptance/features/webUISharingInternalGroupsToRoot/shareWithGroups.feature b/tests/acceptance/features/webUISharingInternalGroupsToRoot/shareWithGroups.feature
index 924d04271a4..75dfd41f54c 100644
--- a/tests/acceptance/features/webUISharingInternalGroupsToRoot/shareWithGroups.feature
+++ b/tests/acceptance/features/webUISharingInternalGroupsToRoot/shareWithGroups.feature
@@ -59,10 +59,10 @@ Feature: Sharing files and folders with internal groups
     Then folder "simple-folder (2)" should be marked as shared by "User Three" on the webUI
     And file "testimage (2).jpg" should be marked as shared by "User Three" on the webUI
     Examples:
-      | set-role             | expected-role | permissions-folder         | permissions-file |
-      | Viewer               | Viewer        | read                       | read             |
-      | Editor               | Editor        | read,update,create, delete | read,update      |
-      | Advanced permissions | Viewer        | read                       | read             |
+      | set-role             | expected-role        | permissions-folder              | permissions-file       |
+      | Viewer               | Viewer               | read,share                      | read,share             |
+      | Editor               | Editor               | read,update,create,delete,share | read,update,share      |
+      | Advanced permissions | Advanced permissions | read                            | read                   |
 
   Scenario: share a file with an internal group a member overwrites and unshares the file
     Given user "user3" has logged in using the webUI
diff --git a/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature b/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
index f2ef3905e7e..df63469bfc2 100644
--- a/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
+++ b/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
@@ -51,10 +51,10 @@ Feature: Sharing files and folders with internal users
     #    And folder "simple-folder (2)" should be marked as shared by "User Two" on the webUI
     #    And file "testimage (2).jpg" should be marked as shared by "User Two" on the webUI
     Examples:
-      | set-role             | expected-role | permissions-folder        | permissions-file |
-      | Viewer               | Viewer        | read                      | read             |
-      | Editor               | Editor        | read,update,create,delete | read,update      |
-      | Advanced permissions | Viewer        | read                      | read             |
+      | set-role             | expected-role               | permissions-folder              | permissions-file  |
+      | Viewer               | Viewer                      | read,share                      | read, share       |
+      | Editor               | Editor                      | read,update,create,delete,share | read,update,share |
+      | Advanced permissions | Advanced permissions        | read                            | read              |
 
   @skipOnOCIS @issue-product-203
   Scenario Outline: change the collaborators of a file & folder
@@ -74,11 +74,11 @@ Feature: Sharing files and folders with internal users
       | item_type   | folder                 |
       | permissions | <expected-permissions> |
     Examples:
-      | initial-permissions | set-role             | expected-role | expected-permissions      |
-      | read,update,create  | Viewer               | Viewer        | read                      |
-      | read                | Editor               | Editor        | read,update,create,delete |
-      | read                | Advanced permissions | Viewer        | read                      |
-      | all                 | Advanced permissions | Editor        | all                       |
+      | initial-permissions | set-role             | expected-role        | expected-permissions            |
+      | read,update,create  | Viewer               | Viewer               | read,share                      |
+      | read                | Editor               | Editor               | read,update,create,delete,share |
+      | read                | Advanced permissions | Advanced permissions | read                            |
+      | all                 | Advanced permissions | Editor               | all                             |
 
   @skipOnOC10 @issue-product-203
   #after fixing the issue delete this scenario and use the one above by deleting the @skipOnOCIS tag there
@@ -713,7 +713,7 @@ Feature: Sharing files and folders with internal users
     And user "user2" has accepted the share "simple-folder" offered by user "user1"
     When user "user2" logs in using the webUI
     And the user opens folder "Shares" using the webUI
-    Then user "User Two" should be listed as "Editor" in the collaborators list for folder "simple-folder (2)" on the webUI
+    Then user "User Two" should be listed as "Advanced permissions" in the collaborators list for folder "simple-folder (2)" on the webUI
 
   @skipOnOCIS @issue-4169
   Scenario: share a file with another internal user which should expire after 2 days
@@ -949,7 +949,7 @@ Feature: Sharing files and folders with internal users
       | share_with  | user2                 |
       | file_target | /Shares/simple-folder |
       | item_type   | folder                |
-      | permissions | read                  |
+      | permissions | read,share            |
 
   @skipOnOCIS @issue-product-203
   Scenario Outline: Share files/folders with special characters in their name
@@ -983,10 +983,10 @@ Feature: Sharing files and folders with internal users
       | Sample,Folder,With,Comma |
       | sample,1.txt             |
     Examples:
-      | set-role             | expected-role | permissions-folder        | permissions-file |
-      | Viewer               | Viewer        | read                      | read             |
-      | Editor               | Editor        | read,update,create,delete | read,update      |
-      | Advanced permissions | Viewer        | read                      | read             |
+      | set-role             | expected-role        | permissions-folder              | permissions-file  |
+      | Viewer               | Viewer               | read,share                      | read,share        |
+      | Editor               | Editor               | read,update,create,delete,share | read,update,share |
+      | Advanced permissions | Advanced permissions | read                            | read              |
 
   @skipOnOC10 @issue-product-203
   #after fixing the issue delete this scenario and use the one above by deleting the @skipOnOCIS tag there
diff --git a/tests/acceptance/features/webUISharingInternalUsersToRoot/shareWithUsers.feature b/tests/acceptance/features/webUISharingInternalUsersToRoot/shareWithUsers.feature
index fd062affc40..a26518d1e13 100644
--- a/tests/acceptance/features/webUISharingInternalUsersToRoot/shareWithUsers.feature
+++ b/tests/acceptance/features/webUISharingInternalUsersToRoot/shareWithUsers.feature
@@ -46,10 +46,10 @@ Feature: Sharing files and folders with internal users
     #    And folder "simple-folder (2)" should be marked as shared by "User Two" on the webUI
     #    And file "testimage (2).jpg" should be marked as shared by "User Two" on the webUI
     Examples:
-      | set-role             | expected-role | permissions-folder        | permissions-file |
-      | Viewer               | Viewer        | read                      | read             |
-      | Editor               | Editor        | read,update,create,delete | read,update      |
-      | Advanced permissions | Viewer        | read                      | read             |
+      | set-role             | expected-role        | permissions-folder              | permissions-file       |
+      | Viewer               | Viewer               | read,share                      | read,share             |
+      | Editor               | Editor               | read,update,create,delete,share | read,update,share      |
+      | Advanced permissions | Advanced permissions | read                            | read                   |
 
   Scenario Outline: change the collaborators of a file & folder
     Given user "user2" has logged in using the webUI
@@ -67,11 +67,11 @@ Feature: Sharing files and folders with internal users
       | item_type   | folder                 |
       | permissions | <expected-permissions> |
     Examples:
-      | initial-permissions | set-role             | expected-role | expected-permissions      |
-      | read,update,create  | Viewer               | Viewer        | read                      |
-      | read                | Editor               | Editor        | read,update,create,delete |
-      | read                | Advanced permissions | Viewer        | read                      |
-      | all                 | Advanced permissions | Editor        | all                       |
+      | initial-permissions | set-role             | expected-role        | expected-permissions            |
+      | read,update,create  | Viewer               | Viewer               | read,share                      |
+      | read                | Editor               | Editor               | read,update,create,delete,share |
+      | read                | Advanced permissions | Advanced permissions | read                            |
+      | all                 | Advanced permissions | Editor               | all                             |
 
   Scenario: share a file with another internal user who overwrites and unshares the file
     Given user "user2" has logged in using the webUI
@@ -805,7 +805,7 @@ Feature: Sharing files and folders with internal users
       | share_with  | user2                |
       | file_target | /simple-folder (2)   |
       | item_type   | folder               |
-      | permissions | read                 |
+      | permissions | read,share           |
 
     Scenario Outline: Share files/folders with special characters in their name
       Given user "user2" has created folder "Sample,Folder,With,Comma"
@@ -835,7 +835,7 @@ Feature: Sharing files and folders with internal users
         | Sample,Folder,With,Comma |
         | sample,1.txt             |
       Examples:
-        | set-role             | expected-role | permissions-folder        | permissions-file |
-        | Viewer               | Viewer        | read                      | read             |
-        | Editor               | Editor        | read,update,create,delete | read,update      |
-        | Advanced permissions | Viewer        | read                      | read             |
+        | set-role             | expected-role        | permissions-folder              | permissions-file       |
+        | Viewer               | Viewer               | read,share                      | read,share             |
+        | Editor               | Editor               | read,update,create,delete,share | read,update,share      |
+        | Advanced permissions | Advanced permissions | read                            | read                   |

From de8c42f490a53b414e764363f3587b8f718ab84c Mon Sep 17 00:00:00 2001
From: Lukas Hirt <lukashirt@mail.com>
Date: Thu, 22 Oct 2020 23:32:26 +0200
Subject: [PATCH 05/15] Adjust share permissions tests

---
 .../sharePermissionsUsers.feature             | 173 +++++++++---------
 1 file changed, 91 insertions(+), 82 deletions(-)

diff --git a/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature b/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature
index 74005d5900c..7078aa633d6 100644
--- a/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature
+++ b/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature
@@ -19,8 +19,7 @@ Feature: Sharing files and folders with internal users with different permission
     And user "user2" has logged in using the webUI
     Then no custom permissions should be set for collaborator "User One" for folder "simple-folder" on the webUI
     When the user sets custom permission for current role of collaborator "User One" for folder "simple-folder" to "share" using the webUI
-    Then custom permission "share" should be set for user "User One" for folder "simple-folder" on the webUI
-    And user "user1" should have received a share with these details:
+    Then user "user1" should have received a share with these details:
       | field       | value                 |
       | uid_owner   | user2                 |
       | share_with  | user1                 |
@@ -31,19 +30,19 @@ Feature: Sharing files and folders with internal users with different permission
   @skipOnOC10 @issue-product-203 @issue-ocis-717
   #after fixing the issue delete this scenario and use the one above by deleting the @skipOnOCIS tag there
   Scenario: Change permissions of the previously shared folder
-    Given user "user2" has shared folder "simple-folder" with user "user1" with "read" permissions
+    Given user "user2" has shared folder "simple-folder" with user "user1" with "read, update" permissions
     And user "user1" has accepted the share "simple-folder" offered by user "user2"
     And user "user2" has logged in using the webUI
-    Then no custom permissions should be set for collaborator "User One" for folder "simple-folder" on the webUI
-    When the user sets custom permission for current role of collaborator "User One" for folder "simple-folder" to "share" using the webUI
-    Then custom permission "share" should be set for user "User One" for folder "simple-folder" on the webUI
+    Then custom permission "update" should be set for user "User One" for folder "simple-folder" on the webUI
+    When the user sets custom permission for current role of collaborator "User One" for folder "simple-folder" to "create" using the webUI
+    Then custom permission "create" should be set for user "User One" for folder "simple-folder" on the webUI
     And user "user1" should have received a share with these details:
-      | field       | value          |
-      | uid_owner   | user2          |
-      | share_with  | user1          |
-      | file_target | /simple-folder |
-      | item_type   | folder         |
-      | permissions | read, share    |
+      | field       | value                |
+      | uid_owner   | user2                |
+      | share_with  | user1                |
+      | file_target | /simple-folder       |
+      | item_type   | folder               |
+      | permissions | read, update, create |
 
   @issue-1853
   @skipOnOCIS @issue-product-270
@@ -111,11 +110,11 @@ Feature: Sharing files and folders with internal users with different permission
       | permissions | <permissions>         |
     Examples:
       | role                 | displayed-role          | extra-permissions             | displayed-permissions | permissions                         |
-      | Viewer               | Viewer                  | share                         | share                 | read, share                         |
-      | Editor               | Editor                  | share                         | share                 | all                                 |
+      | Viewer               | Viewer                  | ,                             | ,                     | read, share                         |
+      | Editor               | Editor                  | ,                             | ,                     | all                                 |
       | Advanced permissions | Advanced permissions    | share, create                 | share, create         | read, share, create                 |
       | Advanced permissions | Advanced permissions    | update, share                 | share, update         | read, update, share                 |
-      | Advanced permissions | Editor                  | delete, share, create, update | share                 | read, share, delete, update, create |
+      | Advanced permissions | Editor                  | delete, share, create, update | ,                     | read, share, delete, update, create |
 
   @skipOnOC10 @issue-product-203
   #after fixing the issue delete this scenario and use the one above by deleting the @skipOnOCIS tag there
@@ -133,22 +132,21 @@ Feature: Sharing files and folders with internal users with different permission
       | item_type   | folder         |
       | permissions | <permissions>  |
     Examples:
-      | role                 | displayed-role       | extra-permissions             | displayed-permissions | permissions                         |
-      | Viewer               | Viewer               | share                         | share                 | read, share                         |
-      | Editor               | Editor               | share                         | share                 | all                                 |
-      | Advanced permissions | Advanced permissions | share, create                 | share, create, update | read, share, create, update         |
-      | Advanced permissions | Advanced permissions | update, share                 | share, update         | read, update, share                 |
-      | Advanced permissions | Editor               | delete, share, create, update | share                 | read, share, delete, update, create |
+      | role                 | displayed-role       | extra-permissions             | displayed-permissions | permissions                  |
+      | Viewer               | Viewer               | ,                             | ,                     | read                         |
+      | Editor               | Editor               | ,                             | ,                     | all                          |
+      | Advanced permissions | Advanced permissions | create                        | create                | read                         |
+      | Advanced permissions | Advanced permissions | update                        | update                | read, update                 |
+      | Advanced permissions | Editor               | delete, create, update        | ,                     | read, delete, update, create |
 
   @skipOnOCIS @issue-product-203
   Scenario Outline: Change permissions of the previously shared file
     Given user "user2" has shared file "lorem.txt" with user "user1" with "<initial-permissions>" permissions
     And user "user1" has accepted the share "lorem.txt" offered by user "user2"
     And user "user2" has logged in using the webUI
-    Then no custom permissions should be set for collaborator "User One" for file "lorem.txt" on the webUI
+    Then custom permission "<displayed-permissions>" should be set for user "User One" for file "lorem.txt" on the webUI
     When the user sets custom permission for current role of collaborator "User One" for file "lorem.txt" to "share" using the webUI
-    Then custom permission "share" should be set for user "User One" for file "lorem.txt" on the webUI
-    And user "user1" should have received a share with these details:
+    Then user "user1" should have received a share with these details:
       | field       | value             |
       | uid_owner   | user2             |
       | share_with  | user1             |
@@ -156,63 +154,64 @@ Feature: Sharing files and folders with internal users with different permission
       | item_type   | file              |
       | permissions | <permissions>     |
     Examples:
-      | initial-permissions | permissions         |
-      | read, update        | read, share, update |
-      | read                | read, share         |
+      | initial-permissions | permissions         | displayed-permissions |
+      | read, update        | read, share         | update                |
+      | read                | read, share         | ,                     |
 
-  @skipOnOC10 @issue-product-203
-  #after fixing the issue delete this scenario and use the one above by deleting the @skipOnOCIS tag there
-  Scenario Outline: Change permissions of the previously shared file
-    Given user "user2" has shared file "lorem.txt" with user "user1" with "<initial-permissions>" permissions
-    And user "user1" has accepted the share "lorem.txt" offered by user "user2"
-    And user "user2" has logged in using the webUI
-    Then no custom permissions should be set for collaborator "User One" for file "lorem.txt" on the webUI
-    When the user sets custom permission for current role of collaborator "User One" for file "lorem.txt" to "share" using the webUI
-    Then custom permission "share" should be set for user "User One" for file "lorem.txt" on the webUI
-    And user "user1" should have received a share with these details:
-      | field       | value         |
-      | uid_owner   | user2         |
-      | share_with  | user1         |
-      | file_target | /lorem.txt    |
-      | item_type   | file          |
-      | permissions | <permissions> |
-    Examples:
-      | initial-permissions | permissions         |
-      | read, update        | read, share, update |
-      | read                | read, share         |
+  #  As the reshare permission has been hidden in oCIS there's no use for this scenario at the moment
+  # @skipOnOC10 @issue-product-203
+  # #after fixing the issue delete this scenario and use the one above by deleting the @skipOnOCIS tag there
+  # Scenario Outline: Change permissions of the previously shared file
+  #   Given user "user2" has shared file "lorem.txt" with user "user1" with "<initial-permissions>" permissions
+  #   And user "user1" has accepted the share "lorem.txt" offered by user "user2"
+  #   And user "user2" has logged in using the webUI
+  #   Then no custom permissions should be set for collaborator "User One" for file "lorem.txt" on the webUI
+  #   When the user sets custom permission for current role of collaborator "User One" for file "lorem.txt" to "share" using the webUI
+  #   Then custom permission "share" should be set for user "User One" for file "lorem.txt" on the webUI
+  #   And user "user1" should have received a share with these details:
+  #     | field       | value         |
+  #     | uid_owner   | user2         |
+  #     | share_with  | user1         |
+  #     | file_target | /lorem.txt    |
+  #     | item_type   | file          |
+  #     | permissions | <permissions> |
+  #   Examples:
+  #     | initial-permissions | permissions         |
+  #     | read, update        | read, share, update |
+  #     | read                | read, share         |
 
   @skipOnOCIS @issue-product-203
-  Scenario: Delete all custom permissions of the previously shared file
-    Given user "user2" has shared file "lorem.txt" with user "user1" with "read, share" permissions
-    And user "user1" has accepted the share "lorem.txt" offered by user "user2"
+  Scenario: Delete all custom permissions of the previously shared folder
+    Given user "user2" has shared folder "simple-folder" with user "user1" with "read, update" permissions
+    And user "user1" has accepted the share "simple-folder" offered by user "user2"
     And user "user2" has logged in using the webUI
-    Then custom permissions "share" should be set for user "User One" for file "lorem.txt" on the webUI
-    When the user disables all the custom permissions of collaborator "User One" for file "lorem.txt" using the webUI
-    Then no custom permissions should be set for collaborator "User One" for file "lorem.txt" on the webUI
+    When the user disables all the custom permissions of collaborator "User One" for folder "simple-folder" using the webUI
+    Then no custom permissions should be set for collaborator "User One" for folder "simple-folder" on the webUI
     And user "user1" should have received a share with these details:
-      | field       | value             |
-      | uid_owner   | user2             |
-      | share_with  | user1             |
-      | file_target | /Shares/lorem.txt |
-      | item_type   | file              |
-      | permissions | read              |
+      | field       | value                 |
+      | uid_owner   | user2                 |
+      | share_with  | user1                 |
+      | file_target | /Shares/simple-folder |
+      | item_type   | folder                |
+      | permissions | read                  |
 
-  @skipOnOC10 @issue-product-203
-  #after fixing the issue delete this scenario and use the one above by deleting the @skipOnOCIS tag there
-  Scenario: Delete all custom permissions of the previously shared file
-    Given user "user2" has shared file "lorem.txt" with user "user1" with "read, share" permissions
-    And user "user1" has accepted the share "lorem.txt" offered by user "user2"
-    And user "user2" has logged in using the webUI
-    Then custom permissions "share" should be set for user "User One" for file "lorem.txt" on the webUI
-    When the user disables all the custom permissions of collaborator "User One" for file "lorem.txt" using the webUI
-    Then no custom permissions should be set for collaborator "User One" for file "lorem.txt" on the webUI
-    And user "user1" should have received a share with these details:
-      | field       | value      |
-      | uid_owner   | user2      |
-      | share_with  | user1      |
-      | file_target | /lorem.txt |
-      | item_type   | file       |
-      | permissions | read       |
+  #  As the reshare permission has been hidden in oCIS there's no use for this scenario at the moment
+  # @skipOnOC10 @issue-product-203
+  # #after fixing the issue delete this scenario and use the one above by deleting the @skipOnOCIS tag there
+  # Scenario: Delete all custom permissions of the previously shared file
+  #   Given user "user2" has shared file "lorem.txt" with user "user1" with "read, share" permissions
+  #   And user "user1" has accepted the share "lorem.txt" offered by user "user2"
+  #   And user "user2" has logged in using the webUI
+  #   Then custom permissions "share" should be set for user "User One" for file "lorem.txt" on the webUI
+  #   When the user disables all the custom permissions of collaborator "User One" for file "lorem.txt" using the webUI
+  #   Then no custom permissions should be set for collaborator "User One" for file "lorem.txt" on the webUI
+  #   And user "user1" should have received a share with these details:
+  #     | field       | value      |
+  #     | uid_owner   | user2      |
+  #     | share_with  | user1      |
+  #     | file_target | /lorem.txt |
+  #     | item_type   | file       |
+  #     | permissions | read       |
 
   @skipOnOCIS @issue-product-203
   Scenario Outline: share a file with another internal user assigning a role and the permissions
@@ -230,9 +229,9 @@ Feature: Sharing files and folders with internal users with different permission
       | permissions | <permissions>     |
     Examples:
       | role                 | displayed-role | collaborators-permissions | displayed-permissions | permissions         |
-      | Viewer               | Viewer         | share                     | share                 | read, share         |
-      | Editor               | Editor         | share                     | share                 | read, share, update |
-      | Advanced permissions | Editor         | share, update             | share                 | read, share, update |
+      | Viewer               | Viewer         | ,                         | ,                     | read, share         |
+      | Editor               | Editor         | ,                         | ,                     | read, share, update |
+      | Advanced permissions | Editor         | share, update             | ,                     | read, share, update |
 
   @skipOnOC10 @issue-product-203
   #after fixing the issue delete this scenario and use the one above by deleting the @skipOnOCIS tag there
@@ -250,11 +249,21 @@ Feature: Sharing files and folders with internal users with different permission
       | item_type   | file          |
       | permissions | <permissions> |
     Examples:
-      | role                 | displayed-role | collaborators-permissions | displayed-permissions | permissions         |
-      | Viewer               | Viewer         | share                     | share                 | read, share         |
-      | Editor               | Editor         | share                     | share                 | read, share, update |
-      | Advanced permissions | Editor         | share, update             | share                 | read, share, update |
+      | role                 | displayed-role | collaborators-permissions | displayed-permissions | permissions  |
+      | Viewer               | Viewer         | ,                         | ,                     | read         |
+      | Editor               | Editor         | ,                         | ,                     | read, update |
+      | Advanced permissions | Editor         | update                    | ,                     | read, update |
+
+  @skipOnOCIS
+  Scenario: Share a folder without share permissions using API and check if it is listed on the collaborators list for original owner
+    Given user "user2" has shared folder "simple-folder" with user "user1" with "read" permissions
+    And user "user1" has accepted the share "simple-folder" offered by user "user2"
+    And user "user2" has logged in using the webUI
+    When the user opens the share dialog for folder "simple-folder" using the webUI
+    Then user "User One" should be listed as "Advanced permissions" in the collaborators list for folder "simple-folder" on the webUI
+    And no custom permissions should be set for collaborator "User One" for folder "simple-folder" on the webUI
 
+  @skipOnOC10
   Scenario: Share a folder without share permissions using API and check if it is listed on the collaborators list for original owner
     Given user "user2" has shared folder "simple-folder" with user "user1" with "read" permissions
     And user "user1" has accepted the share "simple-folder" offered by user "user2"

From 52435628ae1751465a158d1270de5d1ee3c650bf Mon Sep 17 00:00:00 2001
From: Lukas Hirt <lukashirt@mail.com>
Date: Fri, 23 Oct 2020 11:59:55 +0200
Subject: [PATCH 06/15] Adjust internal user sharing tests

---
 .../features/webUISharingInternalUsers/shareWithUsers.feature   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature b/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
index df63469bfc2..6c3cb76d552 100644
--- a/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
+++ b/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
@@ -77,7 +77,7 @@ Feature: Sharing files and folders with internal users
       | initial-permissions | set-role             | expected-role        | expected-permissions            |
       | read,update,create  | Viewer               | Viewer               | read,share                      |
       | read                | Editor               | Editor               | read,update,create,delete,share |
-      | read                | Advanced permissions | Advanced permissions | read                            |
+      | read,share          | Advanced permissions | Viewer               | read,share                      |
       | all                 | Advanced permissions | Editor               | all                             |
 
   @skipOnOC10 @issue-product-203

From 9f23ebab6f93ba88e6d7708b3f399ab5c7efbc83 Mon Sep 17 00:00:00 2001
From: Lukas Hirt <lukashirt@mail.com>
Date: Fri, 23 Oct 2020 12:34:07 +0200
Subject: [PATCH 07/15] Adjust internal shares to roots tests

---
 .../webUISharingInternalUsersToRoot/shareWithUsers.feature    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/acceptance/features/webUISharingInternalUsersToRoot/shareWithUsers.feature b/tests/acceptance/features/webUISharingInternalUsersToRoot/shareWithUsers.feature
index a26518d1e13..a6f07536c51 100644
--- a/tests/acceptance/features/webUISharingInternalUsersToRoot/shareWithUsers.feature
+++ b/tests/acceptance/features/webUISharingInternalUsersToRoot/shareWithUsers.feature
@@ -70,7 +70,7 @@ Feature: Sharing files and folders with internal users
       | initial-permissions | set-role             | expected-role        | expected-permissions            |
       | read,update,create  | Viewer               | Viewer               | read,share                      |
       | read                | Editor               | Editor               | read,update,create,delete,share |
-      | read                | Advanced permissions | Advanced permissions | read                            |
+      | read,share          | Advanced permissions | Viewer               | read,share                      |
       | all                 | Advanced permissions | Editor               | all                             |
 
   Scenario: share a file with another internal user who overwrites and unshares the file
@@ -589,7 +589,7 @@ Feature: Sharing files and folders with internal users
     And user "user1" has shared folder "simple-folder" with user "user2" with "read" permission
     And user "user1" has shared folder "simple-folder" with group "grp1" with "read,update,create,delete" permissions
     When user "user2" has logged in using the webUI
-    Then user "User Two" should be listed as "Editor" in the collaborators list for folder "simple-folder (2)" on the webUI
+    Then user "User Two" should be listed as "Advanced permissions" in the collaborators list for folder "simple-folder (2)" on the webUI
 
   Scenario: share a file with another internal user which should expire after 2 days
     Given user "user1" has logged in using the webUI

From e3b95c61cddae83d81318a21423d89dbffe1cc1d Mon Sep 17 00:00:00 2001
From: Lukas Hirt <lukashirt@mail.com>
Date: Fri, 23 Oct 2020 12:48:07 +0200
Subject: [PATCH 08/15] Adjust group share permissions tests

---
 .../sharePermissionsGroup.feature                 | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/tests/acceptance/features/webUISharingFilePermissionsGroups/sharePermissionsGroup.feature b/tests/acceptance/features/webUISharingFilePermissionsGroups/sharePermissionsGroup.feature
index fc969cdcf18..6401f075c28 100644
--- a/tests/acceptance/features/webUISharingFilePermissionsGroups/sharePermissionsGroup.feature
+++ b/tests/acceptance/features/webUISharingFilePermissionsGroups/sharePermissionsGroup.feature
@@ -55,12 +55,9 @@ Feature: Sharing files with internal groups with permissions
     But group "grp1" should not be listed in the collaborators list on the webUI
     And as "user1" file "/Shares/lorem.txt" should not exist
     Examples:
-    | role                 | displayed-role | extra-permissions | displayed-permissions | actual-permissions  |
-    | Viewer               | Viewer         | share             | share                 | read, share         |
-    | Viewer               | Viewer         | ,                 | ,                     | read                |
-    | Editor               | Editor         | share             | share                 | share, read, update |
-    | Editor               | Editor         | ,                 | ,                     | read, update        |
-    | Advanced permissions | Viewer         | ,                 | ,                     | read                |
-    | Advanced permissions | Viewer         | share             | share                 | read, share         |
-    | Advanced permissions | Editor         | update            | ,                     | read, update        |
-    | Advanced permissions | Editor         | share, update     | share                 | read, update, share |
+    | role                 | displayed-role               | extra-permissions | displayed-permissions | actual-permissions  |
+    | Viewer               | Viewer                       | ,                 | ,                     | read, share         |
+    | Editor               | Editor                       | ,                 | ,                     | share, read, update |
+    | Advanced permissions | Advanced permissions         | ,                 | ,                     | read                |
+    | Advanced permissions | Viewer                       | share             | ,                     | read, share         |
+    | Advanced permissions | Editor                       | share, update     | ,                     | read, update, share |

From 801f5060ae4dc3a298c384fcc1c4181b76501a35 Mon Sep 17 00:00:00 2001
From: Lukas Hirt <lukashirt@mail.com>
Date: Fri, 23 Oct 2020 12:56:30 +0200
Subject: [PATCH 09/15] Adjust shared folder group permissions

---
 .../sharePermissionsGroup.feature                | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/tests/acceptance/features/webUISharingFolderPermissionsGroups/sharePermissionsGroup.feature b/tests/acceptance/features/webUISharingFolderPermissionsGroups/sharePermissionsGroup.feature
index ba40f818a89..35f949fe2cd 100644
--- a/tests/acceptance/features/webUISharingFolderPermissionsGroups/sharePermissionsGroup.feature
+++ b/tests/acceptance/features/webUISharingFolderPermissionsGroups/sharePermissionsGroup.feature
@@ -56,12 +56,10 @@ Feature: Sharing folders with internal groups with different roles and permissio
     But group "grp1" should not be listed in the collaborators list on the webUI
     And as "user1" folder "/Shares/simple-folder" should not exist
     Examples:
-    | role                 | displayed-role          | extra-permissions             | displayed-permissions | actual-permissions           |
-    | Viewer               | Viewer                  | share                         | share                 | read, share                  |
-    | Viewer               | Viewer                  | ,                             | ,                     | read                         |
-    | Editor               | Editor                  | share                         | share                 | all                          |
-    | Editor               | Editor                  | ,                             | ,                     | read, update, delete, create |
-    | Advanced permissions | Viewer                  | ,                             | ,                     | read                         |
-    | Advanced permissions | Viewer                  | share                         | share                 | read, share                  |
-    | Advanced permissions | Editor                  | delete, update, create        | ,                     | read, delete, update, create |
-    | Advanced permissions | Editor                  | share, delete, update, create | share                 | all                          |
+    | role                 | displayed-role       | extra-permissions             | displayed-permissions  | actual-permissions           |
+    | Viewer               | Viewer               | ,                             | ,                      | read, share                  |
+    | Editor               | Editor               | ,                             | ,                      | all                          |
+    | Advanced permissions | Advanced permissions | ,                             | ,                      | read                         |
+    | Advanced permissions | Viewer               | share                         | ,                      | read, share                  |
+    | Advanced permissions | Advanced permissions | delete, update, create        | delete, update, create | read, delete, update, create |
+    | Advanced permissions | Editor               | share, delete, update, create | ,                      | all                          |

From 85084efca554bcfedf68935069029d07814a6ee8 Mon Sep 17 00:00:00 2001
From: Lukas Hirt <lukashirt@mail.com>
Date: Fri, 23 Oct 2020 14:23:34 +0200
Subject: [PATCH 10/15] Adjust sharing root permissions tests

---
 .../shareFileWithMultipleUsers.feature        |  2 +-
 .../shareFolderWithMultipleUsers.feature      |  2 +-
 .../sharePermissionsFileGroup.feature         |  2 +-
 .../sharePermissionsFoldersGroup.feature      |  2 +-
 .../sharePermissionsUsers.feature             | 66 +++++++++----------
 5 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/tests/acceptance/features/webUISharingPermissionToRoot/shareFileWithMultipleUsers.feature b/tests/acceptance/features/webUISharingPermissionToRoot/shareFileWithMultipleUsers.feature
index 8e9c6e8b06b..507809cf1e0 100644
--- a/tests/acceptance/features/webUISharingPermissionToRoot/shareFileWithMultipleUsers.feature
+++ b/tests/acceptance/features/webUISharingPermissionToRoot/shareFileWithMultipleUsers.feature
@@ -59,4 +59,4 @@ Feature: Sharing files with multiple internal users with different permissions
       # | Advanced permissions | Viewer         | ,                 | ,                     | read                |
       # | Advanced permissions | Viewer         | share             | share                 | read, share         |
       # | Advanced permissions | Editor         | update            | ,                     | read, update        |
-      | Advanced permissions | Editor         | share, update     | share                 | read, update, share |
+      | Advanced permissions | Editor         | share, update     | ,                     | read, update, share |
diff --git a/tests/acceptance/features/webUISharingPermissionToRoot/shareFolderWithMultipleUsers.feature b/tests/acceptance/features/webUISharingPermissionToRoot/shareFolderWithMultipleUsers.feature
index a30015be5a8..9df635f2d95 100644
--- a/tests/acceptance/features/webUISharingPermissionToRoot/shareFolderWithMultipleUsers.feature
+++ b/tests/acceptance/features/webUISharingPermissionToRoot/shareFolderWithMultipleUsers.feature
@@ -59,4 +59,4 @@ Feature: Sharing folders with multiple internal users with different permissions
       # | Advanced permissions | Viewer                  | ,                             | ,                     | read                         |
       # | Advanced permissions | Viewer                  | share                         | share                 | read, share                  |
       # | Advanced permissions | Editor                  | delete, update, create        | ,                     | read, delete, update, create |
-      | Advanced permissions | Editor                  | share, delete, update, create | share                 | all                          |
+      | Advanced permissions | Editor                  | share, delete, update, create | ,                     | all                          |
diff --git a/tests/acceptance/features/webUISharingPermissionToRoot/sharePermissionsFileGroup.feature b/tests/acceptance/features/webUISharingPermissionToRoot/sharePermissionsFileGroup.feature
index bf62aa183e6..225c8928b4d 100644
--- a/tests/acceptance/features/webUISharingPermissionToRoot/sharePermissionsFileGroup.feature
+++ b/tests/acceptance/features/webUISharingPermissionToRoot/sharePermissionsFileGroup.feature
@@ -59,4 +59,4 @@ Feature: Sharing files with internal groups with permissions
     # | Advanced permissions | Viewer         | ,                 | ,                     | read                |
     # | Advanced permissions | Viewer         | share             | share                 | read, share         |
     # | Advanced permissions | Editor         | update            | ,                     | read, update        |
-    | Advanced permissions | Editor         | share, update     | share                 | read, update, share |
+    | Advanced permissions | Editor         | share, update     | ,                     | read, update, share |
diff --git a/tests/acceptance/features/webUISharingPermissionToRoot/sharePermissionsFoldersGroup.feature b/tests/acceptance/features/webUISharingPermissionToRoot/sharePermissionsFoldersGroup.feature
index 80b1ce71c52..300a09eccf0 100644
--- a/tests/acceptance/features/webUISharingPermissionToRoot/sharePermissionsFoldersGroup.feature
+++ b/tests/acceptance/features/webUISharingPermissionToRoot/sharePermissionsFoldersGroup.feature
@@ -60,4 +60,4 @@ Feature: Sharing folders with internal groups with different roles and permissio
     # | Advanced permissions | Viewer                  | ,                             | ,                     | read                         |
     # | Advanced permissions | Viewer                  | share                         | share                 | read, share                  |
     # | Advanced permissions | Editor                  | delete, update, create        | ,                     | read, delete, update, create |
-    | Advanced permissions | Editor                  | share, delete, update, create | share                 | all                          |
+    | Advanced permissions | Editor                  | share, delete, update, create | ,                     | all                          |
diff --git a/tests/acceptance/features/webUISharingPermissionToRoot/sharePermissionsUsers.feature b/tests/acceptance/features/webUISharingPermissionToRoot/sharePermissionsUsers.feature
index 12668dba326..371381b533a 100644
--- a/tests/acceptance/features/webUISharingPermissionToRoot/sharePermissionsUsers.feature
+++ b/tests/acceptance/features/webUISharingPermissionToRoot/sharePermissionsUsers.feature
@@ -11,18 +11,18 @@ Feature: Sharing files and folders with internal users with different permission
       | user2    |
 
   Scenario: Change permissions of the previously shared folder
-    Given user "user2" has shared folder "simple-folder" with user "user1" with "read" permissions
+    Given user "user2" has shared folder "simple-folder" with user "user1" with "read, update" permissions
     And user "user2" has logged in using the webUI
-    Then no custom permissions should be set for collaborator "User One" for folder "simple-folder" on the webUI
-    When the user sets custom permission for current role of collaborator "User One" for folder "simple-folder" to "share" using the webUI
-    Then custom permission "share" should be set for user "User One" for folder "simple-folder" on the webUI
+    Then custom permission "update" should be set for user "User One" for folder "simple-folder" on the webUI
+    When the user sets custom permission for current role of collaborator "User One" for folder "simple-folder" to "share, update" using the webUI
+    Then custom permissions "share, update" should be set for user "User One" for folder "simple-folder" on the webUI
     And user "user1" should have received a share with these details:
-      | field       | value              |
-      | uid_owner   | user2              |
-      | share_with  | user1              |
-      | file_target | /simple-folder (2) |
-      | item_type   | folder             |
-      | permissions | read, share        |
+      | field       | value               |
+      | uid_owner   | user2               |
+      | share_with  | user1               |
+      | file_target | /simple-folder (2)  |
+      | item_type   | folder              |
+      | permissions | read, share, update |
 
   @issue-1853
   Scenario: Change permissions of the previously shared folder
@@ -82,19 +82,18 @@ Feature: Sharing files and folders with internal users with different permission
       | permissions | <permissions>      |
     Examples:
       | role                 | displayed-role          | extra-permissions             | displayed-permissions | permissions                         |
-      | Viewer               | Viewer                  | share                         | share                 | read, share                         |
-      | Editor               | Editor                  | share                         | share                 | all                                 |
+      | Viewer               | Viewer                  | ,                             | ,                     | read, share                         |
+      | Editor               | Editor                  | ,                             | ,                     | all                                 |
       | Advanced permissions | Advanced permissions    | share, create                 | share, create         | read, share, create                 |
       | Advanced permissions | Advanced permissions    | update, share                 | share, update         | read, update, share                 |
-      | Advanced permissions | Editor                  | delete, share, create, update | share                 | read, share, delete, update, create |
+      | Advanced permissions | Editor                  | delete, share, create, update | ,                     | read, share, delete, update, create |
 
   Scenario Outline: Change permissions of the previously shared file
     Given user "user2" has shared file "lorem.txt" with user "user1" with "<initial-permissions>" permissions
     And user "user2" has logged in using the webUI
-    Then no custom permissions should be set for collaborator "User One" for file "lorem.txt" on the webUI
+    Then custom permissions "<set-permissions>" should be set for user "User One" for file "lorem.txt" on the webUI
     When the user sets custom permission for current role of collaborator "User One" for file "lorem.txt" to "share" using the webUI
-    Then custom permission "share" should be set for user "User One" for file "lorem.txt" on the webUI
-    And user "user1" should have received a share with these details:
+    Then user "user1" should have received a share with these details:
       | field       | value          |
       | uid_owner   | user2          |
       | share_with  | user1          |
@@ -102,23 +101,22 @@ Feature: Sharing files and folders with internal users with different permission
       | item_type   | file           |
       | permissions | <permissions>  |
     Examples:
-      | initial-permissions | permissions         |
-      | read, update        | read, share, update |
-      | read                | read, share         |
+      | initial-permissions | permissions         | set-permissions |
+      | read, update        | read, share         | update          |
+      | read                | read, share         | ,               |
 
-  Scenario: Delete all custom permissions of the previously shared file
-    Given user "user2" has shared file "lorem.txt" with user "user1" with "read, share" permissions
+  Scenario: Delete all custom permissions of the previously shared folder
+    Given user "user2" has shared file "simple-folder" with user "user1" with "read, share, update" permissions
     And user "user2" has logged in using the webUI
-    Then custom permissions "share" should be set for user "User One" for file "lorem.txt" on the webUI
-    When the user disables all the custom permissions of collaborator "User One" for file "lorem.txt" using the webUI
-    Then no custom permissions should be set for collaborator "User One" for file "lorem.txt" on the webUI
+    When the user disables all the custom permissions of collaborator "User One" for file "simple-folder" using the webUI
+    Then no custom permissions should be set for collaborator "User One" for file "simple-folder" on the webUI
     And user "user1" should have received a share with these details:
-      | field       | value          |
-      | uid_owner   | user2          |
-      | share_with  | user1          |
-      | file_target | /lorem (2).txt |
-      | item_type   | file           |
-      | permissions | read           |
+      | field       | value              |
+      | uid_owner   | user2              |
+      | share_with  | user1              |
+      | file_target | /simple-folder (2) |
+      | item_type   | folder             |
+      | permissions | read               |
 
   Scenario Outline: share a file with another internal user assigning a role and the permissions
     Given user "user2" has logged in using the webUI
@@ -134,15 +132,15 @@ Feature: Sharing files and folders with internal users with different permission
       | permissions | <permissions>  |
     Examples:
       | role                 | displayed-role | collaborators-permissions | displayed-permissions | permissions         |
-      | Viewer               | Viewer         | share                     | share                 | read, share         |
-      | Editor               | Editor         | share                     | share                 | read, share, update |
-      | Advanced permissions | Editor         | share, update             | share                 | read, share, update |
+      | Viewer               | Viewer         | ,                         | ,                     | read, share         |
+      | Editor               | Editor         | ,                         | ,                     | read, share, update |
+      | Advanced permissions | Editor         | share, update             | ,                     | read, share, update |
 
   Scenario: Share a folder without share permissions using API and check if it is listed on the collaborators list for original owner
     Given user "user2" has shared folder "simple-folder" with user "user1" with "read" permissions
     And user "user2" has logged in using the webUI
     When the user opens the share dialog for folder "simple-folder" using the webUI
-    Then user "User One" should be listed as "Viewer" in the collaborators list for folder "simple-folder" on the webUI
+    Then user "User One" should be listed as "Advanced permissions" in the collaborators list for folder "simple-folder" on the webUI
     And no custom permissions should be set for collaborator "User One" for folder "simple-folder" on the webUI
 
   Scenario: Resource owner upgrades share permissions of a re-share

From 460466190498a5e638c1b57d0b410f87ec7a7a43 Mon Sep 17 00:00:00 2001
From: Lukas Hirt <lukashirt@mail.com>
Date: Sun, 25 Oct 2020 21:38:36 +0100
Subject: [PATCH 11/15] Adjust reshare to root tests

---
 .../webUIResharingToRoot/reshareUsers.feature | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/tests/acceptance/features/webUIResharingToRoot/reshareUsers.feature b/tests/acceptance/features/webUIResharingToRoot/reshareUsers.feature
index 40fc4d3359e..9e19209d1e6 100644
--- a/tests/acceptance/features/webUIResharingToRoot/reshareUsers.feature
+++ b/tests/acceptance/features/webUIResharingToRoot/reshareUsers.feature
@@ -16,7 +16,7 @@ Feature: Resharing shared files with different permissions
       And user "user1" has shared folder "simple-folder (2)" with user "user3" with "read" permissions
       And user "user2" has logged in using the webUI
       When the user opens the share dialog for folder "simple-folder" using the webUI
-      Then user "User Three" should be listed as "Viewer" in the collaborators list for folder "simple-folder" on the webUI
+      Then user "User Three" should be listed as "Advanced permissions" in the collaborators list for folder "simple-folder" on the webUI
       And no custom permissions should be set for collaborator "User Three" for folder "simple-folder" on the webUI
 
   Scenario: Reshare a folder without share permissions using API and check if it is listed on the collaborators list for resharer
@@ -24,7 +24,7 @@ Feature: Resharing shared files with different permissions
       And user "user1" has shared folder "simple-folder (2)" with user "user3" with "read" permissions
       And user "user1" has logged in using the webUI
       When the user opens the share dialog for folder "simple-folder (2)" using the webUI
-      Then user "User Three" should be listed as "Viewer" in the collaborators list for folder "simple-folder (2)" on the webUI
+      Then user "User Three" should be listed as "Advanced permissions" in the collaborators list for folder "simple-folder (2)" on the webUI
       And no custom permissions should be set for collaborator "User Three" for folder "simple-folder (2)" on the webUI
 
   Scenario: Reshare a folder without share permissions using API and check if the receiver can reshare
@@ -48,11 +48,11 @@ Feature: Resharing shared files with different permissions
     | permissions | <permissions>      |
     Examples:
     | role                 | displayed-role          | collaborators-permissions     | displayed-permissions | permissions                         |
-    | Viewer               | Viewer                  | share                         | share                 | read, share                         |
-    | Editor               | Editor                  | share                         | share                 | all                                 |
+    | Viewer               | Viewer                  | ,                             | ,                     | read, share                         |
+    | Editor               | Editor                  | ,                             | ,                     | all                                 |
     | Advanced permissions | Advanced permissions    | share, create                 | share, create         | read, share, create                 |
     | Advanced permissions | Advanced permissions    | update, share                 | share, update         | read, update, share                 |
-    | Advanced permissions | Editor                  | delete, share, create, update | share                 | read, share, delete, update, create |
+    | Advanced permissions | Editor                  | delete, share, create, update | ,                     | read, share, delete, update, create |
 
   Scenario Outline: share a received folder with another user with same permissions(including share permissions) and check if the user is displayed in collaborators list for original owner
     Given user "user2" has shared folder "simple-folder" with user "user1" with "<permissions>" permissions
@@ -79,11 +79,11 @@ Feature: Resharing shared files with different permissions
     | permissions | <permissions>      |
     Examples:
     | role                 | displayed-role          | collaborators-permissions     | displayed-permissions | permissions                         |
-    | Viewer               | Viewer                  | share                         | share                 | read, share                         |
-    | Editor               | Editor                  | share                         | share                 | all                                 |
+    | Viewer               | Viewer                  | ,                             | ,                     | read, share                         |
+    | Editor               | Editor                  | ,                             | ,                     | all                                 |
     | Advanced permissions | Advanced permissions    | share, create                 | share, create         | read, share, create                 |
     | Advanced permissions | Advanced permissions    | update, share                 | share, update         | read, update, share                 |
-    | Advanced permissions | Editor                  | delete, share, create, update | share                 | read, share, delete, update, create |
+    | Advanced permissions | Editor                  | delete, share, create, update | ,                     | read, share, delete, update, create |
 
   Scenario: share a folder with another user with share permissions and reshare without share permissions to different user, and check if user is displayed for original sharer
     Given user "user2" has shared folder "simple-folder" with user "user1" with "read, share" permissions
@@ -93,7 +93,6 @@ Feature: Resharing shared files with different permissions
     Then user "User Three" should be listed as "Viewer" in the collaborators list for folder "simple-folder" on the webUI
     And no custom permissions should be set for collaborator "User Three" for folder "simple-folder" on the webUI
     And user "User One" should be listed as "Viewer" in the collaborators list for folder "simple-folder" on the webUI
-    And custom permissions "share" should be set for user "User One" for folder "simple-folder" on the webUI
     And user "user1" should have received a share with these details:
     | field       | value              |
     | uid_owner   | user2              |
@@ -107,7 +106,7 @@ Feature: Resharing shared files with different permissions
     | share_with  | user3              |
     | file_target | /simple-folder (2) |
     | item_type   | folder             |
-    | permissions | read               |
+    | permissions | read, share        |
 
   Scenario: share a folder with another user with share permissions and reshare without share permissions to different user, and check if user is displayed for the receiver
     Given user "user2" has shared folder "simple-folder" with user "user1" with "read, share" permissions
@@ -119,7 +118,7 @@ Feature: Resharing shared files with different permissions
     | share_with  | user3              |
     | file_target | /simple-folder (2) |
     | item_type   | folder             |
-    | permissions | read               |
+    | permissions | read, share        |
 
   Scenario Outline: share a file/folder without share permissions and check if another user can reshare
     Given user "user2" has shared folder "<shared-entry-name>" with user "user1" with "read" permissions

From d55f8193576dc6ffc2b28ab55cf848908fde12bb Mon Sep 17 00:00:00 2001
From: Lukas Hirt <lukashirt@mail.com>
Date: Sun, 25 Oct 2020 21:58:16 +0100
Subject: [PATCH 12/15] Adjust external sharing tests

---
 .../federationSharing.feature                 |  6 ++---
 .../federationSharing.feature                 |  6 ++---
 .../shareFolderWithMultipleUsers.feature      | 24 +++++++++----------
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/tests/acceptance/features/webUISharingExternal/federationSharing.feature b/tests/acceptance/features/webUISharingExternal/federationSharing.feature
index d02628ba7c1..c1011bf89b9 100644
--- a/tests/acceptance/features/webUISharingExternal/federationSharing.feature
+++ b/tests/acceptance/features/webUISharingExternal/federationSharing.feature
@@ -73,7 +73,7 @@ Feature: Federation Sharing - sharing with users on other cloud storages
       | uid_owner   | user1                      |
       | share_with  | user1@%remote_backend_url% |
       | item_type   | folder                     |
-      | permissions | read                       |
+      | permissions | read, share                |
     And as "user1" folder "Shares/simple-empty-folder" should exist on remote server
 
   @issue-3309
@@ -156,7 +156,7 @@ Feature: Federation Sharing - sharing with users on other cloud storages
       | uid_owner   | user1                      |
       | share_with  | user2                      |
       | item_type   | folder                     |
-      | permissions | read                       |
+      | permissions | read, share                |
 
   Scenario: test resharing a federated server to remote again
     Given user "user2" has been created with default attributes on remote server
@@ -171,7 +171,7 @@ Feature: Federation Sharing - sharing with users on other cloud storages
       | uid_owner   | user1                      |
       | share_with  | user2@%remote_backend_url% |
       | item_type   | folder                     |
-      | permissions | read                       |
+      | permissions | read, share                |
     And as "user2" folder "Shares/simple-folder" should exist on remote server
 
   Scenario: try resharing a folder with read-only permissions
diff --git a/tests/acceptance/features/webUISharingExternalToRoot/federationSharing.feature b/tests/acceptance/features/webUISharingExternalToRoot/federationSharing.feature
index 84fc1362588..527b3c69795 100644
--- a/tests/acceptance/features/webUISharingExternalToRoot/federationSharing.feature
+++ b/tests/acceptance/features/webUISharingExternalToRoot/federationSharing.feature
@@ -78,7 +78,7 @@ Feature: Federation Sharing - sharing with users on other cloud storages
       | uid_owner   | user1                      |
       | share_with  | user1@%remote_backend_url% |
       | item_type   | folder                     |
-      | permissions | read                       |
+      | permissions | read, share                |
     And as "user1" folder "simple-empty-folder" should exist on remote server
 
   @issue-3309
@@ -157,7 +157,7 @@ Feature: Federation Sharing - sharing with users on other cloud storages
       | uid_owner   | user1                      |
       | share_with  | user2                      |
       | item_type   | folder                     |
-      | permissions | read                       |
+      | permissions | read, share                |
 
   Scenario: test resharing a federated server to remote again
     Given the setting "auto_accept_trusted" of app "federatedfilesharing" has been set to "yes"
@@ -170,7 +170,7 @@ Feature: Federation Sharing - sharing with users on other cloud storages
       | uid_owner   | user1                      |
       | share_with  | user2@%remote_backend_url% |
       | item_type   | folder                     |
-      | permissions | read                       |
+      | permissions | read, share                |
     And as "user2" folder "simple-folder (2)" should exist on remote server
 
   Scenario: try resharing a folder with read-only permissions
diff --git a/tests/acceptance/features/webUISharingFolderPermissionMultipleUsers/shareFolderWithMultipleUsers.feature b/tests/acceptance/features/webUISharingFolderPermissionMultipleUsers/shareFolderWithMultipleUsers.feature
index c9f9e5da065..b1f2d8e5e47 100644
--- a/tests/acceptance/features/webUISharingFolderPermissionMultipleUsers/shareFolderWithMultipleUsers.feature
+++ b/tests/acceptance/features/webUISharingFolderPermissionMultipleUsers/shareFolderWithMultipleUsers.feature
@@ -55,15 +55,13 @@ Feature: Sharing folders with multiple internal users with different permissions
     And user "User Four" should not be listed in the collaborators list on the webUI
     And as "user4" folder "simple-folder (2)" should not exist
     Examples:
-      | role                 | displayed-role          | extra-permissions             | displayed-permissions | actual-permissions           |
-      | Viewer               | Viewer                  | share                         | share                 | read, share                  |
-      | Viewer               | Viewer                  | ,                             | ,                     | read                         |
-      | Editor               | Editor                  | share                         | share                 | all                          |
-      | Editor               | Editor                  | ,                             | ,                     | read, update, delete, create |
-      | Advanced permissions | Viewer                  | ,                             | ,                     | read                         |
-      | Advanced permissions | Viewer                  | share                         | share                 | read, share                  |
-      | Advanced permissions | Editor                  | delete, update, create        | ,                     | read, delete, update, create |
-      | Advanced permissions | Editor                  | share, delete, update, create | share                 | all                          |
+      | role                 | displayed-role          | extra-permissions             | displayed-permissions  | actual-permissions           |
+      | Viewer               | Viewer                  | ,                             | ,                      | read, share                  |
+      | Editor               | Editor                  | ,                             | ,                      | all                          |
+      | Advanced permissions | Advanced permissions    | ,                             | ,                      | read                         |
+      | Advanced permissions | Viewer                  | share                         | ,                      | read, share                  |
+      | Advanced permissions | Advanced permissions    | delete, update, create        | delete, update, create | read, delete, update, create |
+      | Advanced permissions | Editor                  | share, delete, update, create | ,                      | all                          |
 
   @skipOnOC10 @issue-product-203
   #after fixing the issue delete this scenario and use the one above by deleting the @skipOnOCIS tag there
@@ -111,11 +109,11 @@ Feature: Sharing folders with multiple internal users with different permissions
     And as "user4" folder "simple-folder (2)" should not exist
     Examples:
       | role                 | displayed-role          | extra-permissions             | displayed-permissions | actual-permissions           |
-      | Viewer               | Viewer                  | share                         | share                 | read, share                  |
+      # | Viewer               | Viewer                  | share                         | share                 | read, share                  |
       | Viewer               | Viewer                  | ,                             | ,                     | read                         |
-      | Editor               | Editor                  | share                         | share                 | all                          |
+      # | Editor               | Editor                  | share                         | share                 | all                          |
       | Editor               | Editor                  | ,                             | ,                     | read, update, delete, create |
       | Advanced permissions | Viewer                  | ,                             | ,                     | read                         |
-      | Advanced permissions | Viewer                  | share                         | share                 | read, share                  |
+      # | Advanced permissions | Viewer                  | share                         | share                 | read, share                  |
       | Advanced permissions | Editor                  | delete, update, create        | ,                     | read, delete, update, create |
-      | Advanced permissions | Editor                  | share, delete, update, create | share                 | all                          |
+      # | Advanced permissions | Editor                  | share, delete, update, create | share                 | all                          |

From e43ff1555fe313b9adf5b5755dcdf16ddb4de9d2 Mon Sep 17 00:00:00 2001
From: Lukas Hirt <lukashirt@mail.com>
Date: Mon, 26 Oct 2020 11:54:08 +0100
Subject: [PATCH 13/15] Adjust oCIS tests

---
 .../webUIResharing/reshareUsers.feature       |  2 ++
 .../shareFileWithMultipleUsers.feature        | 10 +++++-----
 ...thMultipleUsersAdvancedPermissions.feature | 10 ++--------
 .../shareWithUsers.feature                    | 20 +++++++++++++++++--
 .../sharePermissionsUsers.feature             | 20 +++++++++----------
 5 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/tests/acceptance/features/webUIResharing/reshareUsers.feature b/tests/acceptance/features/webUIResharing/reshareUsers.feature
index c6682a1aaca..3ccf1a711ff 100644
--- a/tests/acceptance/features/webUIResharing/reshareUsers.feature
+++ b/tests/acceptance/features/webUIResharing/reshareUsers.feature
@@ -1,3 +1,5 @@
+# Reshare permission is not available now in the oCIS webUI
+@skipOnOCIS
 Feature: Resharing shared files with different permissions
   As a user
   I want to reshare received files and folders with other users with different permissions
diff --git a/tests/acceptance/features/webUISharingFilePermissionMultipleUsers/shareFileWithMultipleUsers.feature b/tests/acceptance/features/webUISharingFilePermissionMultipleUsers/shareFileWithMultipleUsers.feature
index c966a4a51d4..4735f54a2cd 100644
--- a/tests/acceptance/features/webUISharingFilePermissionMultipleUsers/shareFileWithMultipleUsers.feature
+++ b/tests/acceptance/features/webUISharingFilePermissionMultipleUsers/shareFileWithMultipleUsers.feature
@@ -108,8 +108,8 @@ Feature: Sharing files with multiple internal users with different permissions
     And user "User Four" should not be listed in the collaborators list on the webUI
     And as "user4" file "/Shares/lorem.txt" should not exist
     Examples:
-      | role                 | displayed-role       | extra-permissions | displayed-permissions | actual-permissions  |
-      | Viewer               | Viewer               | ,                 | ,                     | read                |
-      | Editor               | Editor               | ,                 | ,                     | read, update        |
-      | Advanced permissions | Viewer               | ,                 | ,                     | read                |
-      | Advanced permissions | Advanced permissions | update            | update                | read, update        |
+      | role                 | displayed-role | extra-permissions | displayed-permissions | actual-permissions  |
+      | Viewer               | Viewer         | ,                 | ,                     | read                |
+      | Editor               | Editor         | ,                 | ,                     | read, update        |
+      | Advanced permissions | Viewer         | ,                 | ,                     | read                |
+      | Advanced permissions | Editor         | update            | ,                     | read, update        |
diff --git a/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature b/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature
index d3c131dbfb4..728932b4d56 100644
--- a/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature
+++ b/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature
@@ -117,13 +117,7 @@ Feature: Sharing folders with multiple internal users using advanced permissions
       | role                 | displayed-role       | extra-permissions     | displayed-permissions | actual-permissions                  |
       | Advanced permissions | Advanced permissions | delete                | delete                | read, delete                        |
       | Advanced permissions | Advanced permissions | update                | update                | read, update                        |
-      | Advanced permissions | Advanced permissions | create                | create, update        | read, create, update                |
-      | Advanced permissions | Advanced permissions | share, delete         | share, delete         | read, share, delete                 |
-      | Advanced permissions | Advanced permissions | share, update         | share, update         | read, update, share                 |
-      | Advanced permissions | Advanced permissions | share, create         | share, create, update | read, share, create, update         |
+      | Advanced permissions | Advanced permissions | create                | create                | read, create                        |
       | Advanced permissions | Advanced permissions | delete, update        | delete, update        | read, delete, update                |
-      | Advanced permissions | Editor               | delete, create        |                       | read, delete, create, update        |
+      | Advanced permissions | Advanced permissions | delete, create        |                       | read, delete, create                |
       | Advanced permissions | Advanced permissions | update, create        | update, create        | read, update, create                |
-      | Advanced permissions | Advanced permissions | share, delete, update | share, delete, update | read, share, delete, update         |
-      | Advanced permissions | Editor               | share, create, delete | share                 | read, share, delete, create, update |
-      | Advanced permissions | Advanced permissions | share, update, create | share, update, create | read, share, update, create         |
diff --git a/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature b/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
index 6c3cb76d552..3a0c1e2730b 100644
--- a/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
+++ b/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
@@ -103,7 +103,7 @@ Feature: Sharing files and folders with internal users
       | read,update,create  | Viewer               | Viewer        | read                      |
       | read                | Editor               | Editor        | read,update,create,delete |
       | read                | Advanced permissions | Viewer        | read                      |
-      | all                 | Advanced permissions | Editor        | all                       |
+      | all                 | Advanced permissions | Editor        | read,update,create,delete |
 
   @skip @issue-4102
   Scenario: share a file with another internal user who overwrites and unshares the file
@@ -580,7 +580,8 @@ Feature: Sharing files and folders with internal users
     When the user opens the share dialog for file "lorem.txt" using the webUI
     Then user "User Two" should be listed as "Editor" via "simple-folder" in the collaborators list on the webUI
 
-  @issue-2897
+  # Share permission is not available in oCIS webUI so when setting all permissions, it is displayed as "Advanced permissions" there
+  @skipOnOCIS @issue-2897
   Scenario: sharing details of items inside a re-shared folder
     Given user "user3" has been created with default attributes
     And user "user1" has uploaded file with content "test" to "/simple-folder/lorem.txt"
@@ -595,6 +596,21 @@ Feature: Sharing files and folders with internal users
     When the user opens the share dialog for file "lorem.txt" using the webUI
     Then user "User Three" should be listed as "Editor" via "simple-folder" in the collaborators list on the webUI
 
+  @skipOnOC10 @issue-2897
+  Scenario: sharing details of items inside a re-shared folder
+    Given user "user3" has been created with default attributes
+    And user "user1" has uploaded file with content "test" to "/simple-folder/lorem.txt"
+    And user "user1" has shared folder "simple-folder" with user "user2"
+    And user "user2" has accepted the share "simple-folder" offered by user "user1"
+    And user "user2" has shared folder "Shares/simple-folder" with user "user3"
+    And user "user2" has logged in using the webUI
+    And the user has opened folder "Shares"
+    And the user has opened folder "simple-folder"
+    When the user opens the share dialog for folder "simple-empty-folder" using the webUI
+    Then user "User Three" should be listed as "Advanced permissions" via "simple-folder" in the collaborators list on the webUI
+    When the user opens the share dialog for file "lorem.txt" using the webUI
+    Then user "User Three" should be listed as "Advanced permissions" via "simple-folder" in the collaborators list on the webUI
+
   @issue-2897 @skipOnOCIS @issue-4193
   Scenario: sharing details of items inside a shared folder shared with multiple users
     Given user "user3" has been created with default attributes
diff --git a/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature b/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature
index 7078aa633d6..68e41a2451b 100644
--- a/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature
+++ b/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature
@@ -35,7 +35,7 @@ Feature: Sharing files and folders with internal users with different permission
     And user "user2" has logged in using the webUI
     Then custom permission "update" should be set for user "User One" for folder "simple-folder" on the webUI
     When the user sets custom permission for current role of collaborator "User One" for folder "simple-folder" to "create" using the webUI
-    Then custom permission "create" should be set for user "User One" for folder "simple-folder" on the webUI
+    Then custom permissions "create, update" should be set for user "User One" for folder "simple-folder" on the webUI
     And user "user1" should have received a share with these details:
       | field       | value                |
       | uid_owner   | user2                |
@@ -134,8 +134,8 @@ Feature: Sharing files and folders with internal users with different permission
     Examples:
       | role                 | displayed-role       | extra-permissions             | displayed-permissions | permissions                  |
       | Viewer               | Viewer               | ,                             | ,                     | read                         |
-      | Editor               | Editor               | ,                             | ,                     | all                          |
-      | Advanced permissions | Advanced permissions | create                        | create                | read                         |
+      | Editor               | Editor               | ,                             | ,                     | read, create, update, delete |
+      | Advanced permissions | Advanced permissions | create                        | create                | read, create                 |
       | Advanced permissions | Advanced permissions | update                        | update                | read, update                 |
       | Advanced permissions | Editor               | delete, create, update        | ,                     | read, delete, update, create |
 
@@ -346,12 +346,12 @@ Feature: Sharing files and folders with internal users with different permission
     And user "user1" has logged in using the webUI
     When the user opens folder "Shares" using the webUI
     And the user browses to the folder "simple-folder" on the files page
-    And the user shares folder "simple-empty-folder" with user "User Three" as "Advanced permissions" with permissions "share, delete, create, update" using the webUI
+    And the user shares folder "simple-empty-folder" with user "User Three" as "Advanced permissions" with permissions "delete, create, update" using the webUI
     And user "user3" accepts the share "simple-empty-folder" offered by user "user1" using the sharing API
     Then user "user3" should have received a share with these details:
-      | field       | value                |
-      | uid_owner   | user1                |
-      | share_with  | user3                |
-      | file_target | /simple-empty-folder |
-      | item_type   | folder               |
-      | permissions | all                  |
+      | field       | value                        |
+      | uid_owner   | user1                        |
+      | share_with  | user3                        |
+      | file_target | /simple-empty-folder         |
+      | item_type   | folder                       |
+      | permissions | read, delete, create, update |

From 4a6074e72c3b2c2353604334c1dbb41cfb36dc53 Mon Sep 17 00:00:00 2001
From: Lukas Hirt <lukashirt@mail.com>
Date: Mon, 26 Oct 2020 13:22:36 +0100
Subject: [PATCH 14/15] Fix oCIS tests

---
 .../sharedFolderWithMultipleUsersAdvancedPermissions.feature  | 4 ++--
 .../features/webUISharingInternalUsers/shareWithUsers.feature | 2 +-
 .../sharePermissionsUsers.feature                             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature b/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature
index 728932b4d56..7d526409c03 100644
--- a/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature
+++ b/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature
@@ -117,7 +117,7 @@ Feature: Sharing folders with multiple internal users using advanced permissions
       | role                 | displayed-role       | extra-permissions     | displayed-permissions | actual-permissions                  |
       | Advanced permissions | Advanced permissions | delete                | delete                | read, delete                        |
       | Advanced permissions | Advanced permissions | update                | update                | read, update                        |
-      | Advanced permissions | Advanced permissions | create                | create                | read, create                        |
+      | Advanced permissions | Advanced permissions | create                | create, update        | read, create, update                |
       | Advanced permissions | Advanced permissions | delete, update        | delete, update        | read, delete, update                |
-      | Advanced permissions | Advanced permissions | delete, create        |                       | read, delete, create                |
+      | Advanced permissions | Editor               | delete, create        | ,                     | read, delete, create                |
       | Advanced permissions | Advanced permissions | update, create        | update, create        | read, update, create                |
diff --git a/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature b/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
index 3a0c1e2730b..b4e9eb9ac59 100644
--- a/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
+++ b/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
@@ -103,7 +103,7 @@ Feature: Sharing files and folders with internal users
       | read,update,create  | Viewer               | Viewer        | read                      |
       | read                | Editor               | Editor        | read,update,create,delete |
       | read                | Advanced permissions | Viewer        | read                      |
-      | all                 | Advanced permissions | Editor        | read,update,create,delete |
+      | read,update,create  | Advanced permissions | Editor        | read,update,create,delete |
 
   @skip @issue-4102
   Scenario: share a file with another internal user who overwrites and unshares the file
diff --git a/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature b/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature
index 68e41a2451b..7d51a85ab1c 100644
--- a/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature
+++ b/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature
@@ -135,7 +135,7 @@ Feature: Sharing files and folders with internal users with different permission
       | role                 | displayed-role       | extra-permissions             | displayed-permissions | permissions                  |
       | Viewer               | Viewer               | ,                             | ,                     | read                         |
       | Editor               | Editor               | ,                             | ,                     | read, create, update, delete |
-      | Advanced permissions | Advanced permissions | create                        | create                | read, create                 |
+      | Advanced permissions | Advanced permissions | create                        | create, update        | read, create, update         |
       | Advanced permissions | Advanced permissions | update                        | update                | read, update                 |
       | Advanced permissions | Editor               | delete, create, update        | ,                     | read, delete, update, create |
 

From 2b45fdc60ff44bd9cddb4b79c4cf7682aeead5f5 Mon Sep 17 00:00:00 2001
From: Lukas Hirt <lukashirt@mail.com>
Date: Mon, 26 Oct 2020 15:10:12 +0100
Subject: [PATCH 15/15] Check for correct permissions in tests

---
 ...dFolderWithMultipleUsersAdvancedPermissions.feature |  2 +-
 .../webUISharingInternalUsers/shareWithUsers.feature   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature b/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature
index 7d526409c03..31727f3e0da 100644
--- a/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature
+++ b/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature
@@ -119,5 +119,5 @@ Feature: Sharing folders with multiple internal users using advanced permissions
       | Advanced permissions | Advanced permissions | update                | update                | read, update                        |
       | Advanced permissions | Advanced permissions | create                | create, update        | read, create, update                |
       | Advanced permissions | Advanced permissions | delete, update        | delete, update        | read, delete, update                |
-      | Advanced permissions | Editor               | delete, create        | ,                     | read, delete, create                |
+      | Advanced permissions | Editor               | delete, create        | ,                     | read, delete, create, update        |
       | Advanced permissions | Advanced permissions | update, create        | update, create        | read, update, create                |
diff --git a/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature b/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
index b4e9eb9ac59..f788c254abb 100644
--- a/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
+++ b/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
@@ -99,11 +99,11 @@ Feature: Sharing files and folders with internal users
       | item_type   | folder                 |
       | permissions | <expected-permissions> |
     Examples:
-      | initial-permissions | set-role             | expected-role | expected-permissions      |
-      | read,update,create  | Viewer               | Viewer        | read                      |
-      | read                | Editor               | Editor        | read,update,create,delete |
-      | read                | Advanced permissions | Viewer        | read                      |
-      | read,update,create  | Advanced permissions | Editor        | read,update,create,delete |
+      | initial-permissions       | set-role             | expected-role | expected-permissions      |
+      | read,update,create        | Viewer               | Viewer        | read                      |
+      | read                      | Editor               | Editor        | read,update,create,delete |
+      | read                      | Advanced permissions | Viewer        | read                      |
+      | read,update,create,delete | Advanced permissions | Editor        | read,update,create,delete |
 
   @skip @issue-4102
   Scenario: share a file with another internal user who overwrites and unshares the file