refactor: use sharing NG for share listings

.drone.env

@@ -1,3 +1,3 @@
 # The version of OCIS to use in pipelines that test against OCIS
-OCIS_COMMITID=01d40c27833bf131db0c8251359e7a6cf3087bd0
+OCIS_COMMITID=d73351af89b609e06004148c506fce865f3407bd
 OCIS_BRANCH=master

packages/web-app-files/src/services/folder.ts

@@ -12,7 +12,9 @@ import {
   useConfigStore,
   ConfigStore,
   ResourcesStore,
-  useResourcesStore
+  useResourcesStore,
+  SharesStore,
+  useSharesStore
 } from '@ownclouders/web-pkg'
 import { unref } from 'vue'
 import { ClientService } from '@ownclouders/web-pkg'
@@ -38,6 +40,7 @@ export type TaskContext = {
   router: Router
   capabilityStore: CapabilityStore
   resourcesStore: ResourcesStore
+  sharesStore: SharesStore
 }
 
 export interface FolderLoader {
@@ -68,6 +71,7 @@ export class FolderService {
     const clientService = useClientService()
     const configStore = useConfigStore()
     const resourcesStore = useResourcesStore()
+    const sharesStore = useSharesStore()
 
     const loader = this.loaders.find((l) => l.isEnabled() && l.isActive(unref(router)))
     if (!loader) {
@@ -83,6 +87,7 @@ export class FolderService {
         spacesStore,
         capabilityStore,
         resourcesStore,
+        sharesStore,
         router
       }
       try {

packages/web-app-files/src/services/folder/loaderSharedViaLink.ts

@@ -2,8 +2,7 @@ import { FolderLoader, FolderLoaderTask, TaskContext } from '../folder'
 import { Router } from 'vue-router'
 import { useTask } from 'vue-concurrency'
 import { isLocationSharesActive } from '@ownclouders/web-pkg'
-import { ShareTypes } from '@ownclouders/web-client/src/helpers/share'
-import { aggregateResourceShares } from '@ownclouders/web-client/src/helpers/share'
+import { buildOutgoingShareResource } from '@ownclouders/web-client/src/helpers/share/functionsNG'
 
 export class FolderLoaderSharedViaLink implements FolderLoader {
   public isEnabled(): boolean {
@@ -15,9 +14,7 @@ export class FolderLoaderSharedViaLink implements FolderLoader {
   }
 
   public getTask(context: TaskContext): FolderLoaderTask {
-    const { userStore, spacesStore, clientService, configStore, capabilityStore, resourcesStore } =
-      context
-    const { owncloudSdk: client } = clientService
+    const { userStore, spacesStore, clientService, configStore, resourcesStore } = context
 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     return useTask(function* (signal1, signal2) {
@@ -28,28 +25,13 @@ export class FolderLoaderSharedViaLink implements FolderLoader {
         yield spacesStore.loadMountPoints({ graphClient: clientService.graphAuthenticated })
       }
 
-      let resources = yield client.shares.getShares('', {
-        share_types: ShareTypes.link.value.toString(),
-        include_tags: false
-      })
-
-      resources = resources.map((r) => r.shareInfo)
-      if (resources.length) {
-        resources = aggregateResourceShares({
-          shares: resources,
-          spaces: spacesStore.spaces,
-          incomingShares: false,
-          allowSharePermission: capabilityStore.sharingResharing,
-          hasShareJail: capabilityStore.spacesShareJail,
-          fullShareOwnerPaths: configStore.options.routing.fullShareOwnerPaths
-        }).map((resource) => {
-          // info: in oc10 we have no storageId in resources. All resources are mounted into the personal space.
-          if (!resource.storageId) {
-            resource.storageId = userStore.user.onPremisesSamAccountName
-          }
-          return resource
-        })
-      }
+      const {
+        data: { value }
+      } = yield clientService.graphAuthenticated.drives.listSharedByMe()
+
+      const resources = value
+        .filter((s) => s.permissions.some(({ link }) => !!link))
+        .map((driveItem) => buildOutgoingShareResource({ driveItem, user: userStore.user }))
 
       resourcesStore.initResourceList({ currentFolder: null, resources })
     })

packages/web-app-files/src/services/folder/loaderSharedWithMe.ts

@@ -1,7 +1,7 @@
 import { FolderLoader, FolderLoaderTask, TaskContext } from '../folder'
 import { Router } from 'vue-router'
 import { useTask } from 'vue-concurrency'
-import { aggregateResourceShares } from '@ownclouders/web-client/src/helpers/share'
+import { buildIncomingShareResource } from '@ownclouders/web-client/src/helpers/share/functionsNG'
 import { isLocationSharesActive } from '@ownclouders/web-pkg'
 
 export class FolderLoaderSharedWithMe implements FolderLoader {
@@ -14,8 +14,7 @@ export class FolderLoaderSharedWithMe implements FolderLoader {
   }
 
   public getTask(context: TaskContext): FolderLoaderTask {
-    const { userStore, spacesStore, clientService, configStore, capabilityStore, resourcesStore } =
-      context
+    const { spacesStore, clientService, configStore, resourcesStore, sharesStore } = context
 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     return useTask(function* (signal1, signal2) {
@@ -26,31 +25,13 @@ export class FolderLoaderSharedWithMe implements FolderLoader {
         yield spacesStore.loadMountPoints({ graphClient: clientService.graphAuthenticated })
       }
 
-      let resources = yield clientService.owncloudSdk.shares.getShares('', {
-        state: 'all',
-        include_tags: false,
-        shared_with_me: true,
-        show_hidden: true
-      })
-
-      resources = resources.map((r) => r.shareInfo)
-
-      if (resources.length) {
-        resources = aggregateResourceShares({
-          shares: resources,
-          spaces: spacesStore.spaces,
-          incomingShares: true,
-          allowSharePermission: capabilityStore.sharingResharing,
-          hasShareJail: capabilityStore.spacesShareJail,
-          fullShareOwnerPaths: configStore.options.routing.fullShareOwnerPaths
-        }).map((resource) => {
-          // info: in oc10 we have no storageId in resources. All resources are mounted into the personal space.
-          if (!resource.storageId) {
-            resource.storageId = userStore.user.onPremisesSamAccountName
-          }
-          return resource
-        })
-      }
+      const {
+        data: { value }
+      } = yield clientService.graphAuthenticated.drives.listSharedWithMe()
+
+      const resources = value.map((driveItem) =>
+        buildIncomingShareResource({ driveItem, graphRoles: sharesStore.graphRoles })
+      )
 
       resourcesStore.initResourceList({ currentFolder: null, resources })
     })

packages/web-app-files/src/services/folder/loaderSharedWithOthers.ts

@@ -2,8 +2,7 @@ import { FolderLoader, FolderLoaderTask, TaskContext } from '../folder'
 import { Router } from 'vue-router'
 import { useTask } from 'vue-concurrency'
 import { isLocationSharesActive } from '@ownclouders/web-pkg'
-import { aggregateResourceShares } from '@ownclouders/web-client/src/helpers/share'
-import { peopleRoleDenyFolder, ShareTypes } from '@ownclouders/web-client/src/helpers/share'
+import { buildOutgoingShareResource } from '@ownclouders/web-client/src/helpers/share/functionsNG'
 
 export class FolderLoaderSharedWithOthers implements FolderLoader {
   public isEnabled(): boolean {
@@ -15,9 +14,7 @@ export class FolderLoaderSharedWithOthers implements FolderLoader {
   }
 
   public getTask(context: TaskContext): FolderLoaderTask {
-    const { userStore, spacesStore, clientService, configStore, capabilityStore, resourcesStore } =
-      context
-    const { owncloudSdk: client } = clientService
+    const { userStore, spacesStore, clientService, configStore, resourcesStore } = context
 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     return useTask(function* (signal1, signal2) {
@@ -28,37 +25,13 @@ export class FolderLoaderSharedWithOthers implements FolderLoader {
         yield spacesStore.loadMountPoints({ graphClient: clientService.graphAuthenticated })
       }
 
-      const shareTypes = ShareTypes.authenticated
-        .filter(
-          (type) => ![ShareTypes.spaceUser.value, ShareTypes.spaceGroup.value].includes(type.value)
-        )
-        .map((share) => share.value)
-        .join(',')
+      const {
+        data: { value }
+      } = yield clientService.graphAuthenticated.drives.listSharedByMe()
 
-      let resources = yield client.shares.getShares('', {
-        share_types: shareTypes,
-        reshares: true,
-        include_tags: false
-      })
-      resources = resources
-        .filter((r) => parseInt(r.shareInfo.permissions) !== peopleRoleDenyFolder.bitmask(false))
-        .map((r) => r.shareInfo)
-      if (resources.length) {
-        resources = aggregateResourceShares({
-          shares: resources,
-          spaces: spacesStore.spaces,
-          incomingShares: false,
-          allowSharePermission: capabilityStore.sharingResharing,
-          hasShareJail: capabilityStore.spacesShareJail,
-          fullShareOwnerPaths: configStore.options.routing.fullShareOwnerPaths
-        }).map((resource) => {
-          // info: in oc10 we have no storageId in resources. All resources are mounted into the personal space.
-          if (!resource.storageId) {
-            resource.storageId = userStore.user.onPremisesSamAccountName
-          }
-          return resource
-        })
-      }
+      const resources = value
+        .filter((s) => s.permissions.some(({ link }) => !link))
+        .map((driveItem) => buildOutgoingShareResource({ driveItem, user: userStore.user }))
 
       resourcesStore.initResourceList({ currentFolder: null, resources })
     })

packages/web-app-files/src/views/shares/SharedWithMe.vue

@@ -181,8 +181,10 @@ export default defineComponent({
 
       const selectedShareTypes = queryItemAsString(unref(selectedShareTypesQuery))?.split('+')
       if (selectedShareTypes?.length) {
-        result = result.filter(({ shareType }) => {
-          return selectedShareTypes.map((t) => ShareTypes[t].value).includes(shareType)
+        result = result.filter(({ shareTypes }) => {
+          return selectedShareTypes
+            .map((t) => ShareTypes[t].value)
+            .some((t) => shareTypes.includes(t))
         })
       }
 
@@ -244,7 +246,7 @@ export default defineComponent({
     }
 
     const shareTypes = computed(() => {
-      const uniqueShareTypes = uniq(unref(paginatedResources).map((i) => i.shareType))
+      const uniqueShareTypes = uniq(unref(paginatedResources).flatMap((i) => i.shareTypes))
       return ShareTypes.getByValues(uniqueShareTypes)
     })
 

packages/web-app-files/tests/unit/components/SideBar/Details/FileDetails.spec.ts

@@ -35,7 +35,7 @@ const getResourceMock = ({
     shareTypes,
     locked,
     canEditTags: vi.fn(() => canEditTags),
-    ...(sharedBy && { shareType: 0 })
+    ...(sharedBy && { sharedWith: [] })
   })
 
 const selectors = {

packages/web-app-files/tests/unit/views/shares/SharedWithMe.spec.ts

@@ -84,8 +84,8 @@ describe('SharedWithMe view', () => {
         const shareType2 = ShareTypes.group
         const { wrapper } = getMountedWrapper({
           files: [
-            mock<ShareResource>({ shareType: shareType1.value }),
-            mock<ShareResource>({ shareType: shareType2.value })
+            mock<ShareResource>({ shareTypes: [shareType1.value] }),
+            mock<ShareResource>({ shareTypes: [shareType2.value] })
           ]
         })
         const filterItems = wrapper.findComponent<any>('.share-type-filter').props('items')
@@ -101,11 +101,11 @@ describe('SharedWithMe view', () => {
           files: [
             mock<ShareResource>({
               sharedBy: collaborator1,
-              shareType: ShareTypes.user.value
+              shareTypes: [ShareTypes.user.value]
             }),
             mock<ShareResource>({
               sharedBy: collaborator2,
-              shareType: ShareTypes.user.value
+              shareTypes: [ShareTypes.user.value]
             })
           ]
         })
@@ -125,12 +125,12 @@ describe('SharedWithMe view', () => {
             mock<ShareResource>({
               name: 'share1',
               hidden: false,
-              shareType: ShareTypes.user.value
+              shareTypes: [ShareTypes.user.value]
             }),
             mock<ShareResource>({
               name: 'share2',
               hidden: false,
-              shareType: ShareTypes.user.value
+              shareTypes: [ShareTypes.user.value]
             })
           ]
         })

packages/web-client/src/graph.ts

@@ -24,7 +24,11 @@ import {
   ApplicationsApiFactory,
   UserAppRoleAssignmentApiFactory,
   AppRoleAssignment,
-  ExportPersonalDataRequest
+  ExportPersonalDataRequest,
+  MeDriveApiFactory,
+  RoleManagementApiFactory,
+  UnifiedRoleDefinition,
+  CollectionOfDriveItems1
 } from './generated'
 
 export interface Graph {
@@ -39,6 +43,8 @@ export interface Graph {
   drives: {
     listMyDrives: (orderBy?: string, filter?: string) => Promise<AxiosResponse<CollectionOfDrives>>
     listAllDrives: (orderBy?: string, filter?: string) => Promise<AxiosResponse<CollectionOfDrives>>
+    listSharedWithMe: () => AxiosPromise<CollectionOfDriveItems1>
+    listSharedByMe: () => AxiosPromise<CollectionOfDriveItems1>
     getDrive: (id: string) => AxiosPromise<Drive>
     createDrive: (drive: Drive, options: any) => AxiosPromise<Drive>
     updateDrive: (id: string, drive: Drive, options: any) => AxiosPromise<Drive>
@@ -72,6 +78,9 @@ export interface Graph {
     addMember: (groupId: string, userId: string, server: string) => AxiosPromise<void>
     deleteMember: (groupId: string, userId: string) => AxiosPromise<void>
   }
+  roleManagement: {
+    listPermissionRoleDefinitions: () => AxiosPromise<UnifiedRoleDefinition>
+  }
 }
 
 export const graph = (baseURI: string, axiosClient: AxiosInstance): Graph => {
@@ -84,6 +93,7 @@ export const graph = (baseURI: string, axiosClient: AxiosInstance): Graph => {
   const meDrivesApi = new MeDrivesApi(config, config.basePath, axiosClient)
   const allDrivesApi = new DrivesGetDrivesApi(config, config.basePath, axiosClient)
   const meUserApiFactory = MeUserApiFactory(config, config.basePath, axiosClient)
+  const meDriveApiFactory = MeDriveApiFactory(config, config.basePath, axiosClient)
   const meChangepasswordApiFactory = MeChangepasswordApiFactory(
     config,
     config.basePath,
@@ -101,6 +111,7 @@ export const graph = (baseURI: string, axiosClient: AxiosInstance): Graph => {
   const groupsApiFactory = GroupsApiFactory(config, config.basePath, axiosClient)
   const drivesApiFactory = DrivesApiFactory(config, config.basePath, axiosClient)
   const tagsApiFactory = TagsApiFactory(config, config.basePath, axiosClient)
+  const roleManagementApiFactory = RoleManagementApiFactory(config, config.basePath, axiosClient)
 
   return <Graph>{
     applications: {
@@ -117,6 +128,8 @@ export const graph = (baseURI: string, axiosClient: AxiosInstance): Graph => {
         meDrivesApi.listMyDrives(orderBy, filter),
       listAllDrives: (orderBy?: string, filter?: string) =>
         allDrivesApi.listAllDrives(orderBy, filter),
+      listSharedWithMe: () => meDriveApiFactory.listSharedWithMe(),
+      listSharedByMe: () => meDriveApiFactory.listSharedByMe(),
       getDrive: (id: string) => drivesApiFactory.getDrive(id),
       createDrive: (drive: Drive, options: any): AxiosPromise<Drive> =>
         drivesApiFactory.createDrive(drive, options),
@@ -174,6 +187,9 @@ export const graph = (baseURI: string, axiosClient: AxiosInstance): Graph => {
         groupApiFactory.addMember(groupId, { '@odata.id': `${server}graph/v1.0/users/${userId}` }),
       deleteMember: (groupId: string, userId: string) =>
         groupApiFactory.deleteMember(groupId, userId)
+    },
+    roleManagement: {
+      listPermissionRoleDefinitions: () => roleManagementApiFactory.listPermissionRoleDefinitions()
     }
   }
 }

packages/web-client/src/helpers/share/functions.ts

@@ -12,17 +12,18 @@ import path from 'path'
 import { SHARE_JAIL_ID, SpaceResource, buildWebDavSpacesPath } from '../space'
 import { ShareStatus } from './status'
 import { SharePermissions } from './permission'
-import { Share } from './share'
 import { buildSpaceShare } from './space'
 import { LinkShareRoles, PeopleShareRoles } from './role'
-import { ShareResource } from './types'
+import { ShareResource, Share } from './types'
 
 export const isShareResource = (resource: Resource): resource is ShareResource => {
-  return Object.hasOwn(resource, 'shareType')
+  return Object.hasOwn(resource, 'sharedWith')
 }
 
 /**
  * Transforms given shares into a resource format and returns only their unique occurences
+ *
+ * @deprecated
  */
 export function aggregateResourceShares({
   shares,
@@ -133,6 +134,7 @@ function addMatchingSpaceToShares(shares, spaces) {
   return resources
 }
 
+/** @deprecated */
 export function buildSharedResource(
   share,
   incomingShares = false,
@@ -155,7 +157,7 @@ export function buildSharedResource(
     path: undefined,
     webDavPath: undefined,
     processing: share.processing || false,
-    shareType: parseInt(share.share_type),
+    shareTypes: [parseInt(share.share_type)],
     owner: { id: share.uid_owner, displayName: share.displayname_owner },
     sharedBy: { id: share.uid_owner, displayName: share.displayname_owner },
     sharedWith: share.sharedWith || []