Fix: BucketList folders only accessible via IDP perms reverting to dummy folders on folder add/delete

frontend/src/components/bucket/BucketChildConfig.vue

@@ -6,7 +6,7 @@ import { object, string } from 'yup';
 
 import TextInput from '@/components/form/TextInput.vue';
 import { Button, Dialog, Message, useToast } from '@/lib/primevue';
-import { useAuthStore, useBucketStore, useNavStore } from '@/store';
+import { useBucketStore, useNavStore } from '@/store';
 import { onDialogHide } from '@/utils/utils';
 
 import type { Ref } from 'vue';
@@ -19,7 +19,6 @@ const props = defineProps<{
 
 // Store
 const bucketStore = useBucketStore();
-const { getUserId } = storeToRefs(useAuthStore());
 const { focusedElement } = storeToRefs(useNavStore());
 
 // Form validation
@@ -49,8 +48,8 @@ const onSubmit = async (values: any) => {
     };
     // create bucket
     await bucketStore.createBucketChild(props.parentBucket.bucketId, formData.subKey, formData.bucketName);
-    // refresh stores
-    await bucketStore.fetchBuckets({ userId: getUserId.value, objectPerms: true });
+    // refresh bucket store
+    await bucketStore.refreshBucketList();
     showDialog(false);
     toast.success('Adding subfolder', 'Folder configuration successful');
   } catch (error: any) {

frontend/src/components/bucket/BucketConfigForm.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { onBeforeMount, ref } from 'vue';
 import { storeToRefs } from 'pinia';
 import { Form } from 'vee-validate';
 import { object, string } from 'yup';
 import { differenceInSeconds } from 'date-fns';
@@ -10,7 +10,7 @@
 import { SyncButton } from '@/components/common';
 
 import { Button, useToast } from '@/lib/primevue';
-import { useAuthStore, useBucketStore } from '@/store';
+import { useBucketStore } from '@/store';
 import { ButtonMode } from '@/utils/enums';
 import { differential, getBucketPath, joinPath } from '@/utils/utils';
 
@@ -40,7 +40,6 @@
 
 // Store
 const bucketStore = useBucketStore();
-const { getUserId } = storeToRefs(useAuthStore());
 
 // Default form values
 const initialValues: BucketForm = {
@@ -100,7 +99,7 @@
     }
 
     // refresh bucket list
-    await bucketStore.fetchBuckets({ userId: getUserId.value, objectPerms: true });
+    await bucketStore.refreshBucketList();
 
     // trim trailing "//", if present
     const currBucketPath = getBucketPath(initialValues as Bucket).endsWith('//')

frontend/src/components/bucket/BucketList.vue

@@ -4,18 +4,16 @@ 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 { bucketService } from '@/services';
+import { useBucketStore, useConfigStore, usePermissionStore } from '@/store';
 
-import { BucketConfig, Permissions } from '@/utils/constants';
+import { BucketConfig } from '@/utils/constants';
 import { onDialogHide } from '@/utils/utils';
 
 import type { Ref } from 'vue';
 import type { Bucket } from '@/types';
 
 // Store
 const bucketStore = useBucketStore();
-const { getProfile, getUserId } = storeToRefs(useAuthStore());
 const { getConfig } = storeToRefs(useConfigStore());
 
 // State
@@ -45,33 +43,7 @@ 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 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()) {
-    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
-      });
-    });
-  }
+  await bucketStore.refreshBucketList();
 });
 </script>
 

frontend/src/components/bucket/BucketTable.vue

