directus 9.11.1 → 9.12.2

package/dist/services/webhooks.d.ts

@@ -1,6 +1,8 @@
 import { AbstractServiceOptions, Item, PrimaryKey, Webhook, MutationOptions } from '../types';
 import { ItemsService } from './items';
+import { Messenger } from '../messenger';
 export declare class WebhooksService extends ItemsService<Webhook> {
+    messenger: Messenger;
     constructor(options: AbstractServiceOptions);
     createOne(data: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey>;
     createMany(data: Partial<Item>[], opts?: MutationOptions): Promise<PrimaryKey[]>;

package/dist/services/webhooks.js

@@ -1,40 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebhooksService = void 0;
-const webhooks_1 = require("../webhooks");
 const items_1 = require("./items");
+const messenger_1 = require("../messenger");
 class WebhooksService extends items_1.ItemsService {
     constructor(options) {
         super('directus_webhooks', options);
+        this.messenger = (0, messenger_1.getMessenger)();
     }
     async createOne(data, opts) {
         const result = await super.createOne(data, opts);
-        await (0, webhooks_1.register)();
+        this.messenger.publish('webhooks', { type: 'reload' });
         return result;
     }
     async createMany(data, opts) {
         const result = await super.createMany(data, opts);
-        await (0, webhooks_1.register)();
+        this.messenger.publish('webhooks', { type: 'reload' });
         return result;
     }
     async updateOne(key, data, opts) {
         const result = await super.updateOne(key, data, opts);
-        await (0, webhooks_1.register)();
+        this.messenger.publish('webhooks', { type: 'reload' });
         return result;
     }
     async updateMany(keys, data, opts) {
         const result = await super.updateMany(keys, data, opts);
-        await (0, webhooks_1.register)();
+        this.messenger.publish('webhooks', { type: 'reload' });
         return result;
     }
     async deleteOne(key, opts) {
         const result = await super.deleteOne(key, opts);
-        await (0, webhooks_1.register)();
+        this.messenger.publish('webhooks', { type: 'reload' });
         return result;
     }
     async deleteMany(keys, opts) {
         const result = await super.deleteMany(keys, opts);
-        await (0, webhooks_1.register)();
+        this.messenger.publish('webhooks', { type: 'reload' });
         return result;
     }
 }

package/dist/types/events.d.ts

@@ -0,0 +1,18 @@
+import { ActionHandler, FilterHandler, InitHandler } from '@directus/shared/types';
+import { ScheduledTask } from 'node-cron';
+export declare type EventHandler = {
+    type: 'filter';
+    name: string;
+    handler: FilterHandler;
+} | {
+    type: 'action';
+    name: string;
+    handler: ActionHandler;
+} | {
+    type: 'init';
+    name: string;
+    handler: InitHandler;
+} | {
+    type: 'schedule';
+    task: ScheduledTask;
+};

package/dist/types/events.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types/index.d.ts

@@ -1,8 +1,8 @@
-export * from './activity';
 export * from './assets';
 export * from './ast';
 export * from './auth';
 export * from './collection';
+export * from './events';
 export * from './files';
 export * from './graphql';
 export * from './items';

package/dist/types/index.js

@@ -10,11 +10,11 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./activity"), exports);
 __exportStar(require("./assets"), exports);
 __exportStar(require("./ast"), exports);
 __exportStar(require("./auth"), exports);
 __exportStar(require("./collection"), exports);
+__exportStar(require("./events"), exports);
 __exportStar(require("./files"), exports);
 __exportStar(require("./graphql"), exports);
 __exportStar(require("./items"), exports);

package/dist/utils/apply-snapshot.js

@@ -11,10 +11,12 @@ const services_1 = require("../services");
 const get_schema_1 = require("./get-schema");
 const get_snapshot_1 = require("./get-snapshot");
 const get_snapshot_diff_1 = require("./get-snapshot-diff");
+const cache_1 = require("../cache");
 async function applySnapshot(snapshot, options) {
     var _a, _b, _c, _d;
     const database = (_a = options === null || options === void 0 ? void 0 : options.database) !== null && _a !== void 0 ? _a : (0, database_1.default)();
     const schema = (_b = options === null || options === void 0 ? void 0 : options.schema) !== null && _b !== void 0 ? _b : (await (0, get_schema_1.getSchema)({ database }));
+    const { systemCache } = (0, cache_1.getCache)();
     const current = (_c = options === null || options === void 0 ? void 0 : options.current) !== null && _c !== void 0 ? _c : (await (0, get_snapshot_1.getSnapshot)({ database, schema }));
     const snapshotDiff = (_d = options === null || options === void 0 ? void 0 : options.diff) !== null && _d !== void 0 ? _d : (0, get_snapshot_diff_1.getSnapshotDiff)(current, snapshot);
     await database.transaction(async (trx) => {
@@ -178,6 +180,7 @@ async function applySnapshot(snapshot, options) {
             }
         }
     });
+    await (systemCache === null || systemCache === void 0 ? void 0 : systemCache.clear());
 }
 exports.applySnapshot = applySnapshot;
 function isNestedMetaUpdate(diff) {

package/dist/utils/construct-flow-tree.d.ts

@@ -0,0 +1,2 @@
+import { Flow, FlowRaw } from '@directus/shared/types';
+export declare function constructFlowTree(flow: FlowRaw): Flow;

package/dist/utils/construct-flow-tree.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.constructFlowTree = void 0;
+const lodash_1 = require("lodash");
+function constructFlowTree(flow) {
+    var _a;
+    const rootOperation = (_a = flow.operations.find((operation) => operation.id === flow.operation)) !== null && _a !== void 0 ? _a : null;
+    const operationTree = constructOperationTree(rootOperation, flow.operations);
+    const flowTree = {
+        ...(0, lodash_1.omit)(flow, 'operations'),
+        operation: operationTree,
+    };
+    return flowTree;
+}
+exports.constructFlowTree = constructFlowTree;
+function constructOperationTree(root, operations) {
+    if (root === null) {
+        return null;
+    }
+    const resolveOperation = root.resolve !== null ? operations.find((operation) => operation.id === root.resolve) : null;
+    const rejectOperation = root.reject !== null ? operations.find((operation) => operation.id === root.reject) : null;
+    if (resolveOperation === undefined || rejectOperation === undefined) {
+        throw new Error('Undefined reference in operations');
+    }
+    const operationTree = {
+        ...(0, lodash_1.omit)(root, 'flow'),
+        resolve: constructOperationTree(resolveOperation, operations),
+        reject: constructOperationTree(rejectOperation, operations),
+    };
+    return operationTree;
+}

package/dist/utils/get-accountability-for-role.d.ts

@@ -0,0 +1,7 @@
+import { Accountability, SchemaOverview } from '@directus/shared/types';
+import { Knex } from 'knex';
+export declare function getAccountabilityForRole(role: null | string, context: {
+    accountability: null | Accountability;
+    schema: SchemaOverview;
+    database: Knex;
+}): Promise<Accountability>;

package/dist/utils/get-accountability-for-role.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAccountabilityForRole = void 0;
+const get_permissions_1 = require("./get-permissions");
+const exceptions_1 = require("../exceptions");
+async function getAccountabilityForRole(role, context) {
+    let generatedAccountability = context.accountability;
+    if (role === null) {
+        generatedAccountability = {
+            role: null,
+            user: null,
+            admin: false,
+            app: false,
+        };
+        generatedAccountability.permissions = await (0, get_permissions_1.getPermissions)(generatedAccountability, context.schema);
+    }
+    else {
+        const roleInfo = await context.database
+            .select(['app_access', 'admin_access'])
+            .from('directus_roles')
+            .where({ id: role })
+            .first();
+        if (!roleInfo) {
+            throw new exceptions_1.InvalidConfigException(`Configured role "${role}" isn't a valid role ID or doesn't exist.`);
+        }
+        generatedAccountability = {
+            role,
+            user: null,
+            admin: roleInfo.admin_access === 1 || roleInfo.admin_access === '1' || roleInfo.admin_access === true,
+            app: roleInfo.app_access === 1 || roleInfo.app_access === '1' || roleInfo.app_access === true,
+        };
+        generatedAccountability.permissions = await (0, get_permissions_1.getPermissions)(generatedAccountability, context.schema);
+    }
+    return generatedAccountability;
+}
+exports.getAccountabilityForRole = getAccountabilityForRole;

package/dist/utils/get-column.js

@@ -28,7 +28,7 @@ function getColumn(knex, table, column, alias = (0, apply_function_to_column_nam
             if (allowedFunctions.includes(functionName) === false) {
                 throw new exceptions_1.InvalidQueryException(`Invalid function specified "${functionName}"`);
             }
-            const result = fn[functionName](table, columnName);
+            const result = fn[functionName](table, columnName, { type });
             if (alias) {
                 return knex.raw(result + ' AS ??', [alias]);
             }

package/dist/utils/job-queue.d.ts

@@ -0,0 +1,9 @@
+declare type Job = () => Promise<void> | void;
+export declare class JobQueue {
+    private running;
+    private jobs;
+    constructor();
+    enqueue(job: Job): void;
+    private run;
+}
+export {};

package/dist/utils/job-queue.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JobQueue = void 0;
+class JobQueue {
+    constructor() {
+        this.running = false;
+        this.jobs = [];
+    }
+    enqueue(job) {
+        this.jobs.push(job);
+        if (!this.running) {
+            this.run();
+        }
+    }
+    async run() {
+        this.running = true;
+        while (this.jobs.length > 0) {
+            const job = this.jobs.shift();
+            await job();
+        }
+        this.running = false;
+    }
+}
+exports.JobQueue = JobQueue;

package/dist/utils/operation-options.d.ts

@@ -0,0 +1,3 @@
+export declare function applyOperationOptions(options: Record<string, any>, data: Record<string, any>): Record<string, any>;
+export declare function optionToObject<T>(option: T): Exclude<T, string>;
+export declare function optionToString(option: unknown): string;

package/dist/utils/operation-options.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.optionToString = exports.optionToObject = exports.applyOperationOptions = void 0;
+const micromustache_1 = require("micromustache");
+const parse_json_1 = require("./parse-json");
+function resolveFn(path, scope) {
+    if (!scope)
+        return undefined;
+    const value = (0, micromustache_1.get)(scope, path);
+    return typeof value === 'object' ? JSON.stringify(value) : value;
+}
+function renderMustache(item, scope) {
+    if (typeof item === 'string') {
+        return (0, micromustache_1.renderFn)(item, resolveFn, scope, { explicit: true });
+    }
+    else if (Array.isArray(item)) {
+        return item.map((element) => renderMustache(element, scope));
+    }
+    else if (typeof item === 'object' && item !== null) {
+        return Object.fromEntries(Object.entries(item).map(([key, value]) => [key, renderMustache(value, scope)]));
+    }
+    else {
+        return item;
+    }
+}
+function applyOperationOptions(options, data) {
+    return Object.fromEntries(Object.entries(options).map(([key, value]) => {
+        if (typeof value === 'string') {
+            const single = value.match(/^\{\{\s*([^}\s]+)\s*\}\}$/);
+            if (single !== null) {
+                return [key, (0, micromustache_1.get)(data, single[1])];
+            }
+        }
+        return [key, renderMustache(value, data)];
+    }));
+}
+exports.applyOperationOptions = applyOperationOptions;
+function optionToObject(option) {
+    return typeof option === 'string' ? (0, parse_json_1.parseJSON)(option) : option;
+}
+exports.optionToObject = optionToObject;
+function optionToString(option) {
+    return typeof option === 'object' ? JSON.stringify(option) : String(option);
+}
+exports.optionToString = optionToString;

package/dist/utils/validate-query.js

@@ -104,7 +104,7 @@ function validateFilterPrimitive(value, key) {
         false) {
         throw new exceptions_1.InvalidQueryException(`The filter value for "${key}" has to be a string, number, or boolean`);
     }
-    if (typeof value === 'number' && Number.isNaN(value) && value <= Number.MAX_SAFE_INTEGER) {
+    if (typeof value === 'number' && (Number.isNaN(value) || value > Number.MAX_SAFE_INTEGER)) {
         throw new exceptions_1.InvalidQueryException(`The filter value for "${key}" is not a valid number`);
     }
     if (typeof value === 'string' && value.length === 0) {

package/dist/webhooks.d.ts

@@ -1,2 +1,4 @@
+export declare function init(): Promise<void>;
+export declare function reload(): Promise<void>;
 export declare function register(): Promise<void>;
 export declare function unregister(): void;

package/dist/webhooks.js

@@ -3,16 +3,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.unregister = exports.register = void 0;
+exports.unregister = exports.register = exports.reload = exports.init = void 0;
 const axios_1 = __importDefault(require("axios"));
 const database_1 = __importDefault(require("./database"));
 const emitter_1 = __importDefault(require("./emitter"));
 const logger_1 = __importDefault(require("./logger"));
 const services_1 = require("./services");
 const get_schema_1 = require("./utils/get-schema");
+const messenger_1 = require("./messenger");
 let registered = [];
-async function register() {
+async function init() {
+    await register();
+    const messenger = (0, messenger_1.getMessenger)();
+    messenger.subscribe('webhooks', (event) => {
+        if (event.type === 'reload') {
+            reload();
+        }
+    });
+}
+exports.init = init;
+async function reload() {
     unregister();
+    await register();
+}
+exports.reload = reload;
+async function register() {
     const webhookService = new services_1.WebhooksService({ knex: (0, database_1.default)(), schema: await (0, get_schema_1.getSchema)() });
     const webhooks = await webhookService.readByQuery({ filter: { status: { _eq: 'active' } } });
     for (const webhook of webhooks) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "directus",
-	"version": "9.11.1",
+	"version": "9.12.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.",
@@ -73,21 +73,20 @@
 	"files": [
 		"dist",
 		"LICENSE",
-		"README.md",
-		"example.env"
+		"README.md"
 	],
 	"dependencies": {
 		"@aws-sdk/client-ses": "^3.40.0",
-		"@directus/app": "9.11.1",
-		"@directus/drive": "9.11.1",
-		"@directus/drive-azure": "9.11.1",
-		"@directus/drive-gcs": "9.11.1",
-		"@directus/drive-s3": "9.11.1",
-		"@directus/extensions-sdk": "9.11.1",
-		"@directus/format-title": "9.11.1",
-		"@directus/schema": "9.11.1",
-		"@directus/shared": "9.11.1",
-		"@directus/specs": "9.11.1",
+		"@directus/app": "9.12.2",
+		"@directus/drive": "9.12.2",
+		"@directus/drive-azure": "9.12.2",
+		"@directus/drive-gcs": "9.12.2",
+		"@directus/drive-s3": "9.12.2",
+		"@directus/extensions-sdk": "9.12.2",
+		"@directus/format-title": "9.12.2",
+		"@directus/schema": "9.12.2",
+		"@directus/shared": "9.12.2",
+		"@directus/specs": "9.12.2",
 		"@godaddy/terminus": "^4.9.0",
 		"@rollup/plugin-alias": "^3.1.9",
 		"@rollup/plugin-virtual": "^2.0.3",
@@ -112,12 +111,15 @@
 		"execa": "^5.1.1",
 		"exifr": "^7.1.2",
 		"express": "^4.17.1",
+		"fast-redact": "^3.1.1",
 		"flat": "^5.0.2",
 		"fs-extra": "^10.0.0",
+		"globby": "^11.0.4",
 		"graphql": "^15.5.0",
 		"graphql-compose": "^9.0.1",
 		"helmet": "^4.6.0",
 		"inquirer": "^8.1.1",
+		"ioredis": "^4.27.6",
 		"joi": "^17.3.0",
 		"js-yaml": "^4.1.0",
 		"js2xmlparser": "^4.0.1",
@@ -131,6 +133,7 @@
 		"lodash": "^4.17.21",
 		"macos-release": "^2.4.1",
 		"marked": "^4.0.3",
+		"micromustache": "^8.0.3",
 		"mime-types": "^2.1.31",
 		"ms": "^2.1.3",
 		"nanoid": "^3.1.23",
@@ -162,7 +165,6 @@
 	},
 	"optionalDependencies": {
 		"@keyv/redis": "^2.1.2",
-		"ioredis": "^4.27.6",
 		"keyv-memcache": "^1.2.5",
 		"memcached": "^2.2.2",
 		"mysql": "^2.18.1",
@@ -171,7 +173,7 @@
 		"sqlite3": "^5.0.6",
 		"tedious": "^13.0.0"
 	},
-	"gitHead": "7e9812d04a95272720180d1cd60cfe9ee8075027",
+	"gitHead": "bce19abf6f52adc933ebc4f557e6959aa69d083e",
 	"devDependencies": {
 		"@types/async": "3.2.10",
 		"@types/body-parser": "1.19.2",
@@ -183,9 +185,11 @@
 		"@types/express": "4.17.13",
 		"@types/express-pino-logger": "4.0.3",
 		"@types/express-session": "1.17.4",
+		"@types/fast-redact": "^3.0.1",
 		"@types/flat": "5.0.2",
 		"@types/fs-extra": "9.0.13",
 		"@types/inquirer": "8.1.3",
+		"@types/ioredis": "^4.28.10",
 		"@types/jest": "27.4.1",
 		"@types/js-yaml": "4.0.5",
 		"@types/json2csv": "5.0.3",

package/dist/types/activity.d.ts

@@ -1,9 +0,0 @@
-export declare enum Action {
-    CREATE = "create",
-    UPDATE = "update",
-    DELETE = "delete",
-    REVERT = "revert",
-    COMMENT = "comment",
-    UPLOAD = "upload",
-    LOGIN = "login"
-}

package/dist/types/activity.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Action = void 0;
-var Action;
-(function (Action) {
-    Action["CREATE"] = "create";
-    Action["UPDATE"] = "update";
-    Action["DELETE"] = "delete";
-    Action["REVERT"] = "revert";
-    Action["COMMENT"] = "comment";
-    Action["UPLOAD"] = "upload";
-    Action["LOGIN"] = "login";
-})(Action = exports.Action || (exports.Action = {}));