directus 9.23.3 → 9.23.4

package/dist/controllers/webhooks.js

@@ -30,11 +30,11 @@ router.post('/', (0, async_handler_1.default)(async (req, res, next) => {
     try {
         if (Array.isArray(req.body)) {
             const items = await service.readMany(savedKeys, req.sanitizedQuery);
-            res.locals.payload = { data: items };
+            res.locals['payload'] = { data: items };
         }
         else {
             const item = await service.readOne(savedKeys[0], req.sanitizedQuery);
-            res.locals.payload = { data: item };
+            res.locals['payload'] = { data: item };
         }
     }
     catch (error) {
@@ -56,7 +56,7 @@ const readHandler = (0, async_handler_1.default)(async (req, res, next) => {
     });
     const records = await service.readByQuery(req.sanitizedQuery);
     const meta = await metaService.getMetaForQuery(req.collection, req.sanitizedQuery);
-    res.locals.payload = { data: records || null, meta };
+    res.locals['payload'] = { data: records || null, meta };
     return next();
 });
 router.get('/', (0, validate_batch_1.validateBatch)('read'), readHandler, respond_1.respond);
@@ -66,8 +66,8 @@ router.get('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
         accountability: req.accountability,
         schema: req.schema,
     });
-    const record = await service.readOne(req.params.pk, req.sanitizedQuery);
-    res.locals.payload = { data: record || null };
+    const record = await service.readOne(req.params['pk'], req.sanitizedQuery);
+    res.locals['payload'] = { data: record || null };
     return next();
 }), respond_1.respond);
 router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handler_1.default)(async (req, res, next) => {
@@ -85,7 +85,7 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
     }
     try {
         const result = await service.readMany(keys, req.sanitizedQuery);
-        res.locals.payload = { data: result };
+        res.locals['payload'] = { data: result };
     }
     catch (error) {
         if (error instanceof exceptions_1.ForbiddenException) {
@@ -100,10 +100,10 @@ router.patch('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
         accountability: req.accountability,
         schema: req.schema,
     });
-    const primaryKey = await service.updateOne(req.params.pk, req.body);
+    const primaryKey = await service.updateOne(req.params['pk'], req.body);
     try {
         const item = await service.readOne(primaryKey, req.sanitizedQuery);
-        res.locals.payload = { data: item || null };
+        res.locals['payload'] = { data: item || null };
     }
     catch (error) {
         if (error instanceof exceptions_1.ForbiddenException) {
@@ -135,7 +135,7 @@ router.delete('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
         accountability: req.accountability,
         schema: req.schema,
     });
-    await service.deleteOne(req.params.pk);
+    await service.deleteOne(req.params['pk']);
     return next();
 }), respond_1.respond);
 exports.default = router;

package/dist/database/helpers/fn/types.d.ts