@@ -100,7 +100,7 @@ const confirmDeleteBucket = (bucketId: string) => {
 
 async function deleteBucket(bucketId: string, recursive = true) {
   await bucketStore.deleteBucket(bucketId, recursive);
-  await bucketStore.fetchBuckets({ userId: getUserId.value, objectPerms: true });
+  await bucketStore.refreshBucketList();
 }
 
 /**

frontend/src/components/object/DeletedObjectTable.vue

@@ -78,7 +78,7 @@ async function showPermissions(objectId: string) {
 
 onMounted(async () => {
   loading.value = true;
-  await bucketStore.fetchBuckets({ userId: getUserId.value, objectPerms: true });
+  await bucketStore.refreshBucketList();
 
   lazyParams.value = {
     first: 0,

frontend/src/store/bucketStore.ts

@@ -4,6 +4,7 @@ import { computed, ref } from 'vue';
 import { useToast } from '@/lib/primevue';
 import { bucketService } from '@/services';
 import { useAppStore, useAuthStore, usePermissionStore } from '@/store';
+import { Permissions } from '@/utils/constants';
 import { getBucketPath } from '@/utils/utils';
 
 import type { Ref } from 'vue';
@@ -104,17 +105,17 @@ export const useBucketStore = defineStore('bucket', () => {
 
       // Get a unique list of bucket IDs the user has access to
       // based on user permissions..
-      const permResponse = await permissionStore.fetchBucketPermissions({ ...params, idp: undefined });
+      const userPermResponse = await permissionStore.fetchBucketPermissions({ ...params, idp: undefined });
       //  and check IDP permissions (if current user's idp is provided in params)
       const IdpPermResponse = params?.idp
         ? await permissionStore.fetchBucketIdpPermissions({ ...params, userId: undefined })
         : undefined;
 
       // if permissions found
-      if (permResponse || IdpPermResponse) {
+      if (userPermResponse || IdpPermResponse) {
         const uniqueIds: Array<string> = [
           ...new Set<string>(
-            permResponse
+            userPermResponse
               ?.map((x: { bucketId: string }) => x.bucketId)
               .concat(IdpPermResponse?.map((x: { bucketId: string }) => x.bucketId) || [])
           )
@@ -139,6 +140,37 @@ export const useBucketStore = defineStore('bucket', () => {
     }
   }
 
+  async function refreshBucketList() {
+    // fetch buckets with current user's READ permission (enforced by COMS privacy mode)
+    const buckets = await fetchBuckets({
+      userId: authStore.getUserId,
+      objectPerms: true
+    });
+
+    // get all subfolders of each bucket based on current user's IDP,
+    // so they show up in the folder tree
+    if (buckets && buckets.length > 0 && usePermissionStore().isUserElevatedRights()) {
+      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 fetchBuckets({
+          bucketId: allFolders.slice(0, 1000).map((b: any) => b.bucketId),
+          userId: authStore.getUserId,
+          idp: (authStore.getProfile as any)?.identity_provider,
+          permCode: Permissions.READ,
+          objectPerms: true
+        });
+      });
+    }
+  }
+
   async function updateBucket(bucketId: string, bucket: Bucket) {
     try {
       appStore.beginIndeterminateLoading();
@@ -196,6 +228,7 @@ export const useBucketStore = defineStore('bucket', () => {
     fetchBucket,
     // fetchPublicBucket,
     fetchBuckets,
+    refreshBucketList,
     syncBucket,
     syncBucketStatus,
     togglePublic,

frontend/src/views/list/ListObjectsView.vue

@@ -25,6 +25,7 @@ const props = withDefaults(defineProps<Props>(), {
 });
 
 // Store
+const authStore = useAuthStore();
 const bucketStore = useBucketStore();
 const { getProfile, getUserId, getIsAuthenticated } = storeToRefs(useAuthStore());
 const permissionStore = usePermissionStore();
@@ -94,7 +95,11 @@ const confirmDeleteBucket = (bucketId: string) => {
 };
 async function deleteBucket(bucketId: string, recursive = true) {
   await bucketStore.deleteBucket(bucketId, recursive);
-  await bucketStore.fetchBuckets({ userId: getUserId.value, objectPerms: true });
+  await bucketStore.fetchBuckets({
+    userId: getUserId.value,
+    objectPerms: true,
+    idp: authStore.getProfile?.identity_provider as string | undefined
+  });
 }
 
 // check if in a subfolder or at highest level of mounted folders