drapcode-utility 1.4.7 → 1.4.8

package/build/utils/prepare-query.d.ts

@@ -112,6 +112,12 @@ export declare const prepareCollectionQuery: (matchQuery: object, filterId: stri
                 })[];
             };
         };
+        permissionLevelSecurity: {
+            $first: string;
+        };
+        rowLevelSecurityFilter: {
+            $first: string;
+        };
     };
     $match?: undefined;
     $addFields?: undefined;
@@ -132,6 +138,8 @@ export declare const prepareCollectionQuery: (matchQuery: object, filterId: stri
         projectId: number;
         isPrivate: number;
         fields: number;
+        permissionLevelSecurity: number;
+        rowLevelSecurityFilter: number;
     };
     $match?: undefined;
     $addFields?: undefined;

package/build/utils/prepare-query.js

@@ -74,6 +74,8 @@ var prepareCollectionQuery = function (matchQuery, filterId) {
                         ],
                     },
                 },
+                permissionLevelSecurity: { $first: "$permissionLevelSecurity" },
+                rowLevelSecurityFilter: { $first: "$rowLevelSecurityFilter" },
             },
         },
         {
@@ -91,6 +93,8 @@ var prepareCollectionQuery = function (matchQuery, filterId) {
                 projectId: 1,
                 isPrivate: 1,
                 fields: 1,
+                permissionLevelSecurity: 1,
+                rowLevelSecurityFilter: 1,
             },
         },
     ];

package/build/utils/query-parser.d.ts

@@ -1,4 +1,4 @@
-export declare const queryParser: (collectionName: string, query: any, constants: any[], externalParams: any, currentUser: any, timezone: string, searchObj?: any, refCollectionFieldsInItems?: any, searchQueryTypeObj?: any, currentTenant?: any, currentUserSetting?: any, lookupConfig?: any) => Promise<string>;
+export declare const queryParser: (collectionName: string, query: any, constants: any[], externalParams: any, currentUser: any, timezone: string, searchObj: any, refCollectionFieldsInItems: any, searchQueryTypeObj: any, currentTenant: any, currentUserSetting: any, lookupConfig: any, rowLevelSecurityFilter: any) => Promise<string>;
 export declare const isEntityInCondition: (value: any) => boolean;
 export declare const getMinMaxValue: (value: any) => {
     startValue: any;

package/build/utils/query-parser.js

@@ -50,7 +50,7 @@ var drapcode_constant_1 = require("drapcode-constant");
 var date_util_1 = require("./date-util");
 var util_1 = require("./util");
 var prepare_query_1 = require("./prepare-query");
-var queryParser = function (collectionName, query, constants, externalParams, currentUser, timezone, searchObj, refCollectionFieldsInItems, searchQueryTypeObj, currentTenant, currentUserSetting, lookupConfig) {
+var queryParser = function (collectionName, query, constants, externalParams, currentUser, timezone, searchObj, refCollectionFieldsInItems, searchQueryTypeObj, currentTenant, currentUserSetting, lookupConfig, rowLevelSecurityFilter) {
     if (currentUser === void 0) { currentUser = {}; }
     if (searchObj === void 0) { searchObj = null; }
     if (refCollectionFieldsInItems === void 0) { refCollectionFieldsInItems = null; }
@@ -59,10 +59,10 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
     if (currentUserSetting === void 0) { currentUserSetting = {}; }
     if (lookupConfig === void 0) { lookupConfig = []; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var filterQuery, aggregateQuery, queryStr, searchQueryObj, _a, searchAggregateQuery, likeQuery, finalQuery, _b, searchAggregateQuery, likeQuery, projection, finder, sortBy, orderBy, offset, limit, direction, str;
-        var _c, _d;
-        return __generator(this, function (_e) {
-            switch (_e.label) {
+        var filterQuery, rlsFilterQuery, aggregateQuery, queryStr, searchQueryObj, _a, searchAggregateQuery, likeQuery, finalQuery, _b, searchAggregateQuery, likeQuery, projection, finder, sortBy, orderBy, offset, limit, direction, str;
+        var _c, _d, _e;
+        return __generator(this, function (_f) {
+            switch (_f.label) {
                 case 0:
                     if (!collectionName)
                         return [2 /*return*/, ""];
@@ -80,6 +80,13 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
                     console.log("searchQueryTypeObj", JSON.stringify(searchQueryTypeObj));
                     filterQuery = mongoFilterQuery(query, externalParams, constants, currentUser, currentTenant, currentUserSetting, timezone);
                     console.log("filterQuery", JSON.stringify(filterQuery));
+                    rlsFilterQuery = [];
+                    if (rowLevelSecurityFilter && rowLevelSecurityFilter.conditions.length) {
+                        rlsFilterQuery = mongoFilterQuery(rowLevelSecurityFilter, externalParams, constants, currentUser, currentTenant, currentUserSetting, timezone);
+                        console.log("**************************");
+                        console.log("rlsFilterQuery", JSON.stringify(rlsFilterQuery));
+                    }
+                    console.log("==> searchQueryTypeObj :>>", searchQueryTypeObj);
                     aggregateQuery = [];
                     queryStr = ".aggregate([])";
                     if (filterQuery.length &&
@@ -97,8 +104,13 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
                         console.log("aggregateQuery After search object condition", JSON.stringify(aggregateQuery));
                         console.log("searchQueryObj", JSON.stringify(searchQueryObj));
                         finalQuery = { $and: filterQuery };
+                        if (rlsFilterQuery.length &&
+                            ((rlsFilterQuery[0].$or && rlsFilterQuery[0].$or.length) ||
+                                (rlsFilterQuery[0].$and && rlsFilterQuery[0].$and.length))) {
+                            (_c = finalQuery.$and).push.apply(_c, rlsFilterQuery);
+                        }
                         if (searchQueryObj) {
-                            (_c = finalQuery.$and).push.apply(_c, searchQueryObj);
+                            (_d = finalQuery.$and).push.apply(_d, searchQueryObj);
                         }
                         console.log("finalQuery after", JSON.stringify(finalQuery));
                         aggregateQuery.push({ $match: finalQuery });
@@ -121,8 +133,8 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
                             return prepare_query_1.commonLookupSetting(field, lookupConfig, aggregateQuery);
                         }))];
                 case 1:
-                    _e.sent();
-                    _e.label = 2;
+                    _f.sent();
+                    _f.label = 2;
                 case 2:
                     if (finder != "COUNT" && !util_1.isEmpty(projection)) {
                         aggregateQuery.push({ $project: projection });
@@ -138,7 +150,7 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
                     }
                     if (finder != "COUNT" && sortBy) {
                         direction = orderBy && orderBy == "asc" ? 1 : -1;
-                        aggregateQuery.push({ $sort: (_d = {}, _d[sortBy] = direction, _d._id = 1, _d) });
+                        aggregateQuery.push({ $sort: (_e = {}, _e[sortBy] = direction, _e._id = 1, _e) });
                     }
                     if (finder != "COUNT" && limit) {
                         aggregateQuery.push({ $skip: +offset }, { $limit: +limit });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "1.4.7",
+  "version": "1.4.8",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",