Fix check pemissions

datalens-tech · Nov 7, 2024 · c36c6fe · c36c6fe
1 parent 94eac34
commit c36c6fe
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 48 deletions.
diff --git a/src/services/new/collection/delete-collections.ts b/src/services/new/collection/delete-collections.ts
@@ -11,6 +11,9 @@ import {CollectionPermission} from '../../../entities/collection';
 import {AppError} from '@gravity-ui/nodekit';
 import {getCollectionsListByIds} from './get-collections-list-by-ids';
 import {markCollectionsAsDeleted} from './utils/mark-collections-as-deleted';
+import {getParents, getParentsIdsFromMap} from './utils';
+import {registry} from '../../../registry';
+import {CollectionInstance} from '../../../registry/common/entities/collection/types';
 
 const validateArgs = makeSchemaValidator({
     type: 'object',
@@ -45,6 +48,11 @@ export const deleteCollections = async (
 
     const targetTrx = getPrimary(trx);
 
+    await getCollectionsListByIds(
+        {ctx, trx: targetTrx, skipValidation, skipCheckPermissions},
+        {collectionIds, permission: CollectionPermission.Delete},
+    );
+
     const recursiveName = 'collectionChildren';
 
     const collectionsForDelete = await CollectionModel.query(getReplica(trx))
@@ -81,10 +89,31 @@ export const deleteCollections = async (
 
     const collectionsForDeleteIds = collectionsForDelete.map((item) => item.collectionId);
 
-    const collectionsMap = await getCollectionsListByIds(
-        {ctx, trx: targetTrx, skipValidation, skipCheckPermissions},
-        {collectionIds: collectionsForDeleteIds, permission: CollectionPermission.Delete},
-    );
+    const collectionsMap = new Map<CollectionInstance, string[]>();
+
+    const parents = await getParents({
+        ctx,
+        trx: targetTrx,
+        collectionIds: collectionsForDeleteIds,
+    });
+
+    const parentsMap = new Map<string, Nullable<string>>();
+
+    parents.forEach((parent: CollectionModel) => {
+        parentsMap.set(parent.collectionId, parent.parentId);
+    });
+
+    const {Collection} = registry.common.classes.get();
+
+    collectionsForDelete.forEach((model) => {
+        const collectionId = model.collectionId;
+
+        const parentsForCollection = getParentsIdsFromMap(collectionId, parentsMap);
+
+        const collection = new Collection({ctx, model});
+
+        collectionsMap.set(collection, parentsForCollection);
+    });
 
     const workbooksForDelete = await WorkbookModel.query(getReplica(trx))
         .select()

diff --git a/src/services/new/collection/get-collection.ts b/src/services/new/collection/get-collection.ts
@@ -80,7 +80,7 @@ export const getCollection = async <T extends CollectionInstance = CollectionIns
         model,
     });
 
-    const {collectionInstance: collection} = await checkAndSetCollectionPermission(
+    const collection = await checkAndSetCollectionPermission(
         {ctx, trx},
         {collectionInstance, skipCheckPermissions, includePermissionsInfo, permission},
     );

diff --git a/src/services/new/collection/get-collections-list-by-ids.ts b/src/services/new/collection/get-collections-list-by-ids.ts
@@ -6,7 +6,6 @@ import {CollectionPermission} from '../../../entities/collection';
 import Utils from '../../../utils';
 import {registry} from '../../../registry';
 import {checkAndSetCollectionPermission} from './utils';
-import {CollectionInstance} from '../../../registry/common/entities/collection/types';
 
 const validateArgs = makeSchemaValidator({
     type: 'object',
@@ -57,9 +56,7 @@ export const getCollectionsListByIds = async (
         .whereIn(CollectionModelColumn.CollectionId, collectionIds)
         .timeout(CollectionModel.DEFAULT_QUERY_TIMEOUT);
 
-    const collectionsMap: Map<CollectionInstance, string[]> = new Map();
-
-    await Promise.all(
+    const modelsWithPermissions = await Promise.all(
         models.map(async (model) => {
             const {Collection} = registry.common.classes.get();
 
@@ -68,17 +65,12 @@ export const getCollectionsListByIds = async (
                 model,
             });
 
-            const collectionWithParents = await checkAndSetCollectionPermission(
+            const collection = await checkAndSetCollectionPermission(
                 {ctx, trx},
                 {collectionInstance, skipCheckPermissions, includePermissionsInfo, permission},
             );
 
-            collectionsMap.set(
-                collectionWithParents.collectionInstance,
-                collectionWithParents.parentIds,
-            );
-
-            return collectionWithParents;
+            return collection;
         }),
     );
 
@@ -89,5 +81,5 @@ export const getCollectionsListByIds = async (
         ),
     });
 
-    return collectionsMap;
+    return modelsWithPermissions;
 };
diff --git a/src/services/new/collection/utils/check-and-set-collections-permission.ts b/src/services/new/collection/utils/check-and-set-collections-permission.ts
@@ -31,19 +31,9 @@ export const checkAndSetCollectionPermission = async (
     const {accessServiceEnabled} = ctx.config;
 
     const targetTrx = getReplica(trx);
-    let parentIds: string[] = [];
-
-    if (accessServiceEnabled) {
-        if (collectionInstance.model.parentId !== null) {
-            parentIds = await getParentIds({
-                ctx,
-                trx: targetTrx,
-                collectionId: collectionInstance.model.parentId,
-            });
-        }
-    }
 
     if (accessServiceEnabled && !skipCheckPermissions && !isPrivateRoute) {
+        let parentIds: string[] = [];
         let localPermission: CollectionPermission;
 
         if (permission) {
@@ -54,6 +44,14 @@ export const checkAndSetCollectionPermission = async (
             localPermission = CollectionPermission.View;
         }
 
+        if (collectionInstance.model.parentId !== null) {
+            parentIds = await getParentIds({
+                ctx,
+                trx: targetTrx,
+                collectionId: collectionInstance.model.parentId,
+            });
+        }
+
         ctx.log('CHECK_PERMISSION', {permission: localPermission});
 
         await collectionInstance.checkPermission({
@@ -70,5 +68,5 @@ export const checkAndSetCollectionPermission = async (
 
     ctx.log('CHECK_COLLECTION_PERMISSION_FINISH');
 
-    return {collectionInstance, parentIds};
+    return collectionInstance;
 };
diff --git a/src/services/new/collection/utils/get-parents.ts b/src/services/new/collection/utils/get-parents.ts
@@ -75,3 +75,21 @@ export const getCollectionsParentIds = async ({
     const parents = await getParents({ctx, trx, collectionIds});
     return parents.map((item) => item.collectionId);
 };
+
+export const getParentsIdsFromMap = (
+    collectionId: string | null,
+    parentsMap: Map<string, Nullable<string>>,
+): string[] => {
+    let id: Nullable<string> = collectionId;
+    const arr: string[] = id ? [id] : [];
+
+    while (id !== null) {
+        const curr: Nullable<string> = parentsMap.get(id) || null;
+
+        if (curr) arr.push(curr);
+
+        id = curr;
+    }
+
+    return arr;
+};
diff --git a/src/services/new/workbook/get-workbooks-list-by-ids.ts b/src/services/new/workbook/get-workbooks-list-by-ids.ts
@@ -5,7 +5,7 @@ import {getReplica} from '../utils';
 import Utils from '../../../utils';
 import {registry} from '../../../registry';
 
-import {getParents} from '../collection/utils';
+import {getParents, getParentsIdsFromMap} from '../collection/utils';
 
 import {WorkbookPermission} from '../../../entities/workbook';
 
@@ -32,24 +32,6 @@ type GetWorkbooksListAndAllParentsArgs = {
     includePermissionsInfo?: boolean;
 };
 
-export const getParentsIdsFromMap = (
-    collectionId: string | null,
-    parentsMap: Map<string, Nullable<string>>,
-): string[] => {
-    let id: Nullable<string> = collectionId;
-    const arr: string[] = id ? [id] : [];
-
-    while (id !== null) {
-        const curr: Nullable<string> = parentsMap.get(id) || null;
-
-        if (curr) arr.push(curr);
-
-        id = curr;
-    }
-
-    return arr;
-};
-
 export const getWorkbooksListByIds = async (
     {ctx, trx, skipValidation = false, skipCheckPermissions = false}: ServiceArgs,
     args: GetWorkbooksListAndAllParentsArgs,