From 11227d26ab33f1ae3a9e934666243c83ee08903a Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Thu, 17 Mar 2022 21:13:24 +0100
Subject: [PATCH 01/12] Add useCapability composable

---
 .../src/composables/capability/index.ts       |  1 +
 .../composables/capability/useCapability.ts   | 34 +++++++++
 packages/web-runtime/src/composables/index.ts |  1 +
 .../unit/composables/capability/spec/index.ts | 19 +++++
 .../capability/useCapability.spec.ts          | 73 +++++++++++++++++++
 5 files changed, 128 insertions(+)
 create mode 100644 packages/web-runtime/src/composables/capability/index.ts
 create mode 100644 packages/web-runtime/src/composables/capability/useCapability.ts
 create mode 100644 packages/web-runtime/tests/unit/composables/capability/spec/index.ts
 create mode 100644 packages/web-runtime/tests/unit/composables/capability/useCapability.spec.ts

diff --git a/packages/web-runtime/src/composables/capability/index.ts b/packages/web-runtime/src/composables/capability/index.ts
new file mode 100644
index 00000000000..1aa9aac380f
--- /dev/null
+++ b/packages/web-runtime/src/composables/capability/index.ts
@@ -0,0 +1 @@
+export * from './useCapability'
diff --git a/packages/web-runtime/src/composables/capability/useCapability.ts b/packages/web-runtime/src/composables/capability/useCapability.ts
new file mode 100644
index 00000000000..5e70b848079
--- /dev/null
+++ b/packages/web-runtime/src/composables/capability/useCapability.ts
@@ -0,0 +1,34 @@
+import { Store } from 'vuex'
+import get from 'lodash-es/get'
+import { computed, ComputedRef } from '@vue/composition-api'
+import { useStore } from 'web-pkg/src/composables'
+
+export const useCapability = <T>(
+  store: Store<any>,
+  name: string,
+  defaultValue?: T
+): ComputedRef<T> => {
+  return computed((): T => {
+    if (defaultValue) {
+      return get(store, `getters.capabilities.${name}`, defaultValue) as T
+    }
+
+    const value = get(store, `getters.capabilities.${name}`) as T
+    if (value === undefined) {
+      throw new Error('useCapability: capability is not defined and no default was defined')
+    }
+    return value
+  })
+}
+
+const createCapabilityComposable = <T>(
+  name: string,
+  defaultValue?: T
+): ((store?: Store<any>) => ComputedRef<T>) => {
+  return (store?: Store<any>) => useCapability<T>(store || useStore(), name, defaultValue)
+}
+
+export const useCapabilityFilesSharingResharing = createCapabilityComposable(
+  'files_sharing.resharing',
+  true
+)
diff --git a/packages/web-runtime/src/composables/index.ts b/packages/web-runtime/src/composables/index.ts
index fc6c2f69f68..7946db02dc9 100644
--- a/packages/web-runtime/src/composables/index.ts
+++ b/packages/web-runtime/src/composables/index.ts
@@ -1 +1,2 @@
 export * from './theme'
+export * from './capability'
diff --git a/packages/web-runtime/tests/unit/composables/capability/spec/index.ts b/packages/web-runtime/tests/unit/composables/capability/spec/index.ts
new file mode 100644
index 00000000000..c7a8fefba15
--- /dev/null
+++ b/packages/web-runtime/tests/unit/composables/capability/spec/index.ts
@@ -0,0 +1,19 @@
+import VueCompositionAPI, { defineComponent, SetupFunction, Data } from '@vue/composition-api'
+import { createLocalVue, mount, Wrapper } from '@vue/test-utils'
+import Vuex from 'vuex'
+import Vue from 'vue'
+
+const localVue = createLocalVue()
+localVue.use(VueCompositionAPI)
+localVue.use(Vuex)
+
+export const createWrapper = (setup: SetupFunction<Data, Data>): Wrapper<Vue> =>
+  mount(
+    defineComponent({
+      template: `<div></div>`,
+      setup
+    }),
+    {
+      localVue
+    }
+  )
diff --git a/packages/web-runtime/tests/unit/composables/capability/useCapability.spec.ts b/packages/web-runtime/tests/unit/composables/capability/useCapability.spec.ts
new file mode 100644
index 00000000000..bbb81e1c1c4
--- /dev/null
+++ b/packages/web-runtime/tests/unit/composables/capability/useCapability.spec.ts
@@ -0,0 +1,73 @@
+import { unref } from '@vue/composition-api'
+import { createWrapper } from './spec'
+import { useCapability } from '../../../../src/composables/capability/useCapability'
+import { Store } from 'vuex'
+import user from '../../../../src/store/user'
+import set from 'lodash-es/set'
+
+let store
+beforeEach(() => {
+  createWrapper(undefined)
+  store = new Store({
+    modules: {
+      user
+    }
+  })
+})
+
+const commitValue = <T>(name: string, value: T) => {
+  store.commit('SET_CAPABILITIES', {
+    version: '1.2.3',
+    capabilities: set({}, name, value)
+  })
+}
+
+describe('useCapability', () => {
+  it('should be valid', () => {
+    expect(useCapability).toBeDefined()
+  })
+
+  it('handles bools correctly', () => {
+    const resharingCapability = useCapability<boolean>(store, 'files_sharing.resharing')
+    const resharingCapabilityWithDefault = useCapability<boolean>(
+      store,
+      'files_sharing.resharing',
+      true
+    )
+
+    // FIXME: how to test this?
+    // expect(() => {
+    //     unref(resharingCapability)
+    // }).rejects.toThrow()
+    expect(unref(resharingCapabilityWithDefault)).toBe(true)
+
+    commitValue('files_sharing.resharing', false)
+    expect(unref(resharingCapability)).toBe(false)
+    expect(unref(resharingCapabilityWithDefault)).toBe(false)
+
+    commitValue('files_sharing.resharing', true)
+    expect(unref(resharingCapability)).toBe(true)
+    expect(unref(resharingCapabilityWithDefault)).toBe(true)
+  })
+
+  it('handles arrays correctly', () => {
+    const supportedTypesCapability = useCapability<string[]>(store, 'checksums.supportedTypes')
+    const supportedTypesCapabilityWithDefaults = useCapability<string[]>(
+      store,
+      'checksums.supportedTypes',
+      ['foo', 'bar']
+    )
+
+    // FIXME: how to test this?
+    // expect(() => {
+    //     unref(resharingCapability)
+    // }).rejects.toThrow()
+    expect(unref(supportedTypesCapabilityWithDefaults)).toStrictEqual(['foo', 'bar'])
+
+    commitValue('checksums.supportedTypes', ['sha1', 'md5', 'adler32'])
+    expect(unref(supportedTypesCapability)).toStrictEqual(['sha1', 'md5', 'adler32'])
+
+    commitValue('checksums.supportedTypes', ['sha1', 'adler32'])
+    expect(unref(supportedTypesCapability)).toStrictEqual(['sha1', 'adler32'])
+  })
+})

From 9a79c7421f358827a5948df667564a8b273f778d Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Thu, 17 Mar 2022 21:15:15 +0100
Subject: [PATCH 02/12] Replace isOcis in SideBar/shares/Collaborators/ListItem
 with resharing capability

---
 .../SideBar/Shares/Collaborators/ListItem.vue        | 12 +++++++++---
 .../SideBar/Shares/Collaborators/ListItem.spec.js    |  3 ---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue
index f059712778c..278b393523e 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue
@@ -66,7 +66,7 @@
         :share-id="share.id"
         :existing-permissions="share.customPermissions"
         :existing-role="share.role"
-        :allow-share-permission="!isOcis || isSpace"
+        :allow-share-permission="resharingCapability || isSpace"
         class="files-collaborators-collaborator-role"
         @optionChange="shareRoleChanged"
       />
