directus 9.12.2 → 9.13.0

package/dist/controllers/items.js

@@ -105,7 +105,10 @@ router.patch('/:collection', collection_exists_1.default, (0, validate_batch_1.v
         return next();
     }
     let keys = [];
-    if (req.body.keys) {
+    if (Array.isArray(req.body)) {
+        keys = await service.updateBatch(req.body);
+    }
+    else if (req.body.keys) {
         keys = await service.updateMany(req.body.keys, req.body.data);
     }
     else {

package/dist/controllers/notifications.js

@@ -84,7 +84,10 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
         schema: req.schema,
     });
     let keys = [];
-    if (req.body.keys) {
+    if (Array.isArray(req.body)) {
+        keys = await service.updateBatch(req.body);
+    }
+    else if (req.body.keys) {
         keys = await service.updateMany(req.body.keys, req.body.data);
     }
     else {

package/dist/controllers/operations.js

@@ -75,7 +75,10 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
         schema: req.schema,
     });
     let keys = [];
-    if (req.body.keys) {
+    if (Array.isArray(req.body)) {
+        keys = await service.updateBatch(req.body);
+    }
+    else if (req.body.keys) {
         keys = await service.updateMany(req.body.keys, req.body.data);
     }
     else {

package/dist/controllers/panels.js

@@ -75,7 +75,10 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
         schema: req.schema,
     });
     let keys = [];
-    if (req.body.keys) {
+    if (Array.isArray(req.body)) {
+        keys = await service.updateBatch(req.body);
+    }
+    else if (req.body.keys) {
         keys = await service.updateMany(req.body.keys, req.body.data);
     }
     else {

package/dist/controllers/permissions.js

@@ -86,7 +86,10 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
         schema: req.schema,
     });
     let keys = [];
-    if (req.body.keys) {
+    if (Array.isArray(req.body)) {
+        keys = await service.updateBatch(req.body);
+    }
+    else if (req.body.keys) {
         keys = await service.updateMany(req.body.keys, req.body.data);
     }
     else {

package/dist/controllers/presets.js

@@ -84,7 +84,10 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
         schema: req.schema,
     });
     let keys = [];
-    if (req.body.keys) {
+    if (Array.isArray(req.body)) {
+        keys = await service.updateBatch(req.body);
+    }
+    else if (req.body.keys) {
         keys = await service.updateMany(req.body.keys, req.body.data);
     }
     else {

package/dist/controllers/roles.js

@@ -75,7 +75,10 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
         schema: req.schema,
     });
     let keys = [];
-    if (req.body.keys) {
+    if (Array.isArray(req.body)) {
+        keys = await service.updateBatch(req.body);
+    }
+    else if (req.body.keys) {
         keys = await service.updateMany(req.body.keys, req.body.data);
     }
     else {

package/dist/controllers/shares.js

@@ -149,7 +149,10 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
         schema: req.schema,
     });
     let keys = [];
-    if (req.body.keys) {
+    if (Array.isArray(req.body)) {
+        keys = await service.updateBatch(req.body);
+    }
+    else if (req.body.keys) {
         keys = await service.updateMany(req.body.keys, req.body.data);
     }
     else {

package/dist/controllers/users.js

@@ -138,7 +138,10 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
         schema: req.schema,
     });
     let keys = [];
-    if (req.body.keys) {
+    if (Array.isArray(req.body)) {
+        keys = await service.updateBatch(req.body);
+    }
+    else if (req.body.keys) {
         keys = await service.updateMany(req.body.keys, req.body.data);
     }
     else {
@@ -251,7 +254,7 @@ router.post('/me/tfa/generate/', (0, async_handler_1.default)(async (req, res, n
     return next();
 }), respond_1.respond);
 router.post('/me/tfa/enable/', (0, async_handler_1.default)(async (req, _res, next) => {
-    var _a;
+    var _a, _b;
     if (!((_a = req.accountability) === null || _a === void 0 ? void 0 : _a.user)) {
         throw new exceptions_1.InvalidCredentialsException();
     }
@@ -261,6 +264,33 @@ router.post('/me/tfa/enable/', (0, async_handler_1.default)(async (req, _res, ne
     if (!req.body.otp) {
         throw new exceptions_1.InvalidPayloadException(`"otp" is required`);
     }
+    // Override permissions only when enforce TFA is enabled in role
+    if (req.accountability.role) {
+        const rolesService = new services_1.RolesService({
+            schema: req.schema,
+        });
+        const role = (await rolesService.readOne(req.accountability.role));
+        if (role && role.enforce_tfa) {
+            const existingPermission = await ((_b = req.accountability.permissions) === null || _b === void 0 ? void 0 : _b.find((p) => p.collection === 'directus_users' && p.action === 'update'));
+            if (existingPermission) {
+                existingPermission.fields = ['tfa_secret'];
+                existingPermission.permissions = { id: { _eq: req.accountability.user } };
+                existingPermission.presets = null;
+                existingPermission.validation = null;
+            }
+            else {
+                (req.accountability.permissions || (req.accountability.permissions = [])).push({
+                    action: 'update',
+                    collection: 'directus_users',
+                    fields: ['tfa_secret'],
+                    permissions: { id: { _eq: req.accountability.user } },
+                    presets: null,
+                    role: req.accountability.role,
+                    validation: null,
+                });
+            }
+        }
+    }
     const service = new services_1.TFAService({
         accountability: req.accountability,
         schema: req.schema,
@@ -269,13 +299,40 @@ router.post('/me/tfa/enable/', (0, async_handler_1.default)(async (req, _res, ne
     return next();
 }), respond_1.respond);
 router.post('/me/tfa/disable', (0, async_handler_1.default)(async (req, _res, next) => {
-    var _a;
+    var _a, _b;
     if (!((_a = req.accountability) === null || _a === void 0 ? void 0 : _a.user)) {
         throw new exceptions_1.InvalidCredentialsException();
     }
     if (!req.body.otp) {
         throw new exceptions_1.InvalidPayloadException(`"otp" is required`);
     }
+    // Override permissions only when enforce TFA is enabled in role
+    if (req.accountability.role) {
+        const rolesService = new services_1.RolesService({
+            schema: req.schema,
+        });
+        const role = (await rolesService.readOne(req.accountability.role));
+        if (role && role.enforce_tfa) {
+            const existingPermission = await ((_b = req.accountability.permissions) === null || _b === void 0 ? void 0 : _b.find((p) => p.collection === 'directus_users' && p.action === 'update'));
+            if (existingPermission) {
+                existingPermission.fields = ['tfa_secret'];
+                existingPermission.permissions = { id: { _eq: req.accountability.user } };
+                existingPermission.presets = null;
+                existingPermission.validation = null;
+            }
+            else {
+                (req.accountability.permissions || (req.accountability.permissions = [])).push({
+                    action: 'update',
+                    collection: 'directus_users',
+                    fields: ['tfa_secret'],
+                    permissions: { id: { _eq: req.accountability.user } },
+                    presets: null,
+                    role: req.accountability.role,
+                    validation: null,
+                });
+            }
+        }
+    }
     const service = new services_1.TFAService({
         accountability: req.accountability,
         schema: req.schema,
@@ -287,4 +344,19 @@ router.post('/me/tfa/disable', (0, async_handler_1.default)(async (req, _res, ne
     await service.disableTFA(req.accountability.user);
     return next();
 }), respond_1.respond);
+router.post('/:pk/tfa/disable', (0, async_handler_1.default)(async (req, _res, next) => {
+    var _a;
+    if (!((_a = req.accountability) === null || _a === void 0 ? void 0 : _a.user)) {
+        throw new exceptions_1.InvalidCredentialsException();
+    }
+    if (!req.accountability.admin || !req.params.pk) {
+        throw new exceptions_1.ForbiddenException();
+    }
+    const service = new services_1.TFAService({
+        accountability: req.accountability,
+        schema: req.schema,
+    });
+    await service.disableTFA(req.params.pk);
+    return next();
+}), respond_1.respond);
 exports.default = router;

package/dist/controllers/utils.js

@@ -82,10 +82,10 @@ router.post('/import/:collection', collection_exists_1.default, (0, async_handle
             'content-type': 'application/octet-stream',
         };
     }
-    const busboy = new busboy_1.default({ headers });
-    busboy.on('file', async (fieldname, fileStream, filename, encoding, mimetype) => {
+    const busboy = (0, busboy_1.default)({ headers });
+    busboy.on('file', async (_fieldname, fileStream, { mimeType }) => {
         try {
-            await service.import(req.params.collection, mimetype, fileStream);
+            await service.import(req.params.collection, mimeType, fileStream);
         }
         catch (err) {
             return next(err);

package/dist/database/helpers/date/dialects/sqlite.js

@@ -4,6 +4,9 @@ exports.DateHelperSQLite = void 0;
 const types_1 = require("../types");
 class DateHelperSQLite extends types_1.DateHelper {
     parse(date) {
+        if (!date) {
+            return date;
+        }
         // Return the time as string
         if (date.length <= 8 && date.includes(':')) {
             return date;

package/dist/database/helpers/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/database/index.js

@@ -64,6 +64,8 @@ function getDatabase() {
                 // Ignore warnings about returning not being supported in some DBs
                 if (msg.startsWith('.returning()'))
                     return;
+                if (msg.endsWith('does not currently support RETURNING clause'))
+                    return;
                 // Ignore warning about MySQL not supporting TRX for DDL
                 if (msg.startsWith('Transaction was implicitly committed, do not mix transactions and DDL with MySQL'))
                     return;

package/dist/database/migrations/20210225A-add-relations-sort-field.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.down = exports.up = void 0;
-const parse_json_1 = require("../../utils/parse-json");
+const utils_1 = require("@directus/shared/utils");
 async function up(knex) {
     var _a;
     await knex.schema.alterTable('directus_relations', (table) => {
@@ -12,7 +12,7 @@ async function up(knex) {
         .from('directus_fields')
         .whereIn('interface', ['one-to-many', 'm2a-builder', 'many-to-many']);
     for (const field of fieldsWithSort) {
-        const options = typeof field.options === 'string' ? (0, parse_json_1.parseJSON)(field.options) : (_a = field.options) !== null && _a !== void 0 ? _a : {};
+        const options = typeof field.options === 'string' ? (0, utils_1.parseJSON)(field.options) : (_a = field.options) !== null && _a !== void 0 ? _a : {};
         if ('sortField' in options) {
             await knex('directus_relations')
                 .update({

package/dist/database/migrations/20210506A-rename-interfaces.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.down = exports.up = void 0;
-const parse_json_1 = require("../../utils/parse-json");
+const utils_1 = require("@directus/shared/utils");
 // [before, after, after-option additions]
 const changes = [
     ['button-links', 'presentation-links'],
@@ -55,7 +55,7 @@ async function up(knex) {
                 .from('directus_fields')
                 .where({ interface: before });
             for (const { id, options: existingOptionsRaw } of fields) {
-                const existingOptions = typeof existingOptionsRaw === 'string' ? (0, parse_json_1.parseJSON)(existingOptionsRaw) : existingOptionsRaw;
+                const existingOptions = typeof existingOptionsRaw === 'string' ? (0, utils_1.parseJSON)(existingOptionsRaw) : existingOptionsRaw;
                 const newOptions = {
                     ...(existingOptions || {}),
                     ...options,

package/dist/database/migrations/20210802A-replace-groups.js

@@ -4,15 +4,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.down = exports.up = void 0;
+const utils_1 = require("@directus/shared/utils");
 const logger_1 = __importDefault(require("../../logger"));
-const parse_json_1 = require("../../utils/parse-json");
 async function up(knex) {
     const dividerGroups = await knex.select('*').from('directus_fields').where('interface', '=', 'group-divider');
     for (const dividerGroup of dividerGroups) {
         const newOptions = { showHeader: true };
         if (dividerGroup.options) {
             try {
-                const options = typeof dividerGroup.options === 'string' ? (0, parse_json_1.parseJSON)(dividerGroup.options) : dividerGroup.options;
+                const options = typeof dividerGroup.options === 'string' ? (0, utils_1.parseJSON)(dividerGroup.options) : dividerGroup.options;
                 if (options.icon)
                     newOptions.headerIcon = options.icon;
                 if (options.color)

package/dist/database/migrations/20210805A-update-groups.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.down = exports.up = void 0;
-const parse_json_1 = require("../../utils/parse-json");
+const utils_1 = require("@directus/shared/utils");
 async function up(knex) {
     const groups = await knex.select('*').from('directus_fields').where({ interface: 'group-standard' });
     const raw = [];
     const detail = [];
     for (const group of groups) {
-        const options = typeof group.options === 'string' ? (0, parse_json_1.parseJSON)(group.options) : group.options || {};
+        const options = typeof group.options === 'string' ? (0, utils_1.parseJSON)(group.options) : group.options || {};
         if (options.showHeader === true) {
             detail.push(group);
         }

package/dist/database/migrations/20210805B-change-image-metadata-structure.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.down = exports.up = void 0;
-const parse_json_1 = require("../../utils/parse-json");
+const utils_1 = require("@directus/shared/utils");
 // Change image metadata structure to match the output from 'exifr'
 async function up(knex) {
     const files = await knex
@@ -11,7 +11,7 @@ async function up(knex) {
     for (const { id, metadata } of files) {
         let prevMetadata;
         try {
-            prevMetadata = (0, parse_json_1.parseJSON)(metadata);
+            prevMetadata = (0, utils_1.parseJSON)(metadata);
         }
         catch {
             continue;
@@ -55,7 +55,7 @@ async function down(knex) {
         .whereNotNull('metadata')
         .whereNot('metadata', '{}');
     for (const { id, metadata } of files) {
-        const prevMetadata = (0, parse_json_1.parseJSON)(metadata);
+        const prevMetadata = (0, utils_1.parseJSON)(metadata);
         // Update only required if metadata has keys other than 'icc' and 'iptc'
         if (Object.keys(prevMetadata).filter((key) => key !== 'icc' && key !== 'iptc').length > 0) {
             // Put all data under 'exif' and rename/move keys afterwards

package/dist/database/migrations/20211007A-update-presets.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.down = exports.up = void 0;
+const utils_1 = require("@directus/shared/utils");
 const nanoid_1 = require("nanoid");
-const parse_json_1 = require("../../utils/parse-json");
 async function up(knex) {
     var _a;
     await knex.schema.alterTable('directus_presets', (table) => {
@@ -13,7 +13,7 @@ async function up(knex) {
         .from('directus_presets');
     for (const preset of presets) {
         if (preset.filters) {
-            const oldFilters = (_a = (typeof preset.filters === 'string' ? (0, parse_json_1.parseJSON)(preset.filters) : preset.filters)) !== null && _a !== void 0 ? _a : [];
+            const oldFilters = (_a = (typeof preset.filters === 'string' ? (0, utils_1.parseJSON)(preset.filters) : preset.filters)) !== null && _a !== void 0 ? _a : [];
             if (oldFilters.length === 0)
                 continue;
             const newFilter = {
@@ -35,7 +35,7 @@ async function up(knex) {
             }
         }
         if (preset.layout_query) {
-            const layoutQuery = typeof preset.layout_query === 'string' ? (0, parse_json_1.parseJSON)(preset.layout_query) : preset.layout_query;
+            const layoutQuery = typeof preset.layout_query === 'string' ? (0, utils_1.parseJSON)(preset.layout_query) : preset.layout_query;
             for (const [layout, query] of Object.entries(layoutQuery)) {
                 if (query.sort) {
                     query.sort = [query.sort];
@@ -62,7 +62,7 @@ async function down(knex) {
         .from('directus_presets');
     for (const preset of presets) {
         if (preset.filter) {
-            const newFilter = (_a = (typeof preset.filter === 'string' ? (0, parse_json_1.parseJSON)(preset.filter) : preset.filter)) !== null && _a !== void 0 ? _a : {};
+            const newFilter = (_a = (typeof preset.filter === 'string' ? (0, utils_1.parseJSON)(preset.filter) : preset.filter)) !== null && _a !== void 0 ? _a : {};
             if (Object.keys(newFilter).length === 0)
                 continue;
             const oldFilters = [];
@@ -86,7 +86,7 @@ async function down(knex) {
             }
         }
         if (preset.layout_query) {
-            const layoutQuery = typeof preset.layout_query === 'string' ? (0, parse_json_1.parseJSON)(preset.layout_query) : preset.layout_query;
+            const layoutQuery = typeof preset.layout_query === 'string' ? (0, utils_1.parseJSON)(preset.layout_query) : preset.layout_query;
             for (const [layout, query] of Object.entries(layoutQuery)) {
                 if (query.sort && Array.isArray(query.sort)) {
                     query.sort = (_l = (_k = query.sort) === null || _k === void 0 ? void 0 : _k[0]) !== null && _l !== void 0 ? _l : null;

package/dist/database/migrations/20220429A-add-flows.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.down = exports.up = void 0;
 const utils_1 = require("@directus/shared/utils");
 const uuid_1 = require("uuid");
-const parse_json_1 = require("../../utils/parse-json");
 async function up(knex) {
     await knex.schema.createTable('directus_flows', (table) => {
         table.uuid('id').primary().notNullable();
@@ -59,7 +58,7 @@ async function up(knex) {
             position_y: 1,
             options: JSON.stringify({
                 url: webhook.url,
-                headers: typeof webhook.headers === 'string' ? (0, parse_json_1.parseJSON)(webhook.headers) : webhook.headers,
+                headers: typeof webhook.headers === 'string' ? (0, utils_1.parseJSON)(webhook.headers) : webhook.headers,
                 data: webhook.data ? '{{$trigger}}' : null,
                 method: webhook.method,
             }),

package/dist/database/migrations/20220614A-rename-hook-trigger-to-event.d.ts

@@ -0,0 +1,3 @@
+import { Knex } from 'knex';
+export declare function up(knex: Knex): Promise<void>;
+export declare function down(knex: Knex): Promise<void>;

package/dist/database/migrations/20220614A-rename-hook-trigger-to-event.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+async function up(knex) {
+    await knex('directus_flows').update({ trigger: 'event' }).where('trigger', '=', 'hook');
+}
+exports.up = up;
+async function down(knex) {
+    await knex('directus_flows').update({ trigger: 'hook' }).where('trigger', '=', 'event');
+}
+exports.down = down;

package/dist/database/system-data/fields/dashboards.yaml

@@ -14,3 +14,4 @@ fields:
   - field: user_created
     special: user-created
   - field: note
+  - field: color

package/dist/env.d.ts

@@ -1,6 +1,6 @@
 /**
  * @NOTE
- * For all possible keys, see: https://docs.directus.io/configuration/config-options/
+ * For all possible keys, see: https://docs.directus.io/self-hosted/config-options/
  */
 declare let env: Record<string, any>;
 export default env;

package/dist/env.js

@@ -1,7 +1,7 @@
 "use strict";
 /**
  * @NOTE
- * For all possible keys, see: https://docs.directus.io/configuration/config-options/
+ * For all possible keys, see: https://docs.directus.io/self-hosted/config-options/
  */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -14,7 +14,7 @@ const lodash_1 = require("lodash");
 const path_1 = __importDefault(require("path"));
 const require_yaml_1 = require("./utils/require-yaml");
 const utils_1 = require("@directus/shared/utils");
-const parse_json_1 = require("./utils/parse-json");
+const utils_2 = require("@directus/shared/utils");
 // keeping this here for now to prevent a circular import to constants.ts
 const allowedEnvironmentVars = [
     // general
@@ -78,6 +78,7 @@ const allowedEnvironmentVars = [
     'CACHE_REDIS_PORT',
     'CACHE_REDIS_PASSWORD',
     'CACHE_MEMCACHE',
+    'CACHE_VALUE_MAX_SIZE',
     // storage
     'STORAGE_LOCATIONS',
     'STORAGE_.+_DRIVER',
@@ -140,6 +141,7 @@ const allowedEnvironmentVars = [
     // emails
     'EMAIL_FROM',
     'EMAIL_TRANSPORT',
+    'EMAIL_VERIFY_SETUP',
     'EMAIL_SENDMAIL_NEW_LINE',
     'EMAIL_SENDMAIL_PATH',
     'EMAIL_SMTP_HOST',
@@ -171,6 +173,7 @@ const defaults = {
     PORT: 8055,
     PUBLIC_URL: '/',
     MAX_PAYLOAD_SIZE: '100kb',
+    MAX_RELATIONAL_DEPTH: 10,
     DB_EXCLUDE_TABLES: 'spatial_ref_sys,sysdiagrams',
     STORAGE_LOCATIONS: 'local',
     STORAGE_LOCAL_DRIVER: 'local',
@@ -200,11 +203,13 @@ const defaults = {
     CACHE_CONTROL_S_MAXAGE: '0',
     CACHE_SCHEMA: true,
     CACHE_PERMISSIONS: true,
+    CACHE_VALUE_MAX_SIZE: false,
     AUTH_PROVIDERS: '',
     AUTH_DISABLE_DEFAULT: false,
     EXTENSIONS_PATH: './extensions',
     EXTENSIONS_AUTO_RELOAD: false,
     EMAIL_FROM: 'no-reply@directus.io',
+    EMAIL_VERIFY_SETUP: true,
     EMAIL_TRANSPORT: 'sendmail',
     EMAIL_SENDMAIL_NEW_LINE: 'unix',
     EMAIL_SENDMAIL_PATH: '/usr/sbin/sendmail',
@@ -407,7 +412,7 @@ function processValues(env) {
 }
 function tryJSON(value) {
     try {
-        return (0, parse_json_1.parseJSON)(value);
+        return (0, utils_2.parseJSON)(value);
     }
     catch {
         return value;

package/dist/exceptions/database/translate.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/exceptions/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/extensions.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/flows.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -25,6 +29,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFlowManager = void 0;
 const sharedExceptions = __importStar(require("@directus/shared/exceptions"));
 const types_1 = require("@directus/shared/types");
+const utils_1 = require("@directus/shared/utils");
+const fast_redact_1 = __importDefault(require("fast-redact"));
+const lodash_1 = require("lodash");
 const micromustache_1 = require("micromustache");
 const node_cron_1 = require("node-cron");
 const database_1 = __importDefault(require("./database"));
@@ -32,16 +39,13 @@ const emitter_1 = __importDefault(require("./emitter"));
 const env_1 = __importDefault(require("./env"));
 const exceptions = __importStar(require("./exceptions"));
 const logger_1 = __importDefault(require("./logger"));
+const messenger_1 = require("./messenger");
 const services = __importStar(require("./services"));
 const services_1 = require("./services");
-const construct_flow_tree_1 = require("./utils/construct-flow-tree");
-const get_schema_1 = require("./utils/get-schema");
 const activity_1 = require("./services/activity");
 const revisions_1 = require("./services/revisions");
-const lodash_1 = require("lodash");
-const messenger_1 = require("./messenger");
-const fast_redact_1 = __importDefault(require("fast-redact"));
-const operation_options_1 = require("./utils/operation-options");
+const construct_flow_tree_1 = require("./utils/construct-flow-tree");
+const get_schema_1 = require("./utils/get-schema");
 const job_queue_1 = require("./utils/job-queue");
 let flowManager;
 const redactLogs = (0, fast_redact_1.default)({
@@ -152,7 +156,7 @@ class FlowManager {
                 else if (flow.options.type === 'action') {
                     const handler = (meta, context) => this.executeFlow(flow, meta, {
                         accountability: context.accountability,
-                        database: context.database,
+                        database: (0, database_1.default)(),
                         getSchema: context.schema ? () => context.schema : get_schema_1.getSchema,
                     });
                     events.forEach((event) => emitter_1.default.onAction(event, handler));
@@ -198,9 +202,9 @@ class FlowManager {
             }
             else if (flow.trigger === 'manual') {
                 const handler = (data, context) => {
-                    var _a, _b, _c;
+                    var _a, _b;
                     const enabledCollections = (_b = (_a = flow.options) === null || _a === void 0 ? void 0 : _a.collections) !== null && _b !== void 0 ? _b : [];
-                    const targetCollection = (_c = data) === null || _c === void 0 ? void 0 : _c.body.collection;
+                    const targetCollection = data === null || data === void 0 ? void 0 : data.body.collection;
                     if (!targetCollection) {
                         logger_1.default.warn(`Manual trigger requires "collection" to be specified in the payload`);
                         throw new exceptions.ForbiddenException();
@@ -310,7 +314,7 @@ class FlowManager {
             return { successor: null, status: 'unknown', data: null, options: null };
         }
         const handler = this.operations[operation.type];
-        const options = (0, operation_options_1.applyOperationOptions)(operation.options, keyedData);
+        const options = (0, utils_1.applyOptionsData)(operation.options, keyedData);
         try {
             const result = await handler(options, {
                 services,