@@ -7,7 +7,6 @@ export type FnHelperOptions = {
     originalCollectionName: string | undefined;
 };
 export declare abstract class FnHelper extends DatabaseHelper {
-    protected knex: Knex;
     protected schema: SchemaOverview;
     constructor(knex: Knex, schema: SchemaOverview);
     abstract year(table: string, column: string, options?: FnHelperOptions): Knex.Raw;

package/dist/database/helpers/fn/types.js

@@ -4,11 +4,9 @@ exports.FnHelper = void 0;
 const apply_query_1 = require("../../../utils/apply-query");
 const types_1 = require("../types");
 class FnHelper extends types_1.DatabaseHelper {
-    knex;
     schema;
     constructor(knex, schema) {
         super(knex);
-        this.knex = knex;
         this.schema = schema;
         this.schema = schema;
     }

package/dist/database/helpers/index.d.ts

@@ -6,8 +6,8 @@ import * as geometryHelpers from './geometry';
 import * as schemaHelpers from './schema';
 export declare function getHelpers(database: Knex): {
     date: dateHelpers.postgres | dateHelpers.oracle | dateHelpers.mysql | dateHelpers.mssql | dateHelpers.sqlite;
-    st: geometryHelpers.sqlite | geometryHelpers.postgres | geometryHelpers.mysql | geometryHelpers.mssql | geometryHelpers.oracle | geometryHelpers.redshift;
-    schema: schemaHelpers.sqlite | schemaHelpers.postgres | schemaHelpers.mysql | schemaHelpers.cockroachdb | schemaHelpers.mssql | schemaHelpers.oracle;
+    st: geometryHelpers.mysql | geometryHelpers.postgres | geometryHelpers.mssql | geometryHelpers.sqlite | geometryHelpers.oracle | geometryHelpers.redshift;
+    schema: schemaHelpers.mysql | schemaHelpers.cockroachdb | schemaHelpers.mssql | schemaHelpers.postgres | schemaHelpers.sqlite | schemaHelpers.oracle;
 };
-export declare function getFunctions(database: Knex, schema: SchemaOverview): fnHelpers.sqlite | fnHelpers.postgres | fnHelpers.mysql | fnHelpers.mssql | fnHelpers.oracle;
+export declare function getFunctions(database: Knex, schema: SchemaOverview): fnHelpers.mysql | fnHelpers.postgres | fnHelpers.mssql | fnHelpers.sqlite | fnHelpers.oracle;
 export type Helpers = ReturnType<typeof getHelpers>;

package/dist/database/index.js

@@ -30,7 +30,7 @@ function getDatabase() {
             requiredEnvVars.push('DB_FILENAME');
             break;
         case 'oracledb':
-            if (!env_1.default.DB_CONNECT_STRING) {
+            if (!env_1.default['DB_CONNECT_STRING']) {
                 requiredEnvVars.push('DB_HOST', 'DB_PORT', 'DB_DATABASE', 'DB_USER', 'DB_PASSWORD');
             }
             else {
@@ -47,7 +47,7 @@ function getDatabase() {
             }
             break;
         case 'mssql':
-            if (!env_1.default.DB_TYPE || env_1.default.DB_TYPE === 'default') {
+            if (!env_1.default['DB_TYPE'] || env_1.default['DB_TYPE'] === 'default') {
                 requiredEnvVars.push('DB_HOST', 'DB_PORT', 'DB_DATABASE', 'DB_USER', 'DB_PASSWORD');
             }
             break;
@@ -211,7 +211,7 @@ async function validateMigrations() {
     const database = getDatabase();
     try {
         let migrationFiles = await fs_extra_1.default.readdir(path_1.default.join(__dirname, 'migrations'));
-        const customMigrationsPath = path_1.default.resolve(env_1.default.EXTENSIONS_PATH, 'migrations');
+        const customMigrationsPath = path_1.default.resolve(env_1.default['EXTENSIONS_PATH'], 'migrations');
         let customMigrationFiles = ((await fs_extra_1.default.pathExists(customMigrationsPath)) && (await fs_extra_1.default.readdir(customMigrationsPath))) || [];
         migrationFiles = migrationFiles.filter((file) => file.startsWith('run') === false && file.endsWith('.d.ts') === false);
         customMigrationFiles = customMigrationFiles.filter((file) => file.endsWith('.js'));
@@ -255,10 +255,10 @@ async function validateDatabaseCharset(database) {
         const { collation } = await database.select(database.raw(`@@collation_database as collation`)).first();
         const tables = await database('information_schema.tables')
             .select({ name: 'TABLE_NAME', collation: 'TABLE_COLLATION' })
-            .where({ TABLE_SCHEMA: env_1.default.DB_DATABASE });
+            .where({ TABLE_SCHEMA: env_1.default['DB_DATABASE'] });
         const columns = await database('information_schema.columns')
             .select({ table_name: 'TABLE_NAME', name: 'COLUMN_NAME', collation: 'COLLATION_NAME' })
-            .where({ TABLE_SCHEMA: env_1.default.DB_DATABASE })
+            .where({ TABLE_SCHEMA: env_1.default['DB_DATABASE'] })
             .whereNot({ COLLATION_NAME: collation });
         let inconsistencies = '';
         for (const table of tables) {

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

@@ -60,25 +60,25 @@ async function down(knex) {
         if (Object.keys(prevMetadata).filter((key) => key !== 'icc' && key !== 'iptc').length > 0) {
             // Put all data under 'exif' and rename/move keys afterwards
             const newMetadata = { exif: prevMetadata };
-            if (newMetadata.exif.ifd0) {
-                newMetadata.exif.image = newMetadata.exif.ifd0;
-                delete newMetadata.exif.ifd0;
+            if (newMetadata.exif['ifd0']) {
+                newMetadata.exif['image'] = newMetadata.exif['ifd0'];
+                delete newMetadata.exif['ifd0'];
             }
-            if (newMetadata.exif.ifd1) {
-                newMetadata.exif.thumbnail = newMetadata.exif.ifd1;
-                delete newMetadata.exif.ifd1;
+            if (newMetadata.exif['ifd1']) {
+                newMetadata.exif['thumbnail'] = newMetadata.exif['ifd1'];
+                delete newMetadata.exif['ifd1'];
             }
-            if (newMetadata.exif.interop) {
-                newMetadata.exif.interoperability = newMetadata.exif.interop;
-                delete newMetadata.exif.interop;
+            if (newMetadata.exif['interop']) {
+                newMetadata.exif['interoperability'] = newMetadata.exif['interop'];
+                delete newMetadata.exif['interop'];
             }
-            if (newMetadata.exif.icc) {
-                newMetadata.icc = newMetadata.exif.icc;
-                delete newMetadata.exif.icc;
+            if (newMetadata.exif['icc']) {
+                newMetadata.icc = newMetadata.exif['icc'];
+                delete newMetadata.exif['icc'];
             }
-            if (newMetadata.exif.iptc) {
-                newMetadata.iptc = newMetadata.exif.iptc;
-                delete newMetadata.exif.iptc;
+            if (newMetadata.exif['iptc']) {
+                newMetadata.iptc = newMetadata.exif['iptc'];
+                delete newMetadata.exif['iptc'];
             }
             await knex('directus_files')
                 .update({ metadata: JSON.stringify(newMetadata) })

package/dist/database/migrations/run.js

@@ -13,7 +13,7 @@ const dynamic_import_1 = require("../../utils/dynamic-import");
 const format_title_1 = __importDefault(require("@directus/format-title"));
 async function run(database, direction, log = true) {
     let migrationFiles = await fs_extra_1.default.readdir(__dirname);
-    const customMigrationsPath = path_1.default.resolve(env_1.default.EXTENSIONS_PATH, 'migrations');
+    const customMigrationsPath = path_1.default.resolve(env_1.default['EXTENSIONS_PATH'], 'migrations');
     let customMigrationFiles = ((await fs_extra_1.default.pathExists(customMigrationsPath)) && (await fs_extra_1.default.readdir(customMigrationsPath))) || [];
     migrationFiles = migrationFiles.filter((file) => /^[0-9]+[A-Z]-[^.]+\.(?:js|ts)$/.test(file));
     customMigrationFiles = customMigrationFiles.filter((file) => file.endsWith('.js'));

package/dist/database/run-ast.js

@@ -64,7 +64,7 @@ async function runAST(originalAST, schema, options) {
         // Run the items through the special transforms
         const payloadService = new payload_1.PayloadService(collection, { knex, schema });
         let items = await payloadService.processValues('read', rawItems);
-        if (!items || items.length === 0)
+        if (!items || (Array.isArray(items) && items.length === 0))
             return items;
         // Apply the `_in` filters to the nested collection batches
         const nestedNodes = applyParentFilters(schema, nestedCollectionNodes, items);
@@ -76,8 +76,8 @@ async function runAST(originalAST, schema, options) {
                 while (hasMore) {
                     const node = (0, lodash_1.merge)({}, nestedNode, {
                         query: {
-                            limit: env_1.default.RELATIONAL_BATCH_SIZE,
-                            offset: batchCount * env_1.default.RELATIONAL_BATCH_SIZE,
+                            limit: env_1.default['RELATIONAL_BATCH_SIZE'],
+                            offset: batchCount * env_1.default['RELATIONAL_BATCH_SIZE'],
                             page: null,
                         },
                     });
@@ -85,7 +85,7 @@ async function runAST(originalAST, schema, options) {
                     if (nestedItems) {
                         items = mergeWithParentItems(schema, nestedItems, items, nestedNode);
                     }
-                    if (!nestedItems || nestedItems.length < env_1.default.RELATIONAL_BATCH_SIZE) {
+                    if (!nestedItems || nestedItems.length < env_1.default['RELATIONAL_BATCH_SIZE']) {
                         hasMore = false;
                     }
                     batchCount++;

package/dist/database/system-data/collections/index.js

@@ -4,6 +4,6 @@ exports.systemCollectionRows = void 0;
 const lodash_1 = require("lodash");
 const require_yaml_1 = require("../../../utils/require-yaml");
 const systemData = (0, require_yaml_1.requireYAML)(require.resolve('./collections.yaml'));
-exports.systemCollectionRows = systemData.data.map((row) => {
-    return (0, lodash_1.merge)({ system: true }, systemData.defaults, row);
+exports.systemCollectionRows = systemData['data'].map((row) => {
+    return (0, lodash_1.merge)({ system: true }, systemData['defaults'], row);
 });

package/dist/database/system-data/fields/index.js

@@ -18,15 +18,15 @@ for (const filepath of fieldData) {
     if (filepath.includes('_defaults') || filepath.includes('index'))
         continue;
     const systemFields = (0, require_yaml_1.requireYAML)(path_1.default.resolve(__dirname, filepath));
-    systemFields.fields.forEach((field, index) => {
+    systemFields['fields'].forEach((field, index) => {
         const systemField = (0, lodash_1.merge)({ system: true }, defaults, field, {
-            collection: systemFields.table,
+            collection: systemFields['table'],
             sort: index + 1,
         });
         // Dynamically populate auth providers field
         if (systemField.collection === 'directus_users' && systemField.field === 'provider') {
             (0, get_auth_providers_1.getAuthProviders)().forEach(({ name }) => {
-                systemField.options?.choices?.push({
+                systemField.options?.['choices']?.push({
                     text: (0, format_title_1.default)(name),
                     value: name,
                 });

package/dist/env.js

@@ -308,7 +308,7 @@ function refreshEnv() {
 }
 exports.refreshEnv = refreshEnv;
 function processConfiguration() {
-    const configPath = path_1.default.resolve(process.env.CONFIG_PATH || defaults.CONFIG_PATH);
+    const configPath = path_1.default.resolve(process.env['CONFIG_PATH'] || defaults['CONFIG_PATH']);
     if (fs_1.default.existsSync(configPath) === false)
         return {};
     const fileExt = path_1.default.extname(configPath).toLowerCase();

package/dist/extensions.js

@@ -64,7 +64,7 @@ function getExtensionManager() {
 exports.getExtensionManager = getExtensionManager;
 const defaultOptions = {
     schedule: true,
-    watch: env_1.default.EXTENSIONS_AUTO_RELOAD && env_1.default.NODE_ENV !== 'development',
+    watch: env_1.default['EXTENSIONS_AUTO_RELOAD'] && env_1.default['NODE_ENV'] !== 'development',
 };
 class ExtensionManager {
     isLoaded = false;
@@ -189,7 +189,7 @@ class ExtensionManager {
     }
     async load() {
         try {
-            await (0, node_1.ensureExtensionDirs)(env_1.default.EXTENSIONS_PATH, constants_1.NESTED_EXTENSION_TYPES);
+            await (0, node_1.ensureExtensionDirs)(env_1.default['EXTENSIONS_PATH'], constants_1.NESTED_EXTENSION_TYPES);
             this.extensions = await this.getExtensions();
         }
         catch (err) {
@@ -200,7 +200,7 @@ class ExtensionManager {
         await this.registerEndpoints();
         await this.registerOperations();
         await this.registerBundles();
-        if (env_1.default.SERVE_APP) {
+        if (env_1.default['SERVE_APP']) {
             this.appExtensions = await this.generateExtensionBundle();
         }
         this.isLoaded = true;
@@ -208,7 +208,7 @@ class ExtensionManager {
     async unload() {
         this.unregisterApiExtensions();
         this.apiEmitter.offAll();
-        if (env_1.default.SERVE_APP) {
+        if (env_1.default['SERVE_APP']) {
             this.appExtensions = null;
         }
         this.isLoaded = false;
@@ -217,7 +217,7 @@ class ExtensionManager {
         if (!this.watcher) {
             logger_1.default.info('Watching extensions for changes...');
             const localExtensionPaths = constants_1.NESTED_EXTENSION_TYPES.flatMap((type) => {
-                const typeDir = path_1.default.posix.join((0, node_1.pathToRelativeUrl)(env_1.default.EXTENSIONS_PATH), (0, utils_1.pluralize)(type));
+                const typeDir = path_1.default.posix.join((0, node_1.pathToRelativeUrl)(env_1.default['EXTENSIONS_PATH']), (0, utils_1.pluralize)(type));
                 if ((0, utils_1.isIn)(type, constants_1.HYBRID_EXTENSION_TYPES)) {
                     return [path_1.default.posix.join(typeDir, '*', 'app.js'), path_1.default.posix.join(typeDir, '*', 'api.js')];
                 }
@@ -256,10 +256,10 @@ class ExtensionManager {
         }
     }
     async getExtensions() {
-        const packageExtensions = await (0, node_1.getPackageExtensions)(env_1.default.PACKAGE_FILE_LOCATION);
-        const localPackageExtensions = await (0, node_1.resolvePackageExtensions)(env_1.default.EXTENSIONS_PATH);
-        const localExtensions = await (0, node_1.getLocalExtensions)(env_1.default.EXTENSIONS_PATH);
-        return [...packageExtensions, ...localPackageExtensions, ...localExtensions].filter((extension) => env_1.default.SERVE_APP || constants_1.APP_EXTENSION_TYPES.includes(extension.type) === false);
+        const packageExtensions = await (0, node_1.getPackageExtensions)(env_1.default['PACKAGE_FILE_LOCATION']);
+        const localPackageExtensions = await (0, node_1.resolvePackageExtensions)(env_1.default['EXTENSIONS_PATH']);
+        const localExtensions = await (0, node_1.getLocalExtensions)(env_1.default['EXTENSIONS_PATH']);
+        return [...packageExtensions, ...localPackageExtensions, ...localExtensions].filter((extension) => env_1.default['SERVE_APP'] || constants_1.APP_EXTENSION_TYPES.includes(extension.type) === false);
     }
     async generateExtensionBundle() {
         const sharedDepsMapping = await this.getSharedDepsMapping(constants_1.APP_SHARED_DEPS);
@@ -292,7 +292,7 @@ class ExtensionManager {
             const depRegex = new RegExp(`${(0, lodash_1.escapeRegExp)(dep.replace(/\//g, '_'))}\\.[0-9a-f]{8}\\.entry\\.js`);
             const depName = appDir.find((file) => depRegex.test(file));
             if (depName) {
-                const depUrl = new url_1.Url(env_1.default.PUBLIC_URL).addPath('admin', 'assets', depName);
+                const depUrl = new url_1.Url(env_1.default['PUBLIC_URL']).addPath('admin', 'assets', depName);
                 depsMapping[dep] = depUrl.toString({ rootRelative: true });
             }
             else {

package/dist/flows.js

@@ -77,7 +77,7 @@ class FlowManager {
         this.reloadQueue = new job_queue_1.JobQueue();
         const messenger = (0, messenger_1.getMessenger)();
         messenger.subscribe('flows', (event) => {
-            if (event.type === 'reload') {
+            if (event['type'] === 'reload') {
                 this.reloadQueue.enqueue(async () => {
                     if (this.isLoaded) {
                         await this.unload();
@@ -132,13 +132,13 @@ class FlowManager {
         for (const flow of flowTrees) {
             if (flow.trigger === 'event') {
                 let events = [];
-                if (flow.options?.scope) {
-                    events = (0, utils_1.toArray)(flow.options.scope)
+                if (flow.options?.['scope']) {
+                    events = (0, utils_1.toArray)(flow.options['scope'])
                         .map((scope) => {
                         if (['items.create', 'items.update', 'items.delete'].includes(scope)) {
-                            if (!flow.options?.collections)
+                            if (!flow.options?.['collections'])
                                 return [];
-                            return (0, utils_1.toArray)(flow.options.collections).map((collection) => {
+                            return (0, utils_1.toArray)(flow.options['collections']).map((collection) => {
                                 if (collection.startsWith('directus_')) {
                                     const action = scope.split('.')[1];
                                     return collection.substring(9) + '.' + action;
@@ -150,11 +150,11 @@ class FlowManager {
                     })
                         .flat();
                 }
-                if (flow.options.type === 'filter') {
+                if (flow.options['type'] === 'filter') {
                     const handler = (payload, meta, context) => this.executeFlow(flow, { payload, ...meta }, {
-                        accountability: context.accountability,
-                        database: context.database,
-                        getSchema: context.schema ? () => context.schema : get_schema_1.getSchema,
+                        accountability: context['accountability'],
+                        database: context['database'],
+                        getSchema: context['schema'] ? () => context['schema'] : get_schema_1.getSchema,
                     });
                     events.forEach((event) => emitter_1.default.onFilter(event, handler));
                     this.triggerHandlers.push({
@@ -162,11 +162,11 @@ class FlowManager {
                         events: events.map((event) => ({ type: 'filter', name: event, handler })),
                     });
                 }
-                else if (flow.options.type === 'action') {
+                else if (flow.options['type'] === 'action') {
                     const handler = (meta, context) => this.executeFlow(flow, meta, {
-                        accountability: context.accountability,
+                        accountability: context['accountability'],
                         database: (0, database_1.default)(),
-                        getSchema: context.schema ? () => context.schema : get_schema_1.getSchema,
+                        getSchema: context['schema'] ? () => context['schema'] : get_schema_1.getSchema,
                     });
                     events.forEach((event) => emitter_1.default.onAction(event, handler));
                     this.triggerHandlers.push({
@@ -176,8 +176,8 @@ class FlowManager {
                 }
             }
             else if (flow.trigger === 'schedule') {
-                if ((0, node_cron_1.validate)(flow.options.cron)) {
-                    const task = (0, node_cron_1.schedule)(flow.options.cron, async () => {
+                if ((0, node_cron_1.validate)(flow.options['cron'])) {
+                    const task = (0, node_cron_1.schedule)(flow.options['cron'], async () => {
                         try {
                             await this.executeFlow(flow);
                         }
@@ -188,7 +188,7 @@ class FlowManager {
                     this.triggerHandlers.push({ id: flow.id, events: [{ type: flow.trigger, task }] });
                 }
                 else {
-                    logger_1.default.warn(`Couldn't register cron trigger. Provided cron is invalid: ${flow.options.cron}`);
+                    logger_1.default.warn(`Couldn't register cron trigger. Provided cron is invalid: ${flow.options['cron']}`);
                 }
             }
             else if (flow.trigger === 'operation') {
@@ -197,22 +197,23 @@ class FlowManager {
             }
             else if (flow.trigger === 'webhook') {
                 const handler = (data, context) => {
-                    if (flow.options.async) {
+                    if (flow.options['async']) {
                         this.executeFlow(flow, data, context);
+                        return undefined;
                     }
                     else {
                         return this.executeFlow(flow, data, context);
                     }
                 };
-                const method = flow.options?.method ?? 'GET';
+                const method = flow.options?.['method'] ?? 'GET';
                 // Default return to $last for webhooks
-                flow.options.return = flow.options.return ?? '$last';
+                flow.options['return'] = flow.options['return'] ?? '$last';
                 this.webhookFlowHandlers[`${method}-${flow.id}`] = handler;
             }
             else if (flow.trigger === 'manual') {
                 const handler = (data, context) => {
-                    const enabledCollections = flow.options?.collections ?? [];
-                    const targetCollection = data?.body.collection;
+                    const enabledCollections = flow.options?.['collections'] ?? [];
+                    const targetCollection = data?.['body'].collection;
                     if (!targetCollection) {
                         logger_1.default.warn(`Manual trigger requires "collection" to be specified in the payload`);
                         throw new exceptions.ForbiddenException();
@@ -225,15 +226,16 @@ class FlowManager {
                         logger_1.default.warn(`Specified collection must be one of: ${enabledCollections.join(', ')}.`);
                         throw new exceptions.ForbiddenException();
                     }
-                    if (flow.options.async) {
+                    if (flow.options['async']) {
                         this.executeFlow(flow, data, context);
+                        return undefined;
                     }
                     else {
                         return this.executeFlow(flow, data, context);
                     }
                 };
                 // Default return to $last for manual
-                flow.options.return = '$last';
+                flow.options['return'] = '$last';
                 this.webhookFlowHandlers[`POST-${flow.id}`] = handler;
             }
         }
@@ -261,13 +263,13 @@ class FlowManager {
         this.isLoaded = false;
     }
     async executeFlow(flow, data = null, context = {}) {
-        const database = context.database ?? (0, database_1.default)();
-        const schema = context.schema ?? (await (0, get_schema_1.getSchema)({ database }));
+        const database = context['database'] ?? (0, database_1.default)();
+        const schema = context['schema'] ?? (await (0, get_schema_1.getSchema)({ database }));
         const keyedData = {
             [TRIGGER_KEY]: data,
             [LAST_KEY]: data,
-            [ACCOUNTABILITY_KEY]: context?.accountability ?? null,
-            [ENV_KEY]: (0, lodash_1.pick)(env_1.default, env_1.default.FLOWS_ENV_ALLOW_LIST ? (0, utils_1.toArray)(env_1.default.FLOWS_ENV_ALLOW_LIST) : []),
+            [ACCOUNTABILITY_KEY]: context?.['accountability'] ?? null,
+            [ENV_KEY]: (0, lodash_1.pick)(env_1.default, env_1.default['FLOWS_ENV_ALLOW_LIST'] ? (0, utils_1.toArray)(env_1.default['FLOWS_ENV_ALLOW_LIST']) : []),
         };
         let nextOperation = flow.operation;
         let lastOperationStatus = 'unknown';
@@ -285,7 +287,7 @@ class FlowManager {
                 knex: database,
                 schema: schema,
             });
-            const accountability = context?.accountability;
+            const accountability = context?.['accountability'];
             const activity = await activityService.createOne({
                 action: types_1.Action.RUN,
                 user: accountability?.user ?? null,
@@ -311,14 +313,14 @@ class FlowManager {
                 });
             }
         }
-        if (flow.trigger === 'event' && flow.options.type === 'filter' && lastOperationStatus === 'reject') {
+        if (flow.trigger === 'event' && flow.options['type'] === 'filter' && lastOperationStatus === 'reject') {
             throw keyedData[LAST_KEY];
         }
-        if (flow.options.return === '$all') {
+        if (flow.options['return'] === '$all') {
             return keyedData;
         }
-        else if (flow.options.return) {
-            return (0, micromustache_1.get)(keyedData, flow.options.return);
+        else if (flow.options['return']) {
+            return (0, micromustache_1.get)(keyedData, flow.options['return']);
         }
         return undefined;
     }

package/dist/logger.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="qs" />
 import { LoggerOptions } from 'pino';
 import type { RequestHandler } from 'express';
+export declare const httpLoggerOptions: LoggerOptions;
 declare const logger: import("pino").Logger<LoggerOptions & Record<string, any>>;
 export declare const expressLogger: RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
 export default logger;

package/dist/logger.js

@@ -26,30 +26,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.expressLogger = void 0;
+exports.expressLogger = exports.httpLoggerOptions = void 0;
 const utils_1 = require("@directus/shared/utils");
 const lodash_1 = require("lodash");
 const pino_1 = __importDefault(require("pino"));
 const pino_http_1 = __importStar(require("pino-http"));
 const url_1 = require("url");
 const env_1 = __importDefault(require("./env"));
+const constants_1 = require("./constants");
 const get_config_from_env_1 = require("./utils/get-config-from-env");
-const redact_header_cookies_1 = require("./utils/redact-header-cookies");
 const pinoOptions = {
-    level: env_1.default.LOG_LEVEL || 'info',
+    level: env_1.default['LOG_LEVEL'] || 'info',
     redact: {
-        paths: ['req.headers.authorization', `req.cookies.${env_1.default.REFRESH_TOKEN_COOKIE_NAME}`],
-        censor: '--redact--',
+        paths: ['req.headers.authorization', 'req.headers.cookie'],
+        censor: constants_1.REDACT_TEXT,
     },
 };
-const httpLoggerOptions = {
-    level: env_1.default.LOG_LEVEL || 'info',
+exports.httpLoggerOptions = {
+    level: env_1.default['LOG_LEVEL'] || 'info',
     redact: {
-        paths: ['req.headers.authorization', `req.cookies.${env_1.default.REFRESH_TOKEN_COOKIE_NAME}`],
-        censor: '--redact--',
+        paths: ['req.headers.authorization', 'req.headers.cookie'],
+        censor: constants_1.REDACT_TEXT,
     },
 };
-if (env_1.default.LOG_STYLE !== 'raw') {
+if (env_1.default['LOG_STYLE'] !== 'raw') {
     pinoOptions.transport = {
         target: 'pino-pretty',
         options: {
@@ -57,7 +57,7 @@ if (env_1.default.LOG_STYLE !== 'raw') {
             sync: true,
         },
     };
-    httpLoggerOptions.transport = {
+    exports.httpLoggerOptions.transport = {
         target: 'pino-http-print',
         options: {
             all: true,
@@ -70,11 +70,26 @@ if (env_1.default.LOG_STYLE !== 'raw') {
         },
     };
 }
+if (env_1.default['LOG_STYLE'] === 'raw') {
+    exports.httpLoggerOptions.redact = {
+        paths: ['req.headers.authorization', 'req.headers.cookie', 'res.headers'],
+        censor: (value, pathParts) => {
+            const path = pathParts.join('.');
+            if (path === 'res.headers') {
+                if ('set-cookie' in value) {
+                    value['set-cookie'] = constants_1.REDACT_TEXT;
+                }
+                return value;
+            }
+            return constants_1.REDACT_TEXT;
+        },
+    };
+}
 const loggerEnvConfig = (0, get_config_from_env_1.getConfigFromEnv)('LOGGER_', 'LOGGER_HTTP');
 // Expose custom log levels into formatter function
-if (loggerEnvConfig.levels) {
+if (loggerEnvConfig['levels']) {
     const customLogLevels = {};
-    for (const el of (0, utils_1.toArray)(loggerEnvConfig.levels)) {
+    for (const el of (0, utils_1.toArray)(loggerEnvConfig['levels'])) {
         const key_val = el.split(':');
         customLogLevels[key_val[0].trim()] = key_val[1].trim();
     }
@@ -86,7 +101,7 @@ if (loggerEnvConfig.levels) {
             };
         },
     };
-    httpLoggerOptions.formatters = {
+    exports.httpLoggerOptions.formatters = {
         level(label, number) {
             return {
                 severity: customLogLevels[label] || 'info',
@@ -94,41 +109,26 @@ if (loggerEnvConfig.levels) {
             };
         },
     };
-    delete loggerEnvConfig.levels;
+    delete loggerEnvConfig['levels'];
 }
 const logger = (0, pino_1.default)((0, lodash_1.merge)(pinoOptions, loggerEnvConfig));
 const httpLoggerEnvConfig = (0, get_config_from_env_1.getConfigFromEnv)('LOGGER_HTTP', ['LOGGER_HTTP_LOGGER']);
 exports.expressLogger = (0, pino_http_1.default)({
-    logger: (0, pino_1.default)((0, lodash_1.merge)(httpLoggerOptions, loggerEnvConfig)),
+    logger: (0, pino_1.default)((0, lodash_1.merge)(exports.httpLoggerOptions, loggerEnvConfig)),
     ...httpLoggerEnvConfig,
     serializers: {
         req(request) {
             const output = pino_http_1.stdSerializers.req(request);
             output.url = redactQuery(output.url);
-            if (output.headers?.cookie) {
-                output.headers.cookie = (0, redact_header_cookies_1.redactHeaderCookie)(output.headers.cookie, [
-                    'access_token',
-                    `${env_1.default.REFRESH_TOKEN_COOKIE_NAME}`,
-                ]);
-            }
             return output;
         },
-        res(response) {
-            if (response.headers?.['set-cookie']) {
-                response.headers['set-cookie'] = (0, redact_header_cookies_1.redactHeaderCookie)(response.headers['set-cookie'], [
-                    'access_token',
-                    `${env_1.default.REFRESH_TOKEN_COOKIE_NAME}`,
-                ]);
-            }
-            return response;
-        },
     },
 });
 exports.default = logger;
 function redactQuery(originalPath) {
     const url = new url_1.URL(originalPath, 'http://example.com/');
     if (url.searchParams.has('access_token')) {
-        url.searchParams.set('access_token', '--redacted--');
+        url.searchParams.set('access_token', constants_1.REDACT_TEXT);
     }
     return url.pathname + url.search;
 }