@@ -94,6 +94,7 @@ import EditDropdown from './EditDropdown.vue'
 import RoleDropdown from '../RoleDropdown.vue'
 import { SharePermissions, ShareTypes } from '../../../../helpers/share'
 import { clientService } from 'web-pkg/src/services'
+import { useCapabilityFilesSharingResharing } from 'web-runtime/src/composables'
 
 export default {
   name: 'ListItem',
@@ -112,9 +113,14 @@ export default {
       default: false
     }
   },
+  setup() {
+    return {
+      resharingCapability: useCapabilityFilesSharingResharing()
+    }
+  },
   computed: {
     ...mapGetters('Files', ['highlightedFile']),
-    ...mapGetters(['isOcis', 'getToken', 'configuration']),
+    ...mapGetters(['getToken', 'configuration']),
     ...mapState(['user']),
 
     shareType() {
@@ -264,7 +270,7 @@ export default {
       const bitmask = role.hasCustomPermissions
         ? SharePermissions.permissionsToBitmask(permissions)
         : SharePermissions.permissionsToBitmask(
-            role.permissions(!this.isOcis || this.shareType === ShareTypes.space)
+            role.permissions(this.resharingCapability || this.shareType === ShareTypes.space)
           )
       this.changeShare({
         client: this.$client,
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/ListItem.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/ListItem.spec.js
index c57fc166737..0c03a0d5324 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/ListItem.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/ListItem.spec.js
@@ -107,9 +107,6 @@ function createWrapper({
       state: {
         user: Users.alice
       },
-      getters: {
-        isOcis: () => false
-      },
       modules: {
         Files: {
           namespaced: true,

From 442f4660e39720cfff6cbda3ee39e74347921561 Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Thu, 17 Mar 2022 21:17:31 +0100
Subject: [PATCH 03/12] Replace isOcis in InviteCollaborator component with
 resharing capability

---
 .../InviteCollaborator/InviteCollaboratorForm.vue    | 12 +++++++++---
 .../InviteCollaborator/RecipientContainer.spec.js    |  1 -
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/web-app-files/src/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.vue b/packages/web-app-files/src/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.vue
index ce00aebefb0..3c6c8fcad57 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.vue
@@ -42,7 +42,7 @@
     <div class="oc-flex oc-flex-middle oc-flex-between oc-mb-l">
       <role-dropdown
         :resource="highlightedFile"
-        :allow-share-permission="!isOcis || resourceIsSpace"
+        :allow-share-permission="resharingCapability || resourceIsSpace"
         @optionChange="collaboratorRoleChanged"
       />
       <expiration-datepicker
@@ -87,6 +87,7 @@ import {
   SpacePeopleShareRoles
 } from '../../../../helpers/share'
 import { clientService } from 'web-pkg/src/services'
+import { useCapabilityFilesSharingResharing } from 'web-runtime/src/composables'
 
 export default {
   name: 'InviteCollaboratorForm',
@@ -96,6 +97,11 @@ export default {
     RecipientContainer,
     ExpirationDatepicker
   },
+  setup() {
+    return {
+      resharingCapability: useCapabilityFilesSharingResharing()
+    }
+  },
   data() {
     return {
       autocompleteResults: [],
@@ -111,7 +117,7 @@ export default {
   },
   computed: {
     ...mapGetters('Files', ['currentFileOutgoingCollaborators', 'highlightedFile']),
-    ...mapGetters(['configuration', 'isOcis', 'getToken', 'user']),
+    ...mapGetters(['configuration', 'getToken', 'user']),
 
     inviteDescriptionMessage() {
       return this.$gettext('Add new person by name, email or federation IDs')
@@ -252,7 +258,7 @@ export default {
             const bitmask = this.selectedRole.hasCustomPermissions
               ? SharePermissions.permissionsToBitmask(this.customPermissions)
               : SharePermissions.permissionsToBitmask(
-                  this.selectedRole.permissions(!this.isOcis || this.resourceIsSpace)
+                  this.selectedRole.permissions(this.resharingCapability || this.resourceIsSpace)
                 )
 
             let storageId
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/InviteCollaborator/RecipientContainer.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/InviteCollaborator/RecipientContainer.spec.js
index cad580e0849..5088d064cda 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/InviteCollaborator/RecipientContainer.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/InviteCollaborator/RecipientContainer.spec.js
@@ -87,7 +87,6 @@ const storeOptions = (avatarsEnabled) => {
       }
     },
     getters: {
-      isOcis: () => false,
       user: () => user,
       getToken: () => '',
       capabilities: () => {

From 360d18f5c234e988e3d864ff762fb7dca24752c1 Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Thu, 17 Mar 2022 21:21:32 +0100
Subject: [PATCH 04/12] Get rid of isOcis on account page by abusing the
 resharing capability for it for now

---
 packages/web-runtime/src/pages/account.vue      | 13 +++++++++++--
 .../tests/unit/pages/account.spec.js            | 17 ++++++++++++-----
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/packages/web-runtime/src/pages/account.vue b/packages/web-runtime/src/pages/account.vue
index 6192264b63b..b3191fd2803 100644
--- a/packages/web-runtime/src/pages/account.vue
+++ b/packages/web-runtime/src/pages/account.vue
@@ -73,8 +73,17 @@
 
 <script>
 import { mapGetters } from 'vuex'
+import { useCapabilityFilesSharingResharing } from '../composables'
 export default {
   name: 'Personal',
+  setup() {
+    return {
+      // FIXME: We need a clean way to know whether account editing is enabled or not
+      // for now we abuse the files_sharing.resharing capability, as *currently*
+      // oCIS does not support that exactly like it does not support account editing
+      isAccountEditingEnabled: useCapabilityFilesSharingResharing()
+    }
+  },
   data() {
     return {
       loadingGroups: true,
@@ -82,12 +91,12 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['user', 'configuration', 'getNavItemsByExtension', 'isOcis']),
+    ...mapGetters(['user', 'configuration', 'getNavItemsByExtension']),
     pageTitle() {
       return this.$gettext(this.$route.meta.title)
     },
     editUrl() {
-      if (this.isOcis) {
+      if (!this.isAccountEditingEnabled) {
         return null
       }
       return this.configuration.server.replace(/\/$/, '') + '/index.php/settings/personal'
diff --git a/packages/web-runtime/tests/unit/pages/account.spec.js b/packages/web-runtime/tests/unit/pages/account.spec.js
index 6f93854f6a8..5f95bebea43 100644
--- a/packages/web-runtime/tests/unit/pages/account.spec.js
+++ b/packages/web-runtime/tests/unit/pages/account.spec.js
@@ -3,9 +3,11 @@ import { shallowMount, createLocalVue } from '@vue/test-utils'
 import Vuex from 'vuex'
 import { createStore } from 'vuex-extensions'
 import GetTextPlugin from 'vue-gettext'
+import VueCompositionAPI from '@vue/composition-api'
 
 const localVue = createLocalVue()
 localVue.use(Vuex)
+localVue.use(VueCompositionAPI)
 
 localVue.use(GetTextPlugin, {
   translations: 'does-not-matter.json',
@@ -46,7 +48,7 @@ describe('account page', () => {
         it('should be displayed if not running with ocis', async () => {
           const store = getStore({
             server: 'http://server/address/',
-            isOcis: false
+            isAccountEditingEnabled: true
           })
           const wrapper = getWrapper(store)
           await wrapper.setData({ loadingGroups: false })
@@ -58,7 +60,7 @@ describe('account page', () => {
         it('should not be displayed if running with ocis', async () => {
           const store = getStore({
             server: 'http://server/address/',
-            isOcis: true
+            isAccountEditingEnabled: false
           })
           const wrapper = getWrapper(store)
           await wrapper.setData({ loadingGroups: false })
@@ -69,7 +71,7 @@ describe('account page', () => {
       describe('edit route button', () => {
         it('should be displayed if running with ocis and has navItems', async () => {
           const store = getStore({
-            isOcis: true,
+            isAccountEditingEnabled: false,
             getNavItemsByExtension: jest.fn(() => [{ route: 'some-route' }])
           })
           const wrapper = getWrapper(store)
@@ -147,7 +149,7 @@ function getStore({
   user = {},
   server = '',
   getNavItemsByExtension = jest.fn(() => []),
-  isOcis = false
+  isAccountEditingEnabled = true
 } = {}) {
   return createStore(Vuex.Store, {
     getters: {
@@ -156,7 +158,12 @@ function getStore({
         server: server
       }),
       getNavItemsByExtension: () => getNavItemsByExtension,
-      isOcis: () => isOcis
+      // FIXME: see account.vue
+      capabilities: () => ({
+        files_sharing: {
+          resharing: isAccountEditingEnabled
+        }
+      })
     }
   })
 }

From 4139d93b809bc2aad36117cccf65aea22263e42c Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Thu, 17 Mar 2022 21:23:43 +0100
Subject: [PATCH 05/12] Replace isOcis in folder loaders

---
 .../src/services/folder/loaderSharedViaLink.ts             | 7 +++++--
 .../src/services/folder/loaderSharedWithMe.ts              | 7 +++++--
 .../src/services/folder/loaderSharedWithOthers.ts          | 7 +++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/packages/web-app-files/src/services/folder/loaderSharedViaLink.ts b/packages/web-app-files/src/services/folder/loaderSharedViaLink.ts
index 2e4ed6cc331..e77b608ab38 100644
--- a/packages/web-app-files/src/services/folder/loaderSharedViaLink.ts
+++ b/packages/web-app-files/src/services/folder/loaderSharedViaLink.ts
@@ -3,6 +3,8 @@ import Router from 'vue-router'
 import { useTask } from 'vue-concurrency'
 import { isLocationSharesActive } from '../../router'
 import { aggregateResourceShares } from '../../helpers/resources'
+import { useCapabilityFilesSharingResharing } from 'web-runtime/src/composables'
+import { unref } from '@vue/composition-api'
 
 export class FolderLoaderSharedViaLink implements FolderLoader {
   public isEnabled(router: Router): boolean {
@@ -15,6 +17,8 @@ export class FolderLoaderSharedViaLink implements FolderLoader {
       clientService: { owncloudSdk: client }
     } = context
 
+    const resharingCapability = useCapabilityFilesSharingResharing(store)
+
     return useTask(function* (signal1, signal2) {
       store.commit('Files/CLEAR_CURRENT_FILES_LIST')
 
@@ -28,14 +32,13 @@ export class FolderLoaderSharedViaLink implements FolderLoader {
       resources = resources.ocs.data
 
       if (resources.length) {
-        const isOcis = store.getters.isOcis
         const configuration = store.getters.configuration
         const getToken = store.getters.getToken
 
         resources = aggregateResourceShares(
           resources,
           false,
-          !isOcis,
+          unref(resharingCapability),
           configuration.server,
           getToken
         )
diff --git a/packages/web-app-files/src/services/folder/loaderSharedWithMe.ts b/packages/web-app-files/src/services/folder/loaderSharedWithMe.ts
index 9ce275e2761..c38bfeb931a 100644
--- a/packages/web-app-files/src/services/folder/loaderSharedWithMe.ts
+++ b/packages/web-app-files/src/services/folder/loaderSharedWithMe.ts
@@ -3,6 +3,8 @@ import Router from 'vue-router'
 import { useTask } from 'vue-concurrency'
 import { aggregateResourceShares } from '../../helpers/resources'
 import { isLocationSharesActive } from '../../router'
+import { useCapabilityFilesSharingResharing } from 'web-runtime/src/composables'
+import { unref } from '@vue/composition-api'
 
 export class FolderLoaderSharedWithMe implements FolderLoader {
   public isEnabled(router: Router): boolean {
@@ -15,6 +17,8 @@ export class FolderLoaderSharedWithMe implements FolderLoader {
       clientService: { owncloudSdk: client }
     } = context
 
+    const resharingCapability = useCapabilityFilesSharingResharing(store)
+
     return useTask(function* (signal1, signal2) {
       store.commit('Files/CLEAR_CURRENT_FILES_LIST')
 
@@ -28,14 +32,13 @@ export class FolderLoaderSharedWithMe implements FolderLoader {
       resources = resources.ocs.data
 
       if (resources.length) {
-        const isOcis = store.getters.isOcis
         const configuration = store.getters.configuration
         const getToken = store.getters.getToken
 
         resources = aggregateResourceShares(
           resources,
           true,
-          !isOcis,
+          unref(resharingCapability),
           configuration.server,
           getToken
         )
diff --git a/packages/web-app-files/src/services/folder/loaderSharedWithOthers.ts b/packages/web-app-files/src/services/folder/loaderSharedWithOthers.ts
index c5919842032..e8c0640b1dc 100644
--- a/packages/web-app-files/src/services/folder/loaderSharedWithOthers.ts
+++ b/packages/web-app-files/src/services/folder/loaderSharedWithOthers.ts
@@ -3,6 +3,8 @@ import Router from 'vue-router'
 import { useTask } from 'vue-concurrency'
 import { isLocationSharesActive } from '../../router'
 import { aggregateResourceShares } from '../../helpers/resources'
+import { useCapabilityFilesSharingResharing } from 'web-runtime/src/composables'
+import { unref } from '@vue/composition-api'
 
 export class FolderLoaderSharedWithOthers implements FolderLoader {
   public isEnabled(router: Router): boolean {
@@ -15,6 +17,8 @@ export class FolderLoaderSharedWithOthers implements FolderLoader {
       clientService: { owncloudSdk: client }
     } = context
 
+    const resharingCapability = useCapabilityFilesSharingResharing(store)
+
     return useTask(function* (signal1, signal2) {
       store.commit('Files/CLEAR_CURRENT_FILES_LIST')
 
@@ -28,14 +32,13 @@ export class FolderLoaderSharedWithOthers implements FolderLoader {
       resources = resources.ocs.data
 
       if (resources.length) {
-        const isOcis = store.getters.isOcis
         const configuration = store.getters.configuration
         const getToken = store.getters.getToken
 
         resources = aggregateResourceShares(
           resources,
           false,
-          !isOcis,
+          unref(resharingCapability),
           configuration.server,
           getToken
         )

From 6cab3a1d924e16200a6808c704765d5f26d9009c Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Thu, 17 Mar 2022 21:24:20 +0100
Subject: [PATCH 06/12] Get rid of isOcis in store actions

---
 packages/web-app-files/src/store/actions.js   | 27 ++++++++++++-------
 .../tests/unit/store/actions.spec.js          |  3 ---
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/packages/web-app-files/src/store/actions.js b/packages/web-app-files/src/store/actions.js
index d4469b94748..c95c577a662 100644
--- a/packages/web-app-files/src/store/actions.js
+++ b/packages/web-app-files/src/store/actions.js
@@ -15,6 +15,11 @@ import { avatarUrl } from '../helpers/user'
 import { has } from 'lodash-es'
 import { ShareTypes, SpacePeopleShareRoles } from '../helpers/share'
 import { sortSpaceMembers } from '../helpers/space'
+import get from 'lodash-es/get'
+
+const allowSharePermissions = (getters, state) => {
+  return get(getters, `capabilities.files_sharing.resharing`, true)
+}
 
 export default {
   updateFileProgress({ commit }, progress) {
@@ -205,7 +210,7 @@ export default {
             return buildShare(
               element.shareInfo,
               context.getters.highlightedFile,
-              !context.rootGetters.isOcis
+              allowSharePermissions(context.rootGetters)
             )
           })
         )
@@ -234,7 +239,7 @@ export default {
             return buildCollaboratorShare(
               element.shareInfo,
               context.getters.highlightedFile,
-              !context.rootGetters.isOcis
+              allowSharePermissions(context.rootGetters)
             )
           })
         )
@@ -300,7 +305,7 @@ export default {
           const share = buildCollaboratorShare(
             updatedShare.shareInfo,
             getters.highlightedFile,
-            !rootGetters.isOcis
+            allowSharePermissions(rootGetters)
           )
           commit('CURRENT_FILE_OUTGOING_SHARES_UPDATE', share)
           resolve(share)
@@ -336,7 +341,7 @@ export default {
             buildCollaboratorShare(
               share.shareInfo,
               context.getters.highlightedFile,
-              !context.rootGetters.isOcis
+              allowSharePermissions(context.rootGetters)
             )
           )
           context.dispatch('updateCurrentFileShareTypes')
@@ -415,7 +420,7 @@ export default {
           buildCollaboratorShare(
             share.shareInfo,
             context.getters.highlightedFile,
-            !context.rootGetters.isOcis
+            allowSharePermissions(context.rootGetters)
           )
         )
         context.dispatch('updateCurrentFileShareTypes')
@@ -516,7 +521,11 @@ export default {
             .then((data) => {
               data.forEach((element) => {
                 sharesTree[queryPath].push({
-                  ...buildShare(element.shareInfo, { type: 'folder' }, !context.rootGetters.isOcis),
+                  ...buildShare(
+                    element.shareInfo,
+                    { type: 'folder' },
+                    allowSharePermissions(context.rootGetters)
+                  ),
                   outgoing: true,
                   indirect: true
                 })
@@ -540,7 +549,7 @@ export default {
                   ...buildCollaboratorShare(
                     element.shareInfo,
                     { type: 'folder' },
-                    !context.rootGetters.isOcis
+                    allowSharePermissions(context.rootGetters)
                   ),
                   incoming: true,
                   indirect: true
@@ -583,7 +592,7 @@ export default {
       client.shares
         .shareFileWithLink(path, params)
         .then((data) => {
-          const link = buildShare(data.shareInfo, null, !context.rootGetters.isOcis)
+          const link = buildShare(data.shareInfo, null, allowSharePermissions(context.rootGetters))
           context.commit('CURRENT_FILE_OUTGOING_SHARES_ADD', link)
           context.dispatch('updateCurrentFileShareTypes')
           context.dispatch('loadIndicators', { client, currentFolder: path })
@@ -599,7 +608,7 @@ export default {
       client.shares
         .updateShare(id, params)
         .then((data) => {
-          const link = buildShare(data.shareInfo, null, !context.rootGetters.isOcis)
+          const link = buildShare(data.shareInfo, null, allowSharePermissions(context.rootGetters))
           context.commit('CURRENT_FILE_OUTGOING_SHARES_UPDATE', link)
           resolve(link)
         })
diff --git a/packages/web-app-files/tests/unit/store/actions.spec.js b/packages/web-app-files/tests/unit/store/actions.spec.js
index d6f08ae09bd..b65e4e6336c 100644
--- a/packages/web-app-files/tests/unit/store/actions.spec.js
+++ b/packages/web-app-files/tests/unit/store/actions.spec.js
@@ -7,9 +7,6 @@ const stateMock = {
   dispatch: jest.fn(),
   getters: {
     highlightedFile: { isFolder: false }
-  },
-  rootGetters: {
-    isOcis: true
   }
 }
 

From 66d8f1226b250be9375ed1311d0f86c76ca4ab6f Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Thu, 17 Mar 2022 21:27:57 +0100
Subject: [PATCH 07/12] Get rid of isOcis everywhere else

---
 .../web-app-files/src/mixins/actions/acceptShare.js   | 11 ++++++++---
 .../web-app-files/src/mixins/actions/declineShare.js  | 11 ++++++++---
 .../web-app-files/src/views/shares/SharedWithMe.vue   |  2 +-
 .../src/views/shares/SharedWithOthers.vue             |  2 +-
 .../unit/components/SideBar/Shares/FileShares.spec.js |  1 -
 .../InviteCollaborator/InviteCollaboratorForm.spec.js |  1 -
 .../components/SideBar/Shares/SpaceShares.spec.js     |  1 -
 .../tests/unit/components/components.setup.js         |  2 --
 .../web-app-files/tests/unit/views/views.setup.js     |  4 ++--
 packages/web-runtime/src/store/app.js                 |  3 +--
 packages/web-runtime/src/store/user.js                |  2 +-
 11 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/packages/web-app-files/src/mixins/actions/acceptShare.js b/packages/web-app-files/src/mixins/actions/acceptShare.js
index 1f0a1caf7bc..1bf09c24559 100644
--- a/packages/web-app-files/src/mixins/actions/acceptShare.js
+++ b/packages/web-app-files/src/mixins/actions/acceptShare.js
@@ -1,13 +1,18 @@
 import { triggerShareAction } from '../../helpers/share/triggerShareAction'
 
-import { mapActions, mapGetters, mapMutations } from 'vuex'
+import { mapActions, mapMutations } from 'vuex'
 import PQueue from 'p-queue'
 import { ShareStatus } from '../../helpers/share'
 import { isLocationSharesActive } from '../../router'
+import { useCapabilityFilesSharingResharing } from 'web-runtime/src/composables'
 
 export default {
   computed: {
-    ...mapGetters(['isOcis']),
+    setup() {
+      return {
+        resharingCapability: useCapabilityFilesSharingResharing()
+      }
+    },
     $_acceptShare_items() {
       return [
         {
@@ -50,7 +55,7 @@ export default {
               const share = await triggerShareAction(
                 resource,
                 ShareStatus.accepted,
-                !this.isOcis,
+                this.resharingCapability,
                 this.$client
               )
               if (share) {
diff --git a/packages/web-app-files/src/mixins/actions/declineShare.js b/packages/web-app-files/src/mixins/actions/declineShare.js
index 43323435edf..76ed258ba6d 100644
--- a/packages/web-app-files/src/mixins/actions/declineShare.js
+++ b/packages/web-app-files/src/mixins/actions/declineShare.js
@@ -1,12 +1,17 @@
 import { triggerShareAction } from '../../helpers/share/triggerShareAction'
 import { isLocationSharesActive } from '../../router'
-import { mapActions, mapGetters, mapMutations } from 'vuex'
+import { mapActions, mapMutations } from 'vuex'
 import PQueue from 'p-queue'
 import { ShareStatus } from '../../helpers/share'
+import { useCapabilityFilesSharingResharing } from 'web-runtime/src/composables'
 
 export default {
+  setup() {
+    return {
+      resharingCapability: useCapabilityFilesSharingResharing()
+    }
+  },
   computed: {
-    ...mapGetters(['isOcis']),
     $_declineShare_items() {
       return [
         {
@@ -49,7 +54,7 @@ export default {
               const share = await triggerShareAction(
                 resource,
                 ShareStatus.declined,
-                !this.isOcis,
+                this.resharingCapability,
                 this.$client
               )
               if (share) {
diff --git a/packages/web-app-files/src/views/shares/SharedWithMe.vue b/packages/web-app-files/src/views/shares/SharedWithMe.vue
index 826e70211ab..4355d686f37 100644
--- a/packages/web-app-files/src/views/shares/SharedWithMe.vue
+++ b/packages/web-app-files/src/views/shares/SharedWithMe.vue
@@ -266,7 +266,7 @@ export default {
 
   computed: {
     ...mapGetters('Files', ['selectedFiles']),
-    ...mapGetters(['isOcis', 'configuration', 'getToken']),
+    ...mapGetters(['configuration', 'getToken']),
     ...mapState('Files/sidebar', { sidebarClosed: 'closed' }),
 
     // pending shares
diff --git a/packages/web-app-files/src/views/shares/SharedWithOthers.vue b/packages/web-app-files/src/views/shares/SharedWithOthers.vue
index 48d2bab36c0..4db04838a7e 100644
--- a/packages/web-app-files/src/views/shares/SharedWithOthers.vue
+++ b/packages/web-app-files/src/views/shares/SharedWithOthers.vue
@@ -86,7 +86,7 @@ export default {
     ...mapState(['app']),
     ...mapState('Files', ['files']),
     ...mapGetters('Files', ['highlightedFile', 'selectedFiles', 'totalFilesCount']),
-    ...mapGetters(['isOcis', 'configuration', 'getToken', 'user']),
+    ...mapGetters(['configuration', 'getToken', 'user']),
     ...mapState('Files/sidebar', { sidebarClosed: 'closed' }),
 
     selected: {
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js
index 8fbde376718..3826567fea4 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js
@@ -234,7 +234,6 @@ const storeOptions = (data) => {
       configuration: jest.fn(() => ({
         server: 'http://example.com/'
       })),
-      isOcis: () => false,
       user: () => user,
       capabilities: () => {
         return {
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.spec.js
index b676c62de0f..c00cfca9002 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.spec.js
@@ -112,7 +112,6 @@ function getWrapper({ selectedCollaborators = [], storageId, highlightedFile = f
         }
       },
       getters: {
-        isOcis: () => true,
         getToken: jest.fn(() => 'GFwHKXdsMgoFwt'),
         configuration: jest.fn(() => ({
           server: 'http://example.com/'
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceShares.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceShares.spec.js
index 2578bceb8f0..e93446b2f90 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceShares.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceShares.spec.js
@@ -156,7 +156,6 @@ const storeOptions = (data, isInLoadingState) => {
       }
     },
     getters: {
-      isOcis: () => true,
       user: () => user,
       capabilities: () => {
         return {
diff --git a/packages/web-app-files/tests/unit/components/components.setup.js b/packages/web-app-files/tests/unit/components/components.setup.js
index bfce076ba7a..fa60ae66810 100644
--- a/packages/web-app-files/tests/unit/components/components.setup.js
+++ b/packages/web-app-files/tests/unit/components/components.setup.js
@@ -71,7 +71,6 @@ export const getStore = function ({
   slogan = null,
   user = null,
   generalThemeName = '',
-  isOcis = true,
   selectedResourcesForMove = null,
   locationPickerTargetFolder = null
 } = {}) {
@@ -98,7 +97,6 @@ export const getStore = function ({
         }
       }),
       getToken: () => '',
-      isOcis: () => isOcis,
       homeFolder: () => '/',
       user: () => user
     },
diff --git a/packages/web-app-files/tests/unit/views/views.setup.js b/packages/web-app-files/tests/unit/views/views.setup.js
index bfce076ba7a..2e6c1983130 100644
--- a/packages/web-app-files/tests/unit/views/views.setup.js
+++ b/packages/web-app-files/tests/unit/views/views.setup.js
@@ -71,7 +71,7 @@ export const getStore = function ({
   slogan = null,
   user = null,
   generalThemeName = '',
-  isOcis = true,
+  capabilities = {},
   selectedResourcesForMove = null,
   locationPickerTargetFolder = null
 } = {}) {
@@ -97,8 +97,8 @@ export const getStore = function ({
           disablePreviews: disablePreviews
         }
       }),
+      capabilities: () => capabilities,
       getToken: () => '',
-      isOcis: () => isOcis,
       homeFolder: () => '/',
       user: () => user
     },
diff --git a/packages/web-runtime/src/store/app.js b/packages/web-runtime/src/store/app.js
index 2a1ab5a3cf9..e335677650a 100644
--- a/packages/web-runtime/src/store/app.js
+++ b/packages/web-runtime/src/store/app.js
@@ -105,8 +105,7 @@ 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 {
diff --git a/packages/web-runtime/src/store/user.js b/packages/web-runtime/src/store/user.js
index 56e3dd56c30..2d37a688929 100644
--- a/packages/web-runtime/src/store/user.js
+++ b/packages/web-runtime/src/store/user.js
@@ -1,4 +1,4 @@
-import get from 'lodash-es/get.js'
+import get from 'lodash-es/get'
 import isEmpty from 'lodash-es/isEmpty'
 import initVueAuthenticate from '../services/auth'
 import { router } from '../router'

From 0c1df639c84511892427218ef2e281f1d3aceb0b Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Fri, 18 Mar 2022 12:23:50 +0100
Subject: [PATCH 08/12] Rename resharingCapability computed property to
 hasResharing

---
 .../SideBar/Shares/Collaborators/ListItem.vue  |  6 +++---
 .../InviteCollaboratorForm.vue                 |  6 +++---
 .../src/mixins/actions/acceptShare.js          |  4 ++--
 .../src/mixins/actions/declineShare.js         |  4 ++--
 .../src/services/folder/loaderSharedViaLink.ts |  4 ++--
 .../src/services/folder/loaderSharedWithMe.ts  |  4 ++--
 .../services/folder/loaderSharedWithOthers.ts  |  4 ++--
 .../capability/useCapability.spec.ts           | 18 +++++++++---------
 8 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue
index 278b393523e..2626004ae1c 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue
@@ -66,7 +66,7 @@
         :share-id="share.id"
         :existing-permissions="share.customPermissions"
         :existing-role="share.role"
-        :allow-share-permission="resharingCapability || isSpace"
+        :allow-share-permission="hasResharing || isSpace"
         class="files-collaborators-collaborator-role"
         @optionChange="shareRoleChanged"
       />
@@ -115,7 +115,7 @@ export default {
   },
   setup() {
     return {
-      resharingCapability: useCapabilityFilesSharingResharing()
+      hasResharing: useCapabilityFilesSharingResharing()
     }
   },
   computed: {
@@ -270,7 +270,7 @@ export default {
       const bitmask = role.hasCustomPermissions
         ? SharePermissions.permissionsToBitmask(permissions)
         : SharePermissions.permissionsToBitmask(
-            role.permissions(this.resharingCapability || this.shareType === ShareTypes.space)
+            role.permissions(this.hasResharing || this.shareType === ShareTypes.space)
           )
       this.changeShare({
         client: this.$client,
diff --git a/packages/web-app-files/src/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.vue b/packages/web-app-files/src/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.vue
index 3c6c8fcad57..a7007fff134 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.vue
@@ -42,7 +42,7 @@
     <div class="oc-flex oc-flex-middle oc-flex-between oc-mb-l">
       <role-dropdown
         :resource="highlightedFile"
-        :allow-share-permission="resharingCapability || resourceIsSpace"
+        :allow-share-permission="hasResharing || resourceIsSpace"
         @optionChange="collaboratorRoleChanged"
       />
       <expiration-datepicker
@@ -99,7 +99,7 @@ export default {
   },
   setup() {
     return {
-      resharingCapability: useCapabilityFilesSharingResharing()
+      hasResharing: useCapabilityFilesSharingResharing()
     }
   },
   data() {
@@ -258,7 +258,7 @@ export default {
             const bitmask = this.selectedRole.hasCustomPermissions
               ? SharePermissions.permissionsToBitmask(this.customPermissions)
               : SharePermissions.permissionsToBitmask(
-                  this.selectedRole.permissions(this.resharingCapability || this.resourceIsSpace)
+                  this.selectedRole.permissions(this.hasResharing || this.resourceIsSpace)
                 )
 
             let storageId
diff --git a/packages/web-app-files/src/mixins/actions/acceptShare.js b/packages/web-app-files/src/mixins/actions/acceptShare.js
index 1bf09c24559..e5d2b64ac4f 100644
--- a/packages/web-app-files/src/mixins/actions/acceptShare.js
+++ b/packages/web-app-files/src/mixins/actions/acceptShare.js
@@ -10,7 +10,7 @@ export default {
   computed: {
     setup() {
       return {
-        resharingCapability: useCapabilityFilesSharingResharing()
+        hasResharing: useCapabilityFilesSharingResharing()
       }
     },
     $_acceptShare_items() {
@@ -55,7 +55,7 @@ export default {
               const share = await triggerShareAction(
                 resource,
                 ShareStatus.accepted,
-                this.resharingCapability,
+                this.hasResharing,
                 this.$client
               )
               if (share) {
diff --git a/packages/web-app-files/src/mixins/actions/declineShare.js b/packages/web-app-files/src/mixins/actions/declineShare.js
index 76ed258ba6d..a99d269f833 100644
--- a/packages/web-app-files/src/mixins/actions/declineShare.js
+++ b/packages/web-app-files/src/mixins/actions/declineShare.js
@@ -8,7 +8,7 @@ import { useCapabilityFilesSharingResharing } from 'web-runtime/src/composables'
 export default {
   setup() {
     return {
-      resharingCapability: useCapabilityFilesSharingResharing()
+      hasResharing: useCapabilityFilesSharingResharing()
     }
   },
   computed: {
@@ -54,7 +54,7 @@ export default {
               const share = await triggerShareAction(
                 resource,
                 ShareStatus.declined,
-                this.resharingCapability,
+                this.hasResharing,
                 this.$client
               )
               if (share) {
diff --git a/packages/web-app-files/src/services/folder/loaderSharedViaLink.ts b/packages/web-app-files/src/services/folder/loaderSharedViaLink.ts
index e77b608ab38..772250826ec 100644
--- a/packages/web-app-files/src/services/folder/loaderSharedViaLink.ts
+++ b/packages/web-app-files/src/services/folder/loaderSharedViaLink.ts
@@ -17,7 +17,7 @@ export class FolderLoaderSharedViaLink implements FolderLoader {
       clientService: { owncloudSdk: client }
     } = context
 
-    const resharingCapability = useCapabilityFilesSharingResharing(store)
+    const hasResharing = useCapabilityFilesSharingResharing(store)
 
     return useTask(function* (signal1, signal2) {
       store.commit('Files/CLEAR_CURRENT_FILES_LIST')
@@ -38,7 +38,7 @@ export class FolderLoaderSharedViaLink implements FolderLoader {
         resources = aggregateResourceShares(
           resources,
           false,
-          unref(resharingCapability),
+          unref(hasResharing),
           configuration.server,
           getToken
         )
diff --git a/packages/web-app-files/src/services/folder/loaderSharedWithMe.ts b/packages/web-app-files/src/services/folder/loaderSharedWithMe.ts
index c38bfeb931a..536c2414fbb 100644
--- a/packages/web-app-files/src/services/folder/loaderSharedWithMe.ts
+++ b/packages/web-app-files/src/services/folder/loaderSharedWithMe.ts
@@ -17,7 +17,7 @@ export class FolderLoaderSharedWithMe implements FolderLoader {
       clientService: { owncloudSdk: client }
     } = context
 
-    const resharingCapability = useCapabilityFilesSharingResharing(store)
+    const hasResharing = useCapabilityFilesSharingResharing(store)
 
     return useTask(function* (signal1, signal2) {
       store.commit('Files/CLEAR_CURRENT_FILES_LIST')
@@ -38,7 +38,7 @@ export class FolderLoaderSharedWithMe implements FolderLoader {
         resources = aggregateResourceShares(
           resources,
           true,
-          unref(resharingCapability),
+          unref(hasResharing),
           configuration.server,
           getToken
         )
diff --git a/packages/web-app-files/src/services/folder/loaderSharedWithOthers.ts b/packages/web-app-files/src/services/folder/loaderSharedWithOthers.ts
index e8c0640b1dc..03bfbe4409d 100644
--- a/packages/web-app-files/src/services/folder/loaderSharedWithOthers.ts
+++ b/packages/web-app-files/src/services/folder/loaderSharedWithOthers.ts
@@ -17,7 +17,7 @@ export class FolderLoaderSharedWithOthers implements FolderLoader {
       clientService: { owncloudSdk: client }
     } = context
 
-    const resharingCapability = useCapabilityFilesSharingResharing(store)
+    const hasResharing = useCapabilityFilesSharingResharing(store)
 
     return useTask(function* (signal1, signal2) {
       store.commit('Files/CLEAR_CURRENT_FILES_LIST')
@@ -38,7 +38,7 @@ export class FolderLoaderSharedWithOthers implements FolderLoader {
         resources = aggregateResourceShares(
           resources,
           false,
-          unref(resharingCapability),
+          unref(hasResharing),
           configuration.server,
           getToken
         )
diff --git a/packages/web-runtime/tests/unit/composables/capability/useCapability.spec.ts b/packages/web-runtime/tests/unit/composables/capability/useCapability.spec.ts
index bbb81e1c1c4..6bfc2494620 100644
--- a/packages/web-runtime/tests/unit/composables/capability/useCapability.spec.ts
+++ b/packages/web-runtime/tests/unit/composables/capability/useCapability.spec.ts
@@ -28,8 +28,8 @@ describe('useCapability', () => {
   })
 
   it('handles bools correctly', () => {
-    const resharingCapability = useCapability<boolean>(store, 'files_sharing.resharing')
-    const resharingCapabilityWithDefault = useCapability<boolean>(
+    const hasResharing = useCapability<boolean>(store, 'files_sharing.resharing')
+    const hasResharingWithDefault = useCapability<boolean>(
       store,
       'files_sharing.resharing',
       true
@@ -37,17 +37,17 @@ describe('useCapability', () => {
 
     // FIXME: how to test this?
     // expect(() => {
-    //     unref(resharingCapability)
+    //     unref(hasResharing)
     // }).rejects.toThrow()
-    expect(unref(resharingCapabilityWithDefault)).toBe(true)
+    expect(unref(hasResharingWithDefault)).toBe(true)
 
     commitValue('files_sharing.resharing', false)
-    expect(unref(resharingCapability)).toBe(false)
-    expect(unref(resharingCapabilityWithDefault)).toBe(false)
+    expect(unref(hasResharing)).toBe(false)
+    expect(unref(hasResharingWithDefault)).toBe(false)
 
     commitValue('files_sharing.resharing', true)
-    expect(unref(resharingCapability)).toBe(true)
-    expect(unref(resharingCapabilityWithDefault)).toBe(true)
+    expect(unref(hasResharing)).toBe(true)
+    expect(unref(hasResharingWithDefault)).toBe(true)
   })
 
   it('handles arrays correctly', () => {
@@ -60,7 +60,7 @@ describe('useCapability', () => {
 
     // FIXME: how to test this?
     // expect(() => {
-    //     unref(resharingCapability)
+    //     unref(hasResharing)
     // }).rejects.toThrow()
     expect(unref(supportedTypesCapabilityWithDefaults)).toStrictEqual(['foo', 'bar'])
 

From 48a45f3eeb28da7cf2a0d642c829cd9b6198a08c Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Fri, 18 Mar 2022 13:46:05 +0100
Subject: [PATCH 09/12] Incorporate PR feedback

---
 packages/web-app-files/src/store/actions.js               | 2 +-
 .../src/composables/capability/useCapability.ts           | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/web-app-files/src/store/actions.js b/packages/web-app-files/src/store/actions.js
index c95c577a662..f91a6b8e4f3 100644
--- a/packages/web-app-files/src/store/actions.js
+++ b/packages/web-app-files/src/store/actions.js
@@ -17,7 +17,7 @@ import { ShareTypes, SpacePeopleShareRoles } from '../helpers/share'
 import { sortSpaceMembers } from '../helpers/space'
 import get from 'lodash-es/get'
 
-const allowSharePermissions = (getters, state) => {
+const allowSharePermissions = (getters) => {
   return get(getters, `capabilities.files_sharing.resharing`, true)
 }
 
diff --git a/packages/web-runtime/src/composables/capability/useCapability.ts b/packages/web-runtime/src/composables/capability/useCapability.ts
index 5e70b848079..1cf9714bde5 100644
--- a/packages/web-runtime/src/composables/capability/useCapability.ts
+++ b/packages/web-runtime/src/composables/capability/useCapability.ts
@@ -9,13 +9,9 @@ export const useCapability = <T>(
   defaultValue?: T
 ): ComputedRef<T> => {
   return computed((): T => {
-    if (defaultValue) {
-      return get(store, `getters.capabilities.${name}`, defaultValue) as T
-    }
-
-    const value = get(store, `getters.capabilities.${name}`) as T
+    const value = get(store, `getters.capabilities.${name}`, defaultValue) as T
     if (value === undefined) {
-      throw new Error('useCapability: capability is not defined and no default was defined')
+      throw new Error('useCapability: capability is not defined and no default was provided')
     }
     return value
   })

From 53e02b560cb3b6572b3f8fc9b24d56083ffd4b82 Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Fri, 18 Mar 2022 15:07:29 +0100
Subject: [PATCH 10/12] Check if settings app is available to decide whether
 account editing should be enabled or not

---
 packages/web-runtime/src/pages/account.vue         | 14 ++++----------
 .../composables/capability/useCapability.spec.ts   |  6 +-----
 .../web-runtime/tests/unit/pages/account.spec.js   |  7 +------
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/packages/web-runtime/src/pages/account.vue b/packages/web-runtime/src/pages/account.vue
index b3191fd2803..375cb6c9287 100644
--- a/packages/web-runtime/src/pages/account.vue
+++ b/packages/web-runtime/src/pages/account.vue
@@ -73,17 +73,8 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import { useCapabilityFilesSharingResharing } from '../composables'
 export default {
   name: 'Personal',
-  setup() {
-    return {
-      // FIXME: We need a clean way to know whether account editing is enabled or not
-      // for now we abuse the files_sharing.resharing capability, as *currently*
-      // oCIS does not support that exactly like it does not support account editing
-      isAccountEditingEnabled: useCapabilityFilesSharingResharing()
-    }
-  },
   data() {
     return {
       loadingGroups: true,
@@ -91,7 +82,10 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['user', 'configuration', 'getNavItemsByExtension']),
+    ...mapGetters(['user', 'configuration', 'getNavItemsByExtension', 'apps']),
+    isAccountEditingEnabled() {
+      return !!this.apps.find((app) => app.id === 'settings')
+    },
     pageTitle() {
       return this.$gettext(this.$route.meta.title)
     },
diff --git a/packages/web-runtime/tests/unit/composables/capability/useCapability.spec.ts b/packages/web-runtime/tests/unit/composables/capability/useCapability.spec.ts
index 6bfc2494620..5ca005acaa1 100644
--- a/packages/web-runtime/tests/unit/composables/capability/useCapability.spec.ts
+++ b/packages/web-runtime/tests/unit/composables/capability/useCapability.spec.ts
@@ -29,11 +29,7 @@ describe('useCapability', () => {
 
   it('handles bools correctly', () => {
     const hasResharing = useCapability<boolean>(store, 'files_sharing.resharing')
-    const hasResharingWithDefault = useCapability<boolean>(
-      store,
-      'files_sharing.resharing',
-      true
-    )
+    const hasResharingWithDefault = useCapability<boolean>(store, 'files_sharing.resharing', true)
 
     // FIXME: how to test this?
     // expect(() => {
diff --git a/packages/web-runtime/tests/unit/pages/account.spec.js b/packages/web-runtime/tests/unit/pages/account.spec.js
index 5f95bebea43..c8a87795f9f 100644
--- a/packages/web-runtime/tests/unit/pages/account.spec.js
+++ b/packages/web-runtime/tests/unit/pages/account.spec.js
@@ -158,12 +158,7 @@ function getStore({
         server: server
       }),
       getNavItemsByExtension: () => getNavItemsByExtension,
-      // FIXME: see account.vue
-      capabilities: () => ({
-        files_sharing: {
-          resharing: isAccountEditingEnabled
-        }
-      })
+      apps: () => (isAccountEditingEnabled ? [{ id: 'settings' }] : [])
     }
   })
 }

From 4727611ab16c7a19876149aa2d41579a7f16b322 Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Fri, 18 Mar 2022 15:17:52 +0100
Subject: [PATCH 11/12] Move capability composables to web-pkg

---
 .../src/components/SideBar/Shares/Collaborators/ListItem.vue    | 2 +-
 .../Shares/InviteCollaborator/InviteCollaboratorForm.vue        | 2 +-
 packages/web-app-files/src/mixins/actions/acceptShare.js        | 2 +-
 packages/web-app-files/src/mixins/actions/declineShare.js       | 2 +-
 .../web-app-files/src/services/folder/loaderSharedViaLink.ts    | 2 +-
 .../web-app-files/src/services/folder/loaderSharedWithMe.ts     | 2 +-
 .../web-app-files/src/services/folder/loaderSharedWithOthers.ts | 2 +-
 .../src/composables/capability/index.ts                         | 0
 .../src/composables/capability/useCapability.ts                 | 0
 packages/web-pkg/src/composables/index.ts                       | 1 +
 .../tests/unit/composables/capability/spec/index.ts             | 0
 .../tests/unit/composables/capability/useCapability.spec.ts     | 2 +-
 packages/web-runtime/src/composables/index.ts                   | 1 -
 13 files changed, 9 insertions(+), 9 deletions(-)
 rename packages/{web-runtime => web-pkg}/src/composables/capability/index.ts (100%)
 rename packages/{web-runtime => web-pkg}/src/composables/capability/useCapability.ts (100%)
 rename packages/{web-runtime => web-pkg}/tests/unit/composables/capability/spec/index.ts (100%)
 rename packages/{web-runtime => web-pkg}/tests/unit/composables/capability/useCapability.spec.ts (97%)

diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue
index 2626004ae1c..7a320e0f61a 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue
@@ -94,7 +94,7 @@ import EditDropdown from './EditDropdown.vue'
 import RoleDropdown from '../RoleDropdown.vue'
 import { SharePermissions, ShareTypes } from '../../../../helpers/share'
 import { clientService } from 'web-pkg/src/services'
-import { useCapabilityFilesSharingResharing } from 'web-runtime/src/composables'
+import { useCapabilityFilesSharingResharing } from 'web-pkg/src/composables'
 
 export default {
   name: 'ListItem',
diff --git a/packages/web-app-files/src/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.vue b/packages/web-app-files/src/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.vue
index a7007fff134..2548046395b 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.vue
@@ -87,7 +87,7 @@ import {
   SpacePeopleShareRoles
 } from '../../../../helpers/share'
 import { clientService } from 'web-pkg/src/services'
-import { useCapabilityFilesSharingResharing } from 'web-runtime/src/composables'
+import { useCapabilityFilesSharingResharing } from 'web-pkg/src/composables'
 
 export default {
   name: 'InviteCollaboratorForm',
diff --git a/packages/web-app-files/src/mixins/actions/acceptShare.js b/packages/web-app-files/src/mixins/actions/acceptShare.js
index e5d2b64ac4f..5b7a085f245 100644
--- a/packages/web-app-files/src/mixins/actions/acceptShare.js
+++ b/packages/web-app-files/src/mixins/actions/acceptShare.js
@@ -4,7 +4,7 @@ import { mapActions, mapMutations } from 'vuex'
 import PQueue from 'p-queue'
 import { ShareStatus } from '../../helpers/share'
 import { isLocationSharesActive } from '../../router'
-import { useCapabilityFilesSharingResharing } from 'web-runtime/src/composables'
+import { useCapabilityFilesSharingResharing } from 'web-pkg/src/composables'
 
 export default {
   computed: {
diff --git a/packages/web-app-files/src/mixins/actions/declineShare.js b/packages/web-app-files/src/mixins/actions/declineShare.js
index a99d269f833..152d3c91bf0 100644
--- a/packages/web-app-files/src/mixins/actions/declineShare.js
+++ b/packages/web-app-files/src/mixins/actions/declineShare.js
@@ -3,7 +3,7 @@ import { isLocationSharesActive } from '../../router'
 import { mapActions, mapMutations } from 'vuex'
 import PQueue from 'p-queue'
 import { ShareStatus } from '../../helpers/share'
-import { useCapabilityFilesSharingResharing } from 'web-runtime/src/composables'
+import { useCapabilityFilesSharingResharing } from 'web-pkg/src/composables'
 
 export default {
   setup() {
diff --git a/packages/web-app-files/src/services/folder/loaderSharedViaLink.ts b/packages/web-app-files/src/services/folder/loaderSharedViaLink.ts
index 772250826ec..4a859b3ca77 100644
--- a/packages/web-app-files/src/services/folder/loaderSharedViaLink.ts
+++ b/packages/web-app-files/src/services/folder/loaderSharedViaLink.ts
@@ -3,7 +3,7 @@ import Router from 'vue-router'
 import { useTask } from 'vue-concurrency'
 import { isLocationSharesActive } from '../../router'
 import { aggregateResourceShares } from '../../helpers/resources'
-import { useCapabilityFilesSharingResharing } from 'web-runtime/src/composables'
+import { useCapabilityFilesSharingResharing } from 'web-pkg/src/composables'
 import { unref } from '@vue/composition-api'
 
 export class FolderLoaderSharedViaLink implements FolderLoader {
diff --git a/packages/web-app-files/src/services/folder/loaderSharedWithMe.ts b/packages/web-app-files/src/services/folder/loaderSharedWithMe.ts
index 536c2414fbb..f8afeb62e94 100644
--- a/packages/web-app-files/src/services/folder/loaderSharedWithMe.ts
+++ b/packages/web-app-files/src/services/folder/loaderSharedWithMe.ts
@@ -3,7 +3,7 @@ import Router from 'vue-router'
 import { useTask } from 'vue-concurrency'
 import { aggregateResourceShares } from '../../helpers/resources'
 import { isLocationSharesActive } from '../../router'
-import { useCapabilityFilesSharingResharing } from 'web-runtime/src/composables'
+import { useCapabilityFilesSharingResharing } from 'web-pkg/src/composables'
 import { unref } from '@vue/composition-api'
 
 export class FolderLoaderSharedWithMe implements FolderLoader {
diff --git a/packages/web-app-files/src/services/folder/loaderSharedWithOthers.ts b/packages/web-app-files/src/services/folder/loaderSharedWithOthers.ts
index 03bfbe4409d..6c9697b33f4 100644
--- a/packages/web-app-files/src/services/folder/loaderSharedWithOthers.ts
+++ b/packages/web-app-files/src/services/folder/loaderSharedWithOthers.ts
@@ -3,7 +3,7 @@ import Router from 'vue-router'
 import { useTask } from 'vue-concurrency'
 import { isLocationSharesActive } from '../../router'
 import { aggregateResourceShares } from '../../helpers/resources'
-import { useCapabilityFilesSharingResharing } from 'web-runtime/src/composables'
+import { useCapabilityFilesSharingResharing } from 'web-pkg/src/composables'
 import { unref } from '@vue/composition-api'
 
 export class FolderLoaderSharedWithOthers implements FolderLoader {
diff --git a/packages/web-runtime/src/composables/capability/index.ts b/packages/web-pkg/src/composables/capability/index.ts
similarity index 100%
rename from packages/web-runtime/src/composables/capability/index.ts
rename to packages/web-pkg/src/composables/capability/index.ts
diff --git a/packages/web-runtime/src/composables/capability/useCapability.ts b/packages/web-pkg/src/composables/capability/useCapability.ts
similarity index 100%
rename from packages/web-runtime/src/composables/capability/useCapability.ts
rename to packages/web-pkg/src/composables/capability/useCapability.ts
diff --git a/packages/web-pkg/src/composables/index.ts b/packages/web-pkg/src/composables/index.ts
index fce45b7a991..80eebb293a8 100644
--- a/packages/web-pkg/src/composables/index.ts
+++ b/packages/web-pkg/src/composables/index.ts
@@ -1,4 +1,5 @@
 export * from './appDefaults'
+export * from './capability'
 export * from './clientService'
 export * from './localStorage'
 export * from './reactivity'
diff --git a/packages/web-runtime/tests/unit/composables/capability/spec/index.ts b/packages/web-pkg/tests/unit/composables/capability/spec/index.ts
similarity index 100%
rename from packages/web-runtime/tests/unit/composables/capability/spec/index.ts
rename to packages/web-pkg/tests/unit/composables/capability/spec/index.ts
diff --git a/packages/web-runtime/tests/unit/composables/capability/useCapability.spec.ts b/packages/web-pkg/tests/unit/composables/capability/useCapability.spec.ts
similarity index 97%
rename from packages/web-runtime/tests/unit/composables/capability/useCapability.spec.ts
rename to packages/web-pkg/tests/unit/composables/capability/useCapability.spec.ts
index 5ca005acaa1..0bf899459fc 100644
--- a/packages/web-runtime/tests/unit/composables/capability/useCapability.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/capability/useCapability.spec.ts
@@ -2,7 +2,7 @@ import { unref } from '@vue/composition-api'
 import { createWrapper } from './spec'
 import { useCapability } from '../../../../src/composables/capability/useCapability'
 import { Store } from 'vuex'
-import user from '../../../../src/store/user'
+import user from 'web-runtime/src/store/user'
 import set from 'lodash-es/set'
 
 let store
diff --git a/packages/web-runtime/src/composables/index.ts b/packages/web-runtime/src/composables/index.ts
index 7946db02dc9..fc6c2f69f68 100644
--- a/packages/web-runtime/src/composables/index.ts
+++ b/packages/web-runtime/src/composables/index.ts
@@ -1,2 +1 @@
 export * from './theme'
-export * from './capability'

From 403a1281684a89d74b42c9e53cdd57f319284af3 Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Fri, 18 Mar 2022 20:12:16 +0100
Subject: [PATCH 12/12] fixup! Move capability composables to web-pkg

---
 packages/web-runtime/src/pages/account.vue            | 2 +-
 packages/web-runtime/tests/unit/pages/account.spec.js | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/web-runtime/src/pages/account.vue b/packages/web-runtime/src/pages/account.vue
index 375cb6c9287..d7e370327dd 100644
--- a/packages/web-runtime/src/pages/account.vue
+++ b/packages/web-runtime/src/pages/account.vue
@@ -84,7 +84,7 @@ export default {
   computed: {
     ...mapGetters(['user', 'configuration', 'getNavItemsByExtension', 'apps']),
     isAccountEditingEnabled() {
-      return !!this.apps.find((app) => app.id === 'settings')
+      return !this.apps.settings
     },
     pageTitle() {
       return this.$gettext(this.$route.meta.title)
diff --git a/packages/web-runtime/tests/unit/pages/account.spec.js b/packages/web-runtime/tests/unit/pages/account.spec.js
index c8a87795f9f..3c177b92b46 100644
--- a/packages/web-runtime/tests/unit/pages/account.spec.js
+++ b/packages/web-runtime/tests/unit/pages/account.spec.js
@@ -158,7 +158,9 @@ function getStore({
         server: server
       }),
       getNavItemsByExtension: () => getNavItemsByExtension,
-      apps: () => (isAccountEditingEnabled ? [{ id: 'settings' }] : [])
+      apps: () => ({
+        ...(isAccountEditingEnabled || { settings: {} })
+      })
     }
   })
 }