Add Internal folders to folder tree if from same bucket as user's

Bug-fix for list view not showing objects when user has access through a group but bucket is not public
Replace use of partition with plain logic

Author: TimCsaky

frontend/src/components/bucket/BucketList.vue

@@ -5,15 +5,17 @@ import { ref, onMounted } from 'vue';
 import { BucketConfigForm, BucketSidebar, BucketTable } from '@/components/bucket';
 import { Button, Dialog, Message } from '@/lib/primevue';
 import { useAuthStore, useBucketStore, useConfigStore, usePermissionStore } from '@/store';
-import { BucketConfig } from '@/utils/constants';
+import { bucketService } from '@/services';
+
+import { BucketConfig, Permissions } from '@/utils/constants';
 import { onDialogHide } from '@/utils/utils';
 
 import type { Ref } from 'vue';
 import type { Bucket } from '@/types';
 
 // Store
 const bucketStore = useBucketStore();
-const { getUserId } = storeToRefs(useAuthStore());
+const { getProfile, getUserId } = storeToRefs(useAuthStore());
 const { getConfig } = storeToRefs(useConfigStore());
 
 // State
@@ -43,17 +45,31 @@ const closeBucketConfig = () => {
 };
 
 onMounted(async () => {
+  // fetch buckets with current user's READ permission (enforced by COMS privacy mode)
   const buckets = await bucketStore.fetchBuckets({
     userId: getUserId.value,
     objectPerms: true
   });
-  // get IDP permissions for labelling in table
+  // get all subfolders of each bucket based  on current users IDP
+  // so they shpw up in the folder tree
   if (buckets && buckets.length > 0 && usePermissionStore().isUserElevatedRights()) {
-    await usePermissionStore().fetchBucketIdpPermissions({
-      // limit to 1000 folders
-      bucketId: buckets.slice(0, 1000).map((b) => b.bucketId),
-      idp: 'idir',
-      objectPerms: true
+    const uniqueBuckets = buckets.filter(
+      (b, i, arr) => arr.findIndex((item) => item.bucket === b.bucket && item.endpoint === b.endpoint) === i
+    );
+    uniqueBuckets.forEach(async (bucket) => {
+      const allFolders = (
+        await bucketService.searchBuckets({
+          endpoint: bucket.endpoint,
+          bucket: bucket.bucket
+        })
+      ).data;
+      await bucketStore.fetchBuckets({
+        bucketId: allFolders.slice(0, 1000).map((b: any) => b.bucketId),
+        userId: getUserId.value,
+        idp: (getProfile.value as any)?.identity_provider,
+        permCode: Permissions.READ,
+        objectPerms: true
+      });
     });
   }
 });

frontend/src/components/bucket/BucketPublicToggle.vue

@@ -90,7 +90,7 @@ const isToggleEnabled = computed(() => {
   return (
     !isParentPublic.value &&
     usePermissionStore().isUserElevatedRights() &&
-    permissionStore.isObjectActionAllowed(props.bucketId, props.userId, Permissions.MANAGE, props.bucketId as string)
+    permissionStore.isBucketActionAllowed(props.bucketId, props.userId, Permissions.MANAGE)
   );
 });
 

frontend/src/components/object/ObjectFileDetails.vue

@@ -131,7 +131,7 @@ onMounted(async () => {
   bucketId.value = object.value ? object.value.bucketId : '';
   // fetch bucket and bucket permissions
   await bucketStore.fetchBuckets({
-    bucketId: bucketId.value,
+    bucketId: [bucketId.value],
     userId: getUserId.value,
     idp: (getProfile.value as any)?.identity_provider,
     objectPerms: true
@@ -146,7 +146,7 @@ onMounted(async () => {
     router.replace({ name: RouteNames.FORBIDDEN });
   }
   // fetch data for child components
-  await Promise.all([bucketStore.fetchBuckets({ bucketId: bucketId.value }), fetchFileDetails(props.objectId)]);
+  await Promise.all([bucketStore.fetchBuckets({ bucketId: [bucketId.value] }), fetchFileDetails(props.objectId)]);
   // request object sync
   await objectStore
     .syncObject(props.objectId)

frontend/src/store/bucketStore.ts

@@ -4,7 +4,7 @@ import { computed, ref } from 'vue';
 import { useToast } from '@/lib/primevue';
 import { bucketService } from '@/services';
 import { useAppStore, useAuthStore, usePermissionStore } from '@/store';
-import { getBucketPath, partition } from '@/utils/utils';
+import { getBucketPath } from '@/utils/utils';
 
 import type { Ref } from 'vue';
 import type { Bucket, BucketSearchPermissionsOptions } from '@/types';
@@ -78,12 +78,9 @@ export const useBucketStore = defineStore('bucket', () => {
     try {
       appStore.beginIndeterminateLoading();
       const response = (await bucketService.fetchBucket(bucketId)).data;
-
-      // add bucket to state, replacing any existing value matching bucketId
-      const matches = (x: Bucket) => x.bucketId === bucketId;
-      const [, difference] = partition(state.buckets.value, matches);
-      state.buckets.value = difference.concat(response);
-
+      const matches = (x: Bucket) => x.bucketId === response.bucketId;
+      const remainingBuckets = state.buckets.value.filter((x) => !matches(x));
+      state.buckets.value = remainingBuckets.concat([response]);
       return response;
     } catch (error: any) {
       toast.error('Getting bucket', error);
@@ -126,15 +123,13 @@ export const useBucketStore = defineStore('bucket', () => {
         let response = Array<Bucket>();
         if (uniqueIds.length) {
           response = (await bucketService.searchBuckets({ bucketId: uniqueIds })).data;
-        }
 
-        // Remove old values matching search parameters
-        const matches = (x: Bucket) => !params?.bucketId || x.bucketId === params.bucketId;
+          // merge new buckets into state, skipping any existing matches based on bucketId
+          const matches = (x: Bucket) => !params?.bucketId || params.bucketId.includes(x.bucketId);
+          const remaining = state.buckets.value.filter((x) => !matches(x));
 
-        const [, difference] = partition(state.buckets.value, matches);
-
-        // Merge and assign
-        state.buckets.value = difference.concat(response);
+          state.buckets.value = remaining.concat(response);
+        }
         return response;
       } else return [];
     } catch (error: any) {

frontend/src/views/list/ListObjectsView.vue

@@ -107,34 +107,33 @@ onErrorCaptured((e: Error) => {
 onBeforeMount(async () => {
   const router = useRouter();
 
-  let bucketResponse: any = [];
   if (props?.bucketId) {
-    // if logged in, fetch bucket; populate bucket and permissions in store
+    let hasAccess = false;
+    // check if bucket is public
+    const fetchedBucket = await bucketStore.fetchBucket(props.bucketId);
+    if (isBucketPublic.value) {
+      bucket.value = fetchedBucket;
+      hasAccess = true;
+    }
+    // if authenticated, check if user has access to the bucket
     if (getIsAuthenticated.value) {
-      const bucket = await bucketStore.fetchBucket(props.bucketId);
-      if (bucket.public) {
-        bucketResponse = [bucket];
-      } else {
-        // get bucket permitted through User perms
-        bucketResponse = await bucketStore.fetchBuckets({
-          bucketId: props.bucketId,
-          userId: getUserId.value,
-          idp: (getProfile.value as any)?.identity_provider,
-          objectPerms: true
-        });
+      const fetchedBuckets = await bucketStore.fetchBuckets({
+        bucketId: [props.bucketId],
+        userId: getUserId.value,
+        idp: (getProfile.value as any)?.identity_provider,
+        objectPerms: true
+      });
+      if (fetchedBuckets?.length) {
+        hasAccess = true;
+        bucket.value = fetchedBuckets[0];
       }
+    }
+    if (hasAccess) {
+      ready.value = true;
     } else {
-      bucketResponse = [await bucketStore.fetchBucket(props.bucketId)];
+      router.replace({ name: RouteNames.FORBIDDEN });
     }
   }
-
-  if (bucketResponse?.length) {
-    bucket.value = bucketResponse[0];
-
-    ready.value = true;
-  } else {
-    router.replace({ name: RouteNames.FORBIDDEN });
-  }
 });
 </script>
 <template>