directus 9.23.1 → 9.23.4

package/dist/cache.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCacheValue = exports.setCacheValue = exports.getSystemCache = exports.setSystemCache = exports.clearSystemCache = exports.flushCaches = exports.getCache = void 0;
+exports.getCacheValue = exports.setCacheValue = exports.getSchemaCache = exports.setSchemaCache = exports.getSystemCache = exports.setSystemCache = exports.clearSystemCache = exports.flushCaches = exports.getCache = void 0;
 const keyv_1 = __importDefault(require("keyv"));
 const env_1 = __importDefault(require("./env"));
 const logger_1 = __importDefault(require("./logger"));
@@ -11,40 +11,67 @@ const compress_1 = require("./utils/compress");
 const get_config_from_env_1 = require("./utils/get-config-from-env");
 const get_milliseconds_1 = require("./utils/get-milliseconds");
 const validate_env_1 = require("./utils/validate-env");
+const messenger_1 = require("./messenger");
+const utils_1 = require("@directus/shared/utils");
 let cache = null;
 let systemCache = null;
+let localSchemaCache = null;
+let sharedSchemaCache = null;
 let lockCache = null;
+let messengerSubscribed = false;
+const messenger = (0, messenger_1.getMessenger)();
+if (env_1.default['MESSENGER_STORE'] === 'redis' &&
+    env_1.default['CACHE_STORE'] === 'memory' &&
+    env_1.default['CACHE_AUTO_PURGE'] &&
+    !messengerSubscribed) {
+    messengerSubscribed = true;
+    messenger.subscribe('schemaChanged', async (opts) => {
+        if (cache && opts?.['autoPurgeCache'] !== false) {
+            await cache.clear();
+        }
+    });
+}
 function getCache() {
-    if (env_1.default.CACHE_ENABLED === true && cache === null) {
+    if (env_1.default['CACHE_ENABLED'] === true && cache === null) {
         (0, validate_env_1.validateEnv)(['CACHE_NAMESPACE', 'CACHE_TTL', 'CACHE_STORE']);
-        cache = getKeyvInstance((0, get_milliseconds_1.getMilliseconds)(env_1.default.CACHE_TTL));
+        cache = getKeyvInstance(env_1.default['CACHE_STORE'], (0, get_milliseconds_1.getMilliseconds)(env_1.default['CACHE_TTL']));
         cache.on('error', (err) => logger_1.default.warn(err, `[cache] ${err}`));
     }
     if (systemCache === null) {
-        systemCache = getKeyvInstance((0, get_milliseconds_1.getMilliseconds)(env_1.default.CACHE_SYSTEM_TTL), '_system');
-        systemCache.on('error', (err) => logger_1.default.warn(err, `[cache] ${err}`));
+        systemCache = getKeyvInstance(env_1.default['CACHE_STORE'], (0, get_milliseconds_1.getMilliseconds)(env_1.default['CACHE_SYSTEM_TTL']), '_system');
+        systemCache.on('error', (err) => logger_1.default.warn(err, `[system-cache] ${err}`));
+    }
+    if (sharedSchemaCache === null) {
+        sharedSchemaCache = getKeyvInstance(env_1.default['CACHE_STORE'], (0, get_milliseconds_1.getMilliseconds)(env_1.default['CACHE_SYSTEM_TTL']), '_schema_shared');
+        sharedSchemaCache.on('error', (err) => logger_1.default.warn(err, `[shared-schema-cache] ${err}`));
+    }
+    if (localSchemaCache === null) {
+        localSchemaCache = getKeyvInstance('memory', (0, get_milliseconds_1.getMilliseconds)(env_1.default['CACHE_SYSTEM_TTL']), '_schema');
+        localSchemaCache.on('error', (err) => logger_1.default.warn(err, `[schema-cache] ${err}`));
     }
     if (lockCache === null) {
-        lockCache = getKeyvInstance(undefined, '_lock');
-        lockCache.on('error', (err) => logger_1.default.warn(err, `[cache] ${err}`));
+        lockCache = getKeyvInstance(env_1.default['CACHE_STORE'], undefined, '_lock');
+        lockCache.on('error', (err) => logger_1.default.warn(err, `[lock-cache] ${err}`));
     }
-    return { cache, systemCache, lockCache };
+    return { cache, systemCache, sharedSchemaCache, localSchemaCache, lockCache };
 }
 exports.getCache = getCache;
 async function flushCaches(forced) {
     const { cache } = getCache();
-    await clearSystemCache(forced);
-    await (cache === null || cache === void 0 ? void 0 : cache.clear());
+    await clearSystemCache({ forced });
+    await cache?.clear();
 }
 exports.flushCaches = flushCaches;
-async function clearSystemCache(forced) {
-    const { systemCache, lockCache } = getCache();
+async function clearSystemCache(opts) {
+    const { systemCache, localSchemaCache, lockCache } = getCache();
     // Flush system cache when forced or when system cache lock not set
-    if (forced || !(await lockCache.get('system-cache-lock'))) {
+    if (opts?.forced || !(await lockCache.get('system-cache-lock'))) {
         await lockCache.set('system-cache-lock', true, 10000);
         await systemCache.clear();
         await lockCache.delete('system-cache-lock');
     }
+    await localSchemaCache.clear();
+    messenger.publish('schemaChanged', { autoPurgeCache: opts?.autoPurgeCache });
 }
 exports.clearSystemCache = clearSystemCache;
 async function setSystemCache(key, value, ttl) {
@@ -59,6 +86,25 @@ async function getSystemCache(key) {
     return await getCacheValue(systemCache, key);
 }
 exports.getSystemCache = getSystemCache;
+async function setSchemaCache(schema) {
+    const { localSchemaCache, sharedSchemaCache } = getCache();
+    const schemaHash = await (0, utils_1.getSimpleHash)(JSON.stringify(schema));
+    await sharedSchemaCache.set('hash', schemaHash);
+    await localSchemaCache.set('schema', schema);
+    await localSchemaCache.set('hash', schemaHash);
+}
+exports.setSchemaCache = setSchemaCache;
+async function getSchemaCache() {
+    const { localSchemaCache, sharedSchemaCache } = getCache();
+    const sharedSchemaHash = await sharedSchemaCache.get('hash');
+    if (!sharedSchemaHash)
+        return;
+    const localSchemaHash = await localSchemaCache.get('hash');
+    if (!localSchemaHash || localSchemaHash !== sharedSchemaHash)
+        return;
+    return await localSchemaCache.get('schema');
+}
+exports.getSchemaCache = getSchemaCache;
 async function setCacheValue(cache, key, value, ttl) {
     const compressed = await (0, compress_1.compress)(value);
     await cache.set(key, compressed, ttl);
@@ -72,8 +118,8 @@ async function getCacheValue(cache, key) {
     return decompressed;
 }
 exports.getCacheValue = getCacheValue;
-function getKeyvInstance(ttl, namespaceSuffix) {
-    switch (env_1.default.CACHE_STORE) {
+function getKeyvInstance(store, ttl, namespaceSuffix) {
+    switch (store) {
         case 'redis':
             return new keyv_1.default(getConfig('redis', ttl, namespaceSuffix));
         case 'memcache':
@@ -85,18 +131,20 @@ function getKeyvInstance(ttl, namespaceSuffix) {
 }
 function getConfig(store = 'memory', ttl, namespaceSuffix = '') {
     const config = {
-        namespace: `${env_1.default.CACHE_NAMESPACE}${namespaceSuffix}`,
+        namespace: `${env_1.default['CACHE_NAMESPACE']}${namespaceSuffix}`,
         ttl,
     };
     if (store === 'redis') {
         const KeyvRedis = require('@keyv/redis');
-        config.store = new KeyvRedis(env_1.default.CACHE_REDIS || (0, get_config_from_env_1.getConfigFromEnv)('CACHE_REDIS_'));
+        config.store = new KeyvRedis(env_1.default['CACHE_REDIS'] || (0, get_config_from_env_1.getConfigFromEnv)('CACHE_REDIS_'));
     }
     if (store === 'memcache') {
         const KeyvMemcache = require('keyv-memcache');
         // keyv-memcache uses memjs which only accepts a comma separated string instead of an array,
         // so we need to join array into a string when applicable. See #7986
-        const cacheMemcache = Array.isArray(env_1.default.CACHE_MEMCACHE) ? env_1.default.CACHE_MEMCACHE.join(',') : env_1.default.CACHE_MEMCACHE;
+        const cacheMemcache = Array.isArray(env_1.default['CACHE_MEMCACHE'])
+            ? env_1.default['CACHE_MEMCACHE'].join(',')
+            : env_1.default['CACHE_MEMCACHE'];
         config.store = new KeyvMemcache(cacheMemcache);
     }
     return config;

package/dist/cli/commands/bootstrap/index.js

@@ -26,13 +26,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const database_1 = __importStar(require("../../../database"));
 const run_1 = __importDefault(require("../../../database/migrations/run"));
 const run_2 = __importDefault(require("../../../database/seeds/run"));
 const env_1 = __importDefault(require("../../../env"));
 const logger_1 = __importDefault(require("../../../logger"));
-const get_schema_1 = require("../../../utils/get-schema");
 const services_1 = require("../../../services");
-const database_1 = __importStar(require("../../../database"));
+const get_schema_1 = require("../../../utils/get-schema");
 const defaults_1 = require("../../utils/defaults");
 async function bootstrap({ skipAdminInit }) {
     logger_1.default.info('Initializing bootstrap...');
@@ -50,9 +50,9 @@ async function bootstrap({ skipAdminInit }) {
         else {
             logger_1.default.info('Skipping creation of default Admin user and role...');
         }
-        if (env_1.default.PROJECT_NAME && typeof env_1.default.PROJECT_NAME === 'string' && env_1.default.PROJECT_NAME.length > 0) {
+        if (env_1.default['PROJECT_NAME'] && typeof env_1.default['PROJECT_NAME'] === 'string' && env_1.default['PROJECT_NAME'].length > 0) {
             const settingsService = new services_1.SettingsService({ schema });
-            await settingsService.upsertSingleton({ project_name: env_1.default.PROJECT_NAME });
+            await settingsService.upsertSingleton({ project_name: env_1.default['PROJECT_NAME'] });
         }
     }
     else {
@@ -75,6 +75,7 @@ async function waitForDatabase(database) {
     }
     // This will throw and exit the process if the database is not available
     await (0, database_1.validateDatabaseConnection)(database);
+    return database;
 }
 async function createDefaultAdmin(schema) {
     const { nanoid } = await import('nanoid');
@@ -83,12 +84,12 @@ async function createDefaultAdmin(schema) {
     const role = await rolesService.createOne(defaults_1.defaultAdminRole);
     logger_1.default.info('Adding first admin user...');
     const usersService = new services_1.UsersService({ schema });
-    let adminEmail = env_1.default.ADMIN_EMAIL;
+    let adminEmail = env_1.default['ADMIN_EMAIL'];
     if (!adminEmail) {
         logger_1.default.info('No admin email provided. Defaulting to "admin@example.com"');
         adminEmail = 'admin@example.com';
     }
-    let adminPassword = env_1.default.ADMIN_PASSWORD;
+    let adminPassword = env_1.default['ADMIN_PASSWORD'];
     if (!adminPassword) {
         adminPassword = nanoid(12);
         logger_1.default.info(`No admin password provided. Defaulting to "${adminPassword}"`);

package/dist/cli/commands/init/index.js

@@ -6,17 +6,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const chalk_1 = __importDefault(require("chalk"));
 const execa_1 = __importDefault(require("execa"));
 const inquirer_1 = __importDefault(require("inquirer"));
+const joi_1 = __importDefault(require("joi"));
 const ora_1 = __importDefault(require("ora"));
 const uuid_1 = require("uuid");
-const joi_1 = __importDefault(require("joi"));
 const run_1 = __importDefault(require("../../../database/migrations/run"));
 const run_2 = __importDefault(require("../../../database/seeds/run"));
+const generate_hash_1 = require("../../../utils/generate-hash");
 const create_db_connection_1 = __importDefault(require("../../utils/create-db-connection"));
 const create_env_1 = __importDefault(require("../../utils/create-env"));
+const defaults_1 = require("../../utils/defaults");
 const drivers_1 = require("../../utils/drivers");
 const questions_1 = require("./questions");
-const generate_hash_1 = require("../../../utils/generate-hash");
-const defaults_1 = require("../../utils/defaults");
 async function init() {
     const rootPath = process.cwd();
     const { client } = await inquirer_1.default.prompt([

package/dist/cli/commands/schema/apply.js

@@ -41,7 +41,6 @@ const apply_snapshot_1 = require("../../../utils/apply-snapshot");
 const get_snapshot_1 = require("../../../utils/get-snapshot");
 const get_snapshot_diff_1 = require("../../../utils/get-snapshot-diff");
 async function apply(snapshotPath, options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     const filename = path_1.default.resolve(process.cwd(), snapshotPath);
     const database = (0, database_1.default)();
     await (0, database_1.validateDatabaseConnection)(database);
@@ -68,14 +67,14 @@ async function apply(snapshotPath, options) {
             database.destroy();
             process.exit(0);
         }
-        const dryRun = (options === null || options === void 0 ? void 0 : options.dryRun) === true;
-        const promptForChanges = !dryRun && (options === null || options === void 0 ? void 0 : options.yes) !== true;
+        const dryRun = options?.dryRun === true;
+        const promptForChanges = !dryRun && options?.yes !== true;
         if (dryRun || promptForChanges) {
             let message = '';
             if (snapshotDiff.collections.length > 0) {
                 message += chalk_1.default.black.underline.bold('Collections:');
                 for (const { collection, diff } of snapshotDiff.collections) {
-                    if (((_a = diff[0]) === null || _a === void 0 ? void 0 : _a.kind) === types_1.DiffKind.EDIT) {
+                    if (diff[0]?.kind === types_1.DiffKind.EDIT) {
                         message += `\n  - ${chalk_1.default.blue('Update')} ${collection}`;
                         for (const change of diff) {
                             if (change.kind === types_1.DiffKind.EDIT) {
@@ -84,13 +83,13 @@ async function apply(snapshotPath, options) {
                             }
                         }
                     }
-                    else if (((_b = diff[0]) === null || _b === void 0 ? void 0 : _b.kind) === types_1.DiffKind.DELETE) {
+                    else if (diff[0]?.kind === types_1.DiffKind.DELETE) {
                         message += `\n  - ${chalk_1.default.red('Delete')} ${collection}`;
                     }
-                    else if (((_c = diff[0]) === null || _c === void 0 ? void 0 : _c.kind) === types_1.DiffKind.NEW) {
+                    else if (diff[0]?.kind === types_1.DiffKind.NEW) {
                         message += `\n  - ${chalk_1.default.green('Create')} ${collection}`;
                     }
-                    else if (((_d = diff[0]) === null || _d === void 0 ? void 0 : _d.kind) === types_1.DiffKind.ARRAY) {
+                    else if (diff[0]?.kind === types_1.DiffKind.ARRAY) {
                         message += `\n  - ${chalk_1.default.blue('Update')} ${collection}`;
                     }
                 }
@@ -98,7 +97,7 @@ async function apply(snapshotPath, options) {
             if (snapshotDiff.fields.length > 0) {
                 message += '\n\n' + chalk_1.default.black.underline.bold('Fields:');
                 for (const { collection, field, diff } of snapshotDiff.fields) {
-                    if (((_e = diff[0]) === null || _e === void 0 ? void 0 : _e.kind) === types_1.DiffKind.EDIT || (0, apply_diff_1.isNestedMetaUpdate)(diff[0])) {
+                    if (diff[0]?.kind === types_1.DiffKind.EDIT || (0, apply_diff_1.isNestedMetaUpdate)(diff[0])) {
                         message += `\n  - ${chalk_1.default.blue('Update')} ${collection}.${field}`;
                         for (const change of diff) {
                             const path = change.path.slice(1).join('.');
@@ -113,13 +112,13 @@ async function apply(snapshotPath, options) {
                             }
                         }
                     }
-                    else if (((_f = diff[0]) === null || _f === void 0 ? void 0 : _f.kind) === types_1.DiffKind.DELETE) {
+                    else if (diff[0]?.kind === types_1.DiffKind.DELETE) {
                         message += `\n  - ${chalk_1.default.red('Delete')} ${collection}.${field}`;
                     }
-                    else if (((_g = diff[0]) === null || _g === void 0 ? void 0 : _g.kind) === types_1.DiffKind.NEW) {
+                    else if (diff[0]?.kind === types_1.DiffKind.NEW) {
                         message += `\n  - ${chalk_1.default.green('Create')} ${collection}.${field}`;
                     }
-                    else if (((_h = diff[0]) === null || _h === void 0 ? void 0 : _h.kind) === types_1.DiffKind.ARRAY) {
+                    else if (diff[0]?.kind === types_1.DiffKind.ARRAY) {
                         message += `\n  - ${chalk_1.default.blue('Update')} ${collection}.${field}`;
                     }
                 }
@@ -127,7 +126,7 @@ async function apply(snapshotPath, options) {
             if (snapshotDiff.relations.length > 0) {
                 message += '\n\n' + chalk_1.default.black.underline.bold('Relations:');
                 for (const { collection, field, related_collection, diff } of snapshotDiff.relations) {
-                    if (((_j = diff[0]) === null || _j === void 0 ? void 0 : _j.kind) === types_1.DiffKind.EDIT) {
+                    if (diff[0]?.kind === types_1.DiffKind.EDIT) {
                         message += `\n  - ${chalk_1.default.blue('Update')} ${collection}.${field}`;
                         for (const change of diff) {
                             if (change.kind === types_1.DiffKind.EDIT) {
@@ -136,13 +135,13 @@ async function apply(snapshotPath, options) {
                             }
                         }
                     }
-                    else if (((_k = diff[0]) === null || _k === void 0 ? void 0 : _k.kind) === types_1.DiffKind.DELETE) {
+                    else if (diff[0]?.kind === types_1.DiffKind.DELETE) {
                         message += `\n  - ${chalk_1.default.red('Delete')} ${collection}.${field}`;
                     }
-                    else if (((_l = diff[0]) === null || _l === void 0 ? void 0 : _l.kind) === types_1.DiffKind.NEW) {
+                    else if (diff[0]?.kind === types_1.DiffKind.NEW) {
                         message += `\n  - ${chalk_1.default.green('Create')} ${collection}.${field}`;
                     }
-                    else if (((_m = diff[0]) === null || _m === void 0 ? void 0 : _m.kind) === types_1.DiffKind.ARRAY) {
+                    else if (diff[0]?.kind === types_1.DiffKind.ARRAY) {
                         message += `\n  - ${chalk_1.default.blue('Update')} ${collection}.${field}`;
                     }
                     else {

package/dist/cli/commands/schema/snapshot.js

@@ -16,7 +16,7 @@ async function snapshot(snapshotPath, options) {
     try {
         const snapshot = await (0, get_snapshot_1.getSnapshot)({ database });
         let snapshotString;
-        if ((options === null || options === void 0 ? void 0 : options.format) === 'yaml') {
+        if (options?.format === 'yaml') {
             snapshotString = (0, js_yaml_1.dump)(snapshot);
         }
         else {
@@ -32,7 +32,7 @@ async function snapshot(snapshotPath, options) {
             catch {
                 snapshotExists = false;
             }
-            if (snapshotExists && (options === null || options === void 0 ? void 0 : options.yes) === false) {
+            if (snapshotExists && options?.yes === false) {
                 const { overwrite } = await inquirer_1.default.prompt([
                     {
                         type: 'confirm',

package/dist/cli/utils/create-db-connection.d.ts

@@ -1,5 +1,5 @@
 import { Knex } from 'knex';
-import { Driver } from '../../types';
+import type { Driver } from '../../types';
 export type Credentials = {
     filename?: string;
     host?: string;

package/dist/cli/utils/create-db-connection.js

@@ -25,11 +25,12 @@ function createDBConnection(client, credentials) {
         };
         if (client === 'pg' || client === 'cockroachdb') {
             const { ssl } = credentials;
-            connection['ssl'] = ssl;
+            connection.ssl = ssl;
         }
         if (client === 'mssql') {
             const { options__encrypt } = credentials;
-            connection['options'] = {
+            connection = {
+                ...connection,
                 encrypt: options__encrypt,
             };
         }

package/dist/cli/utils/create-env/index.d.ts

@@ -1,3 +1,3 @@
-import { Credentials } from '../create-db-connection';
-import { drivers } from '../drivers';
+import type { Credentials } from '../create-db-connection';
+import type { drivers } from '../drivers';
 export default function createEnv(client: keyof typeof drivers, credentials: Credentials, directory: string): Promise<void>;

package/dist/cli/utils/create-env/index.js

@@ -27,7 +27,7 @@ async function createEnv(client, credentials, directory) {
         },
     };
     for (const [key, value] of Object.entries(credentials)) {
-        config.database[`DB_${key.toUpperCase()}`] = value;
+        config['database'][`DB_${key.toUpperCase()}`] = value;
     }
     const configAsStrings = {};
     for (const [key, value] of Object.entries(config)) {

package/dist/cli/utils/drivers.d.ts

@@ -1,3 +1,3 @@
-import { Driver } from '../../types';
+import type { Driver } from '../../types';
 export declare const drivers: Record<Driver, string>;
 export declare function getDriverForClient(client: string): Driver | null;

package/dist/constants.d.ts

@@ -1,5 +1,5 @@
-import { CookieOptions } from 'express';
-import { TransformationParams } from './types';
+import type { CookieOptions } from 'express';
+import type { TransformationParams } from './types';
 export declare const SYSTEM_ASSET_ALLOW_LIST: TransformationParams[];
 export declare const ASSET_TRANSFORM_QUERY_KEYS: string[];
 export declare const FILTER_VARIABLES: string[];
@@ -10,3 +10,4 @@ export declare const GENERATE_SPECIAL: string[];
 export declare const UUID_REGEX = "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}";
 export declare const COOKIE_OPTIONS: CookieOptions;
 export declare const OAS_REQUIRED_SCHEMAS: string[];
+export declare const REDACT_TEXT = "--redact--";

package/dist/constants.js

@@ -2,9 +2,8 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OAS_REQUIRED_SCHEMAS = exports.COOKIE_OPTIONS = exports.UUID_REGEX = exports.GENERATE_SPECIAL = exports.COLUMN_TRANSFORMS = exports.DEFAULT_AUTH_PROVIDER = exports.ALIAS_TYPES = exports.FILTER_VARIABLES = exports.ASSET_TRANSFORM_QUERY_KEYS = exports.SYSTEM_ASSET_ALLOW_LIST = void 0;
+exports.REDACT_TEXT = exports.OAS_REQUIRED_SCHEMAS = exports.COOKIE_OPTIONS = exports.UUID_REGEX = exports.GENERATE_SPECIAL = exports.COLUMN_TRANSFORMS = exports.DEFAULT_AUTH_PROVIDER = exports.ALIAS_TYPES = exports.FILTER_VARIABLES = exports.ASSET_TRANSFORM_QUERY_KEYS = exports.SYSTEM_ASSET_ALLOW_LIST = void 0;
 const env_1 = __importDefault(require("./env"));
 const get_milliseconds_1 = require("./utils/get-milliseconds");
 exports.SYSTEM_ASSET_ALLOW_LIST = [
@@ -51,9 +50,10 @@ exports.GENERATE_SPECIAL = ['uuid', 'date-created', 'role-created', 'user-create
 exports.UUID_REGEX = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}';
 exports.COOKIE_OPTIONS = {
     httpOnly: true,
-    domain: env_1.default.REFRESH_TOKEN_COOKIE_DOMAIN,
-    maxAge: (0, get_milliseconds_1.getMilliseconds)(env_1.default.REFRESH_TOKEN_TTL),
-    secure: (_a = env_1.default.REFRESH_TOKEN_COOKIE_SECURE) !== null && _a !== void 0 ? _a : false,
-    sameSite: env_1.default.REFRESH_TOKEN_COOKIE_SAME_SITE || 'strict',
+    domain: env_1.default['REFRESH_TOKEN_COOKIE_DOMAIN'],
+    maxAge: (0, get_milliseconds_1.getMilliseconds)(env_1.default['REFRESH_TOKEN_TTL']),
+    secure: env_1.default['REFRESH_TOKEN_COOKIE_SECURE'] ?? false,
+    sameSite: env_1.default['REFRESH_TOKEN_COOKIE_SAME_SITE'] || 'strict',
 };
-exports.OAS_REQUIRED_SCHEMAS = ['Query', 'x-metadata'];
+exports.OAS_REQUIRED_SCHEMAS = ['Diff', 'Schema', 'Query', 'x-metadata'];
+exports.REDACT_TEXT = '--redact--';

package/dist/controllers/activity.js

@@ -35,7 +35,7 @@ const readHandler = (0, async_handler_1.default)(async (req, res, next) => {
         result = await service.readByQuery(req.sanitizedQuery);
     }
     const meta = await metaService.getMetaForQuery('directus_activity', req.sanitizedQuery);
-    res.locals.payload = {
+    res.locals['payload'] = {
         data: result,
         meta,
     };
@@ -48,8 +48,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 = {
+    const record = await service.readOne(req.params['pk'], req.sanitizedQuery);
+    res.locals['payload'] = {
         data: record || null,
     };
     return next();
@@ -60,7 +60,6 @@ const createCommentSchema = joi_1.default.object({
     item: [joi_1.default.number().required(), joi_1.default.string().required()],
 });
 router.post('/comment', (0, async_handler_1.default)(async (req, res, next) => {
-    var _a;
     const service = new services_1.ActivityService({
         accountability: req.accountability,
         schema: req.schema,
@@ -72,14 +71,14 @@ router.post('/comment', (0, async_handler_1.default)(async (req, res, next) => {
     const primaryKey = await service.createOne({
         ...req.body,
         action: types_1.Action.COMMENT,
-        user: (_a = req.accountability) === null || _a === void 0 ? void 0 : _a.user,
+        user: req.accountability?.user,
         ip: (0, get_ip_from_req_1.getIPFromReq)(req),
         user_agent: req.get('user-agent'),
         origin: req.get('origin'),
     });
     try {
         const record = await service.readOne(primaryKey, req.sanitizedQuery);
-        res.locals.payload = {
+        res.locals['payload'] = {
             data: record || null,
         };
     }
@@ -103,10 +102,10 @@ router.patch('/comment/:pk', (0, async_handler_1.default)(async (req, res, next)
     if (error) {
         throw new exceptions_1.InvalidPayloadException(error.message);
     }
-    const primaryKey = await service.updateOne(req.params.pk, req.body);
+    const primaryKey = await service.updateOne(req.params['pk'], req.body);
     try {
         const record = await service.readOne(primaryKey, req.sanitizedQuery);
-        res.locals.payload = {
+        res.locals['payload'] = {
             data: record || null,
         };
     }
@@ -126,11 +125,11 @@ router.delete('/comment/:pk', (0, async_handler_1.default)(async (req, res, next
     const adminService = new services_1.ActivityService({
         schema: req.schema,
     });
-    const item = await adminService.readOne(req.params.pk, { fields: ['action'] });
-    if (!item || item.action !== 'comment') {
+    const item = await adminService.readOne(req.params['pk'], { fields: ['action'] });
+    if (!item || item['action'] !== 'comment') {
         throw new exceptions_1.ForbiddenException();
     }
-    await service.deleteOne(req.params.pk);
+    await service.deleteOne(req.params['pk']);
     return next();
 }), respond_1.respond);
 exports.default = router;

package/dist/controllers/assets.js

@@ -52,8 +52,8 @@ router.get('/:pk/:filename?',
             throw new exceptions_1.InvalidQueryException(`"transforms" Parameter needs to be a JSON array of allowed transformations.`);
         }
         // Check against ASSETS_TRANSFORM_MAX_OPERATIONS
-        if (transforms.length > Number(env_1.default.ASSETS_TRANSFORM_MAX_OPERATIONS)) {
-            throw new exceptions_1.InvalidQueryException(`"transforms" Parameter is only allowed ${env_1.default.ASSETS_TRANSFORM_MAX_OPERATIONS} transformations.`);
+        if (transforms.length > Number(env_1.default['ASSETS_TRANSFORM_MAX_OPERATIONS'])) {
+            throw new exceptions_1.InvalidQueryException(`"transforms" Parameter is only allowed ${env_1.default['ASSETS_TRANSFORM_MAX_OPERATIONS']} transformations.`);
         }
         // Check the transformations are valid
         transforms.forEach((transform) => {
@@ -62,33 +62,33 @@ router.get('/:pk/:filename?',
                 throw new exceptions_1.InvalidQueryException(`"transforms" Parameter does not allow "${name}" as a transformation.`);
             }
         });
-        transformation.transforms = transforms;
+        transformation['transforms'] = transforms;
     }
-    const systemKeys = constants_1.SYSTEM_ASSET_ALLOW_LIST.map((transformation) => transformation.key);
+    const systemKeys = constants_1.SYSTEM_ASSET_ALLOW_LIST.map((transformation) => transformation['key']);
     const allKeys = [
         ...systemKeys,
-        ...(assetSettings.storage_asset_presets || []).map((transformation) => transformation.key),
+        ...(assetSettings.storage_asset_presets || []).map((transformation) => transformation['key']),
     ];
     // For use in the next request handler
-    res.locals.shortcuts = [...constants_1.SYSTEM_ASSET_ALLOW_LIST, ...(assetSettings.storage_asset_presets || [])];
-    res.locals.transformation = transformation;
+    res.locals['shortcuts'] = [...constants_1.SYSTEM_ASSET_ALLOW_LIST, ...(assetSettings.storage_asset_presets || [])];
+    res.locals['transformation'] = transformation;
     if (Object.keys(transformation).length === 0 ||
-        ('transforms' in transformation && transformation.transforms.length === 0)) {
+        ('transforms' in transformation && transformation['transforms'].length === 0)) {
         return next();
     }
     if (assetSettings.storage_asset_transform === 'all') {
-        if (transformation.key && allKeys.includes(transformation.key) === false) {
-            throw new exceptions_1.InvalidQueryException(`Key "${transformation.key}" isn't configured.`);
+        if (transformation['key'] && allKeys.includes(transformation['key']) === false) {
+            throw new exceptions_1.InvalidQueryException(`Key "${transformation['key']}" isn't configured.`);
         }
         return next();
     }
     else if (assetSettings.storage_asset_transform === 'presets') {
-        if (allKeys.includes(transformation.key))
+        if (allKeys.includes(transformation['key']))
             return next();
         throw new exceptions_1.InvalidQueryException(`Only configured presets can be used in asset generation.`);
     }
     else {
-        if (transformation.key && systemKeys.includes(transformation.key))
+        if (transformation['key'] && systemKeys.includes(transformation['key']))
             return next();
         throw new exceptions_1.InvalidQueryException(`Dynamic asset generation has been disabled for this project.`);
     }
@@ -103,31 +103,36 @@ router.get('/:pk/:filename?',
 }), 
 // Return file
 (0, async_handler_1.default)(async (req, res) => {
-    var _a, _b;
-    const id = (_a = req.params.pk) === null || _a === void 0 ? void 0 : _a.substring(0, 36);
+    const id = req.params['pk']?.substring(0, 36);
     const service = new services_1.AssetsService({
         accountability: req.accountability,
         schema: req.schema,
     });
-    const transformation = res.locals.transformation.key
-        ? res.locals.shortcuts.find((transformation) => transformation.key === res.locals.transformation.key)
-        : res.locals.transformation;
+    const transformation = res.locals['transformation'].key
+        ? res.locals['shortcuts'].find((transformation) => transformation['key'] === res.locals['transformation'].key)
+        : res.locals['transformation'];
     let range = undefined;
     if (req.headers.range) {
         const rangeParts = /bytes=([0-9]*)-([0-9]*)/.exec(req.headers.range);
-        range = {
-            start: (rangeParts === null || rangeParts === void 0 ? void 0 : rangeParts[1]) ? Number(rangeParts[1]) : undefined,
-            end: (rangeParts === null || rangeParts === void 0 ? void 0 : rangeParts[2]) ? Number(rangeParts[2]) : undefined,
-        };
-        if (Number.isNaN(range.start) || Number.isNaN(range.end)) {
-            throw new exceptions_1.RangeNotSatisfiableException(range);
+        if (rangeParts && rangeParts.length > 1) {
+            range = {};
+            if (rangeParts[1]) {
+                range.start = Number(rangeParts[1]);
+                if (Number.isNaN(range.start))
+                    throw new exceptions_1.RangeNotSatisfiableException(range);
+            }
+            if (rangeParts[2]) {
+                range.end = Number(rangeParts[2]);
+                if (Number.isNaN(range.end))
+                    throw new exceptions_1.RangeNotSatisfiableException(range);
+            }
         }
     }
     const { stream, file, stat } = await service.getAsset(id, transformation, range);
-    res.attachment((_b = req.params.filename) !== null && _b !== void 0 ? _b : file.filename_download);
+    res.attachment(req.params['filename'] ?? file.filename_download);
     res.setHeader('Content-Type', file.type);
     res.setHeader('Accept-Ranges', 'bytes');
-    res.setHeader('Cache-Control', (0, get_cache_headers_1.getCacheControlHeader)(req, (0, get_milliseconds_1.getMilliseconds)(env_1.default.ASSETS_CACHE_TTL), false, true));
+    res.setHeader('Cache-Control', (0, get_cache_headers_1.getCacheControlHeader)(req, (0, get_milliseconds_1.getMilliseconds)(env_1.default['ASSETS_CACHE_TTL']), false, true));
     const unixTime = Date.parse(file.modified_on);
     if (!Number.isNaN(unixTime)) {
         const lastModifiedDate = new Date(unixTime);
@@ -176,5 +181,6 @@ router.get('/:pk/:filename?',
             });
         }
     });
+    return undefined;
 }));
 exports.default = router;