directus 9.2.2 → 9.4.2

package/dist/utils/merge-permissions.js

@@ -1,66 +1,73 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergePermissions = void 0;
+exports.mergePermission = exports.mergePermissions = void 0;
 const lodash_1 = require("lodash");
-function mergePermissions(...permissions) {
+function mergePermissions(strategy, ...permissions) {
     const allPermissions = (0, lodash_1.flatten)(permissions);
     const mergedPermissions = allPermissions
         .reduce((acc, val) => {
         const key = `${val.collection}__${val.action}__${val.role || '$PUBLIC'}`;
         const current = acc.get(key);
-        acc.set(key, current ? mergePerm(current, val) : val);
+        acc.set(key, current ? mergePermission(strategy, current, val) : val);
         return acc;
     }, new Map())
         .values();
-    const result = Array.from(mergedPermissions).map((perm) => {
-        return (0, lodash_1.omit)(perm, ['id', 'system']);
-    });
-    return result;
+    return Array.from(mergedPermissions);
 }
 exports.mergePermissions = mergePermissions;
-function mergePerm(currentPerm, newPerm) {
+function mergePermission(strategy, currentPerm, newPerm) {
+    const logicalKey = `_${strategy}`;
     let permissions = currentPerm.permissions;
     let validation = currentPerm.validation;
     let fields = currentPerm.fields;
     let presets = currentPerm.presets;
     if (newPerm.permissions) {
-        if (currentPerm.permissions && Object.keys(currentPerm.permissions)[0] === '_or') {
+        if (currentPerm.permissions && Object.keys(currentPerm.permissions)[0] === logicalKey) {
             permissions = {
-                _or: [...currentPerm.permissions._or, newPerm.permissions],
+                [logicalKey]: [
+                    ...currentPerm.permissions[logicalKey],
+                    newPerm.permissions,
+                ],
             };
         }
         else if (currentPerm.permissions) {
             permissions = {
-                _or: [currentPerm.permissions, newPerm.permissions],
+                [logicalKey]: [currentPerm.permissions, newPerm.permissions],
             };
         }
         else {
             permissions = {
-                _or: [newPerm.permissions],
+                [logicalKey]: [newPerm.permissions],
             };
         }
     }
     if (newPerm.validation) {
-        if (currentPerm.validation && Object.keys(currentPerm.validation)[0] === '_or') {
+        if (currentPerm.validation && Object.keys(currentPerm.validation)[0] === logicalKey) {
             validation = {
-                _or: [...currentPerm.validation._or, newPerm.validation],
+                [logicalKey]: [
+                    ...currentPerm.validation[logicalKey],
+                    newPerm.validation,
+                ],
             };
         }
         else if (currentPerm.validation) {
             validation = {
-                _or: [currentPerm.validation, newPerm.validation],
+                [logicalKey]: [currentPerm.validation, newPerm.validation],
             };
         }
         else {
             validation = {
-                _or: [newPerm.validation],
+                [logicalKey]: [newPerm.validation],
             };
         }
     }
     if (newPerm.fields) {
-        if (Array.isArray(currentPerm.fields)) {
+        if (Array.isArray(currentPerm.fields) && strategy === 'or') {
             fields = [...new Set([...currentPerm.fields, ...newPerm.fields])];
         }
+        else if (Array.isArray(currentPerm.fields) && strategy === 'and') {
+            fields = (0, lodash_1.intersection)(currentPerm.fields, newPerm.fields);
+        }
         else {
             fields = newPerm.fields;
         }
@@ -70,11 +77,12 @@ function mergePerm(currentPerm, newPerm) {
     if (newPerm.presets) {
         presets = (0, lodash_1.merge)({}, presets, newPerm.presets);
     }
-    return {
+    return (0, lodash_1.omit)({
         ...currentPerm,
         permissions,
         validation,
         fields,
         presets,
-    };
+    }, ['id', 'system']);
 }
+exports.mergePermission = mergePermission;

package/dist/utils/reduce-schema.d.ts

@@ -1,5 +1,5 @@
 import { SchemaOverview } from '../types';
-import { Accountability, PermissionsAction } from '@directus/shared/types';
+import { Permission, PermissionsAction } from '@directus/shared/types';
 /**
  * Reduces the schema based on the included permissions. The resulting object is the schema structure, but with only
  * the allowed collections/fields/relations included based on the permissions.
@@ -7,4 +7,4 @@ import { Accountability, PermissionsAction } from '@directus/shared/types';
  * @param actions Array of permissions actions (crud)
  * @returns Reduced schema
  */
-export declare function reduceSchema(schema: SchemaOverview, accountability: Accountability | null, actions?: PermissionsAction[]): SchemaOverview;
+export declare function reduceSchema(schema: SchemaOverview, permissions: Permission[] | null, actions?: PermissionsAction[]): SchemaOverview;

package/dist/utils/reduce-schema.js

@@ -9,13 +9,13 @@ const lodash_1 = require("lodash");
  * @param actions Array of permissions actions (crud)
  * @returns Reduced schema
  */
-function reduceSchema(schema, accountability, actions = ['create', 'read', 'update', 'delete']) {
-    var _a, _b, _c, _d, _e;
+function reduceSchema(schema, permissions, actions = ['create', 'read', 'update', 'delete']) {
+    var _a, _b, _c;
     const reduced = {
         collections: {},
         relations: [],
     };
-    const allowedFieldsInCollection = (_b = (_a = accountability === null || accountability === void 0 ? void 0 : accountability.permissions) === null || _a === void 0 ? void 0 : _a.filter((permission) => actions.includes(permission.action)).reduce((acc, permission) => {
+    const allowedFieldsInCollection = (_a = permissions === null || permissions === void 0 ? void 0 : permissions.filter((permission) => actions.includes(permission.action)).reduce((acc, permission) => {
         if (!acc[permission.collection]) {
             acc[permission.collection] = [];
         }
@@ -23,13 +23,13 @@ function reduceSchema(schema, accountability, actions = ['create', 'read', 'upda
             acc[permission.collection] = (0, lodash_1.uniq)([...acc[permission.collection], ...permission.fields]);
         }
         return acc;
-    }, {})) !== null && _b !== void 0 ? _b : {};
+    }, {})) !== null && _a !== void 0 ? _a : {};
     for (const [collectionName, collection] of Object.entries(schema.collections)) {
-        if ((_c = accountability === null || accountability === void 0 ? void 0 : accountability.permissions) === null || _c === void 0 ? void 0 : _c.some((permission) => permission.collection === collectionName && actions.includes(permission.action))) {
+        if (permissions === null || permissions === void 0 ? void 0 : permissions.some((permission) => permission.collection === collectionName && actions.includes(permission.action))) {
             const fields = {};
             for (const [fieldName, field] of Object.entries(schema.collections[collectionName].fields)) {
-                if (((_d = allowedFieldsInCollection[collectionName]) === null || _d === void 0 ? void 0 : _d.includes('*')) ||
-                    ((_e = allowedFieldsInCollection[collectionName]) === null || _e === void 0 ? void 0 : _e.includes(fieldName))) {
+                if (((_b = allowedFieldsInCollection[collectionName]) === null || _b === void 0 ? void 0 : _b.includes('*')) ||
+                    ((_c = allowedFieldsInCollection[collectionName]) === null || _c === void 0 ? void 0 : _c.includes(fieldName))) {
                     fields[fieldName] = field;
                 }
             }

package/dist/utils/user-name.js

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.userName = void 0;
 function userName(user) {
+    if (!user) {
+        return 'Unknown User';
+    }
     if (user.first_name && user.last_name) {
         return `${user.first_name} ${user.last_name}`;
     }

package/example.env

@@ -44,7 +44,7 @@ DB_PASSWORD="secret"
 # DB_PASSWORD="Test@123"
 
 ## OracleDB
-# DB_CLIENT="oracle"
+# DB_CLIENT="oracledb"
 # DB_CONNECT_STRING="localhost:5104/XE"
 # DB_USER="secretsysuser"
 # DB_PASSWORD="secretpassword"

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "directus",
-	"version": "9.2.2",
+	"version": "9.4.2",
 	"license": "GPL-3.0-only",
 	"homepage": "https://github.com/directus/directus#readme",
 	"description": "Directus is a real-time API and App dashboard for managing SQL database content.",
@@ -60,7 +60,7 @@
 		"prebuild": "npm run cleanup",
 		"build": "tsc --build && copyfiles \"src/**/*.*\" -e \"src/**/*.ts\" -u 1 dist",
 		"cleanup": "rimraf dist",
-		"dev": "cross-env NODE_ENV=development SERVE_APP=false ts-node-dev --files --transpile-only --respawn --watch \".env\" --inspect --exit-child -- src/start.ts",
+		"dev": "cross-env NODE_ENV=development SERVE_APP=false ts-node-dev --files --transpile-only --respawn --watch \".env\" --inspect=0 --exit-child -- src/start.ts",
 		"cli": "cross-env NODE_ENV=development SERVE_APP=false ts-node --script-mode --transpile-only src/cli/run.ts",
 		"test": "jest --coverage",
 		"test:watch": "jest --watchAll"
@@ -76,16 +76,16 @@
 	],
 	"dependencies": {
 		"@aws-sdk/client-ses": "^3.40.0",
-		"@directus/app": "9.2.2",
-		"@directus/drive": "9.2.2",
-		"@directus/drive-azure": "9.2.2",
-		"@directus/drive-gcs": "9.2.2",
-		"@directus/drive-s3": "9.2.2",
-		"@directus/extensions-sdk": "9.2.2",
-		"@directus/format-title": "9.2.2",
-		"@directus/schema": "9.2.2",
-		"@directus/shared": "9.2.2",
-		"@directus/specs": "9.2.2",
+		"@directus/app": "9.4.2",
+		"@directus/drive": "9.4.2",
+		"@directus/drive-azure": "9.4.2",
+		"@directus/drive-gcs": "9.4.2",
+		"@directus/drive-s3": "9.4.2",
+		"@directus/extensions-sdk": "9.4.2",
+		"@directus/format-title": "9.4.2",
+		"@directus/schema": "9.4.2",
+		"@directus/shared": "9.4.2",
+		"@directus/specs": "9.4.2",
 		"@godaddy/terminus": "^4.9.0",
 		"@rollup/plugin-alias": "^3.1.2",
 		"@rollup/plugin-virtual": "^2.0.3",
@@ -114,6 +114,7 @@
 		"fs-extra": "^10.0.0",
 		"graphql": "^15.5.0",
 		"graphql-compose": "^9.0.1",
+		"helmet": "^4.6.0",
 		"inquirer": "^8.1.1",
 		"joi": "^17.3.0",
 		"js-yaml": "^4.1.0",
@@ -169,7 +170,7 @@
 		"sqlite3": "^5.0.2",
 		"tedious": "^13.0.0"
 	},
-	"gitHead": "546d525175c7ecc6ac9c235b4ebf77a1ae209e10",
+	"gitHead": "1a5a9180ee6d0ad8f03076bc6e3cfdd62a0dd2f9",
 	"devDependencies": {
 		"@types/async": "3.2.10",
 		"@types/atob": "2.1.2",
@@ -209,7 +210,7 @@
 		"copyfiles": "2.4.1",
 		"cross-env": "7.0.3",
 		"jest": "27.3.1",
-		"knex-mock-client": "^1.6.1",
+		"knex-mock-client": "1.6.1",
 		"ts-jest": "27.0.7",
 		"ts-node-dev": "1.1.8",
 		"typescript": "4.5.2"