directus 9.21.0 → 9.21.2

package/dist/auth/drivers/openid.js

@@ -99,6 +99,7 @@ class OpenIDAuthDriver extends local_1.LocalAuthDriver {
                 code_challenge_method: 'S256',
                 // Some providers require state even with PKCE
                 state: codeChallenge,
+                nonce: codeChallenge,
             });
         }
         catch (e) {
@@ -122,7 +123,8 @@ class OpenIDAuthDriver extends local_1.LocalAuthDriver {
         let userInfo;
         try {
             const client = await this.client;
-            tokenSet = await client.callback(this.redirectUrl, { code: payload.code, state: payload.state }, { code_verifier: payload.codeVerifier, state: openid_client_1.generators.codeChallenge(payload.codeVerifier) });
+            const codeChallenge = openid_client_1.generators.codeChallenge(payload.codeVerifier);
+            tokenSet = await client.callback(this.redirectUrl, { code: payload.code, state: payload.state }, { code_verifier: payload.codeVerifier, state: codeChallenge, nonce: codeChallenge });
             userInfo = tokenSet.claims();
             if (client.issuer.metadata.userinfo_endpoint) {
                 userInfo = {

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

@@ -33,7 +33,6 @@ const fs_1 = require("fs");
 const inquirer_1 = __importDefault(require("inquirer"));
 const js_yaml_1 = require("js-yaml");
 const path_1 = __importDefault(require("path"));
-const cache_1 = require("../../../cache");
 const database_1 = __importStar(require("../../../database"));
 const logger_1 = __importDefault(require("../../../logger"));
 const apply_snapshot_1 = require("../../../utils/apply-snapshot");
@@ -44,7 +43,6 @@ async function apply(snapshotPath, options) {
     const filename = path_1.default.resolve(process.cwd(), snapshotPath);
     const database = (0, database_1.default)();
     await (0, database_1.validateDatabaseConnection)(database);
-    await (0, cache_1.flushCaches)();
     if ((await (0, database_1.isInstalled)()) === false) {
         logger_1.default.error(`Directus isn't installed on this database. Please run "directus bootstrap" first.`);
         database.destroy();

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

@@ -11,9 +11,7 @@ const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
 const inquirer_1 = __importDefault(require("inquirer"));
 const js_yaml_1 = require("js-yaml");
-const cache_1 = require("../../../cache");
 async function snapshot(snapshotPath, options) {
-    await (0, cache_1.flushCaches)();
     const database = (0, database_1.default)();
     try {
         const snapshot = await (0, get_snapshot_1.getSnapshot)({ database });

package/dist/database/helpers/fn/dialects/mysql.js

@@ -4,7 +4,7 @@ exports.FnHelperMySQL = void 0;
 const types_1 = require("../types");
 const parseLocaltime = (columnType) => {
     if (columnType === 'timestamp') {
-        return `CONVERT_TZ(??.??, @@GLOBAL.time_zone, 'UTC')`;
+        return `CONVERT_TZ(??.??, @@GLOBAL.time_zone, '+00:00')`;
     }
     return '??.??';
 };

package/dist/middleware/schema.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const async_handler_1 = __importDefault(require("../utils/async-handler"));
 const get_schema_1 = require("../utils/get-schema");
 const schema = (0, async_handler_1.default)(async (req, res, next) => {
-    req.schema = await (0, get_schema_1.getSchema)({ accountability: req.accountability });
+    req.schema = await (0, get_schema_1.getSchema)();
     return next();
 });
 exports.default = schema;

package/dist/services/collections.js

@@ -157,7 +157,7 @@ class CollectionsService {
                 await (0, cache_1.clearSystemCache)();
             }
             if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false && nestedActionEvents.length > 0) {
-                const updatedSchema = await (0, get_schema_1.getSchema)({ accountability: this.accountability || undefined });
+                const updatedSchema = await (0, get_schema_1.getSchema)();
                 for (const nestedActionEvent of nestedActionEvents) {
                     nestedActionEvent.context.schema = updatedSchema;
                     emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
@@ -198,7 +198,7 @@ class CollectionsService {
                 await (0, cache_1.clearSystemCache)();
             }
             if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false && nestedActionEvents.length > 0) {
-                const updatedSchema = await (0, get_schema_1.getSchema)({ accountability: this.accountability || undefined });
+                const updatedSchema = await (0, get_schema_1.getSchema)();
                 for (const nestedActionEvent of nestedActionEvents) {
                     nestedActionEvent.context.schema = updatedSchema;
                     emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
@@ -343,7 +343,7 @@ class CollectionsService {
                 await (0, cache_1.clearSystemCache)();
             }
             if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false && nestedActionEvents.length > 0) {
-                const updatedSchema = await (0, get_schema_1.getSchema)({ accountability: this.accountability || undefined });
+                const updatedSchema = await (0, get_schema_1.getSchema)();
                 for (const nestedActionEvent of nestedActionEvents) {
                     nestedActionEvent.context.schema = updatedSchema;
                     emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
@@ -391,7 +391,7 @@ class CollectionsService {
                 await (0, cache_1.clearSystemCache)();
             }
             if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false && nestedActionEvents.length > 0) {
-                const updatedSchema = await (0, get_schema_1.getSchema)({ accountability: this.accountability || undefined });
+                const updatedSchema = await (0, get_schema_1.getSchema)();
                 for (const nestedActionEvent of nestedActionEvents) {
                     nestedActionEvent.context.schema = updatedSchema;
                     emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
@@ -433,7 +433,7 @@ class CollectionsService {
                 await (0, cache_1.clearSystemCache)();
             }
             if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false && nestedActionEvents.length > 0) {
-                const updatedSchema = await (0, get_schema_1.getSchema)({ accountability: this.accountability || undefined });
+                const updatedSchema = await (0, get_schema_1.getSchema)();
                 for (const nestedActionEvent of nestedActionEvents) {
                     nestedActionEvent.context.schema = updatedSchema;
                     emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
@@ -538,7 +538,7 @@ class CollectionsService {
                 await (0, cache_1.clearSystemCache)();
             }
             if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false && nestedActionEvents.length > 0) {
-                const updatedSchema = await (0, get_schema_1.getSchema)({ accountability: this.accountability || undefined });
+                const updatedSchema = await (0, get_schema_1.getSchema)();
                 for (const nestedActionEvent of nestedActionEvents) {
                     nestedActionEvent.context.schema = updatedSchema;
                     emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
@@ -579,7 +579,7 @@ class CollectionsService {
                 await (0, cache_1.clearSystemCache)();
             }
             if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false && nestedActionEvents.length > 0) {
-                const updatedSchema = await (0, get_schema_1.getSchema)({ accountability: this.accountability || undefined });
+                const updatedSchema = await (0, get_schema_1.getSchema)();
                 for (const nestedActionEvent of nestedActionEvents) {
                     nestedActionEvent.context.schema = updatedSchema;
                     emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);

package/dist/services/fields.d.ts

@@ -24,8 +24,9 @@ export declare class FieldsService {
     createField(collection: string, field: Partial<Field> & {
         field: string;
         type: Type | null;
-    }, table?: Knex.CreateTableBuilder): Promise<void>;
-    updateField(collection: string, field: RawField): Promise<string>;
+    }, table?: Knex.CreateTableBuilder, // allows collection creation to
+    opts?: MutationOptions): Promise<void>;
+    updateField(collection: string, field: RawField, opts?: MutationOptions): Promise<string>;
     deleteField(collection: string, field: string, opts?: MutationOptions): Promise<void>;
     addColumnToTable(table: Knex.CreateTableBuilder, field: RawField | Field, alter?: Column | null): void;
 }

package/dist/services/fields.js

@@ -218,8 +218,8 @@ class FieldsService {
         };
         return data;
     }
-    async createField(collection, field, table // allows collection creation to
-    ) {
+    async createField(collection, field, table, // allows collection creation to
+    opts) {
         if (this.accountability && this.accountability.admin !== true) {
             throw new exceptions_1.ForbiddenException();
         }
@@ -267,7 +267,7 @@ class FieldsService {
                         field: hookAdjustedField.field,
                     }, { emitEvents: false });
                 }
-                nestedActionEvents.push({
+                const actionEvent = {
                     event: 'fields.create',
                     meta: {
                         payload: hookAdjustedField,
@@ -279,25 +279,35 @@ class FieldsService {
                         schema: this.schema,
                         accountability: this.accountability,
                     },
-                });
+                };
+                if (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) {
+                    opts.bypassEmitAction(actionEvent);
+                }
+                else {
+                    nestedActionEvents.push(actionEvent);
+                }
             });
         }
         finally {
             if (runPostColumnChange) {
                 await this.helpers.schema.postColumnChange();
             }
-            if (this.cache && env_1.default.CACHE_AUTO_PURGE) {
+            if (this.cache && env_1.default.CACHE_AUTO_PURGE && (opts === null || opts === void 0 ? void 0 : opts.autoPurgeCache) !== false) {
                 await this.cache.clear();
             }
-            await (0, cache_1.clearSystemCache)();
-            const updatedSchema = await (0, get_schema_1.getSchema)({ accountability: this.accountability || undefined });
-            for (const nestedActionEvent of nestedActionEvents) {
-                nestedActionEvent.context.schema = updatedSchema;
-                emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+            if ((opts === null || opts === void 0 ? void 0 : opts.autoPurgeSystemCache) !== false) {
+                await (0, cache_1.clearSystemCache)();
+            }
+            if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false && nestedActionEvents.length > 0) {
+                const updatedSchema = await (0, get_schema_1.getSchema)();
+                for (const nestedActionEvent of nestedActionEvents) {
+                    nestedActionEvent.context.schema = updatedSchema;
+                    emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+                }
             }
         }
     }
-    async updateField(collection, field) {
+    async updateField(collection, field, opts) {
         var _a, _b, _c;
         if (this.accountability && this.accountability.admin !== true) {
             throw new exceptions_1.ForbiddenException();
@@ -353,7 +363,7 @@ class FieldsService {
                     }, { emitEvents: false });
                 }
             }
-            nestedActionEvents.push({
+            const actionEvent = {
                 event: 'fields.update',
                 meta: {
                     payload: hookAdjustedField,
@@ -365,21 +375,31 @@ class FieldsService {
                     schema: this.schema,
                     accountability: this.accountability,
                 },
-            });
+            };
+            if (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) {
+                opts.bypassEmitAction(actionEvent);
+            }
+            else {
+                nestedActionEvents.push(actionEvent);
+            }
             return field.field;
         }
         finally {
             if (runPostColumnChange) {
                 await this.helpers.schema.postColumnChange();
             }
-            if (this.cache && env_1.default.CACHE_AUTO_PURGE) {
+            if (this.cache && env_1.default.CACHE_AUTO_PURGE && (opts === null || opts === void 0 ? void 0 : opts.autoPurgeCache) !== false) {
                 await this.cache.clear();
             }
-            await (0, cache_1.clearSystemCache)();
-            const updatedSchema = await (0, get_schema_1.getSchema)({ accountability: this.accountability || undefined });
-            for (const nestedActionEvent of nestedActionEvents) {
-                nestedActionEvent.context.schema = updatedSchema;
-                emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+            if ((opts === null || opts === void 0 ? void 0 : opts.autoPurgeSystemCache) !== false) {
+                await (0, cache_1.clearSystemCache)();
+            }
+            if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false && nestedActionEvents.length > 0) {
+                const updatedSchema = await (0, get_schema_1.getSchema)();
+                for (const nestedActionEvent of nestedActionEvents) {
+                    nestedActionEvent.context.schema = updatedSchema;
+                    emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+                }
             }
         }
     }
@@ -507,7 +527,7 @@ class FieldsService {
                 await (0, cache_1.clearSystemCache)();
             }
             if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false && nestedActionEvents.length > 0) {
-                const updatedSchema = await (0, get_schema_1.getSchema)({ accountability: this.accountability || undefined });
+                const updatedSchema = await (0, get_schema_1.getSchema)();
                 for (const nestedActionEvent of nestedActionEvents) {
                     nestedActionEvent.context.schema = updatedSchema;
                     emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);

package/dist/services/relations.d.ts

@@ -21,13 +21,13 @@ export declare class RelationsService {
     /**
      * Create a new relationship / foreign key constraint
      */
-    createOne(relation: Partial<Relation>): Promise<void>;
+    createOne(relation: Partial<Relation>, opts?: MutationOptions): Promise<void>;
     /**
      * Update an existing foreign key constraint
      *
      * Note: You can update anything under meta, but only the `on_delete` trigger under schema
      */
-    updateOne(collection: string, field: string, relation: Partial<Relation>): Promise<void>;
+    updateOne(collection: string, field: string, relation: Partial<Relation>, opts?: MutationOptions): Promise<void>;
     /**
      * Delete an existing relationship
      */

package/dist/services/relations.js

@@ -127,7 +127,7 @@ class RelationsService {
     /**
      * Create a new relationship / foreign key constraint
      */
-    async createOne(relation) {
+    async createOne(relation, opts) {
         if (this.accountability && this.accountability.admin !== true) {
             throw new exceptions_1.ForbiddenException();
         }
@@ -185,7 +185,7 @@ class RelationsService {
                     // happens in `filterForbidden` down below
                 });
                 await relationsItemService.createOne(metaRow, {
-                    bypassEmitAction: (params) => nestedActionEvents.push(params),
+                    bypassEmitAction: (params) => (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
                 });
             });
         }
@@ -193,11 +193,15 @@ class RelationsService {
             if (runPostColumnChange) {
                 await this.helpers.schema.postColumnChange();
             }
-            await (0, cache_1.clearSystemCache)();
-            const updatedSchema = await (0, get_schema_1.getSchema)({ accountability: this.accountability || undefined });
-            for (const nestedActionEvent of nestedActionEvents) {
-                nestedActionEvent.context.schema = updatedSchema;
-                emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+            if ((opts === null || opts === void 0 ? void 0 : opts.autoPurgeSystemCache) !== false) {
+                await (0, cache_1.clearSystemCache)();
+            }
+            if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false && nestedActionEvents.length > 0) {
+                const updatedSchema = await (0, get_schema_1.getSchema)();
+                for (const nestedActionEvent of nestedActionEvents) {
+                    nestedActionEvent.context.schema = updatedSchema;
+                    emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+                }
             }
         }
     }
@@ -206,7 +210,7 @@ class RelationsService {
      *
      * Note: You can update anything under meta, but only the `on_delete` trigger under schema
      */
-    async updateOne(collection, field, relation) {
+    async updateOne(collection, field, relation, opts) {
         if (this.accountability && this.accountability.admin !== true) {
             throw new exceptions_1.ForbiddenException();
         }
@@ -254,7 +258,7 @@ class RelationsService {
                 if (relation.meta) {
                     if (existingRelation === null || existingRelation === void 0 ? void 0 : existingRelation.meta) {
                         await relationsItemService.updateOne(existingRelation.meta.id, relation.meta, {
-                            bypassEmitAction: (params) => nestedActionEvents.push(params),
+                            bypassEmitAction: (params) => (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
                         });
                     }
                     else {
@@ -264,7 +268,7 @@ class RelationsService {
                             many_field: relation.field,
                             one_collection: existingRelation.related_collection || null,
                         }, {
-                            bypassEmitAction: (params) => nestedActionEvents.push(params),
+                            bypassEmitAction: (params) => (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
                         });
                     }
                 }
@@ -274,11 +278,15 @@ class RelationsService {
             if (runPostColumnChange) {
                 await this.helpers.schema.postColumnChange();
             }
-            await (0, cache_1.clearSystemCache)();
-            const updatedSchema = await (0, get_schema_1.getSchema)({ accountability: this.accountability || undefined });
-            for (const nestedActionEvent of nestedActionEvents) {
-                nestedActionEvent.context.schema = updatedSchema;
-                emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+            if ((opts === null || opts === void 0 ? void 0 : opts.autoPurgeSystemCache) !== false) {
+                await (0, cache_1.clearSystemCache)();
+            }
+            if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false && nestedActionEvents.length > 0) {
+                const updatedSchema = await (0, get_schema_1.getSchema)();
+                for (const nestedActionEvent of nestedActionEvents) {
+                    nestedActionEvent.context.schema = updatedSchema;
+                    emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+                }
             }
         }
     }
@@ -343,7 +351,7 @@ class RelationsService {
                 await (0, cache_1.clearSystemCache)();
             }
             if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false && nestedActionEvents.length > 0) {
-                const updatedSchema = await (0, get_schema_1.getSchema)({ accountability: this.accountability || undefined });
+                const updatedSchema = await (0, get_schema_1.getSchema)();
                 for (const nestedActionEvent of nestedActionEvents) {
                     nestedActionEvent.context.schema = updatedSchema;
                     emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);

package/dist/services/users.js

@@ -202,11 +202,17 @@ class UsersService extends items_1.ItemsService {
         if (data.tfa_secret !== undefined) {
             throw new exceptions_2.InvalidPayloadException(`You can't change the "tfa_secret" value manually.`);
         }
-        if (data.provider !== undefined && this.accountability && this.accountability.admin !== true) {
-            throw new exceptions_2.InvalidPayloadException(`You can't change the "provider" value manually.`);
+        if (data.provider !== undefined) {
+            if (this.accountability && this.accountability.admin !== true) {
+                throw new exceptions_2.InvalidPayloadException(`You can't change the "provider" value manually.`);
+            }
+            data.auth_data = null;
         }
-        if (data.external_identifier !== undefined && this.accountability && this.accountability.admin !== true) {
-            throw new exceptions_2.InvalidPayloadException(`You can't change the "external_identifier" value manually.`);
+        if (data.external_identifier !== undefined) {
+            if (this.accountability && this.accountability.admin !== true) {
+                throw new exceptions_2.InvalidPayloadException(`You can't change the "external_identifier" value manually.`);
+            }
+            data.auth_data = null;
         }
         return await super.updateMany(keys, data, opts);
     }

package/dist/utils/apply-snapshot.js

@@ -12,13 +12,19 @@ const get_schema_1 = require("./get-schema");
 const get_snapshot_1 = require("./get-snapshot");
 const get_snapshot_diff_1 = require("./get-snapshot-diff");
 const cache_1 = require("../cache");
+const emitter_1 = __importDefault(require("../emitter"));
 async function applySnapshot(snapshot, options) {
     var _a, _b, _c, _d;
     const database = (_a = options === null || options === void 0 ? void 0 : options.database) !== null && _a !== void 0 ? _a : (0, database_1.default)();
-    const schema = (_b = options === null || options === void 0 ? void 0 : options.schema) !== null && _b !== void 0 ? _b : (await (0, get_schema_1.getSchema)({ database }));
+    const schema = (_b = options === null || options === void 0 ? void 0 : options.schema) !== null && _b !== void 0 ? _b : (await (0, get_schema_1.getSchema)({ database, bypassCache: true }));
     const { systemCache } = (0, cache_1.getCache)();
     const current = (_c = options === null || options === void 0 ? void 0 : options.current) !== null && _c !== void 0 ? _c : (await (0, get_snapshot_1.getSnapshot)({ database, schema }));
     const snapshotDiff = (_d = options === null || options === void 0 ? void 0 : options.diff) !== null && _d !== void 0 ? _d : (0, get_snapshot_diff_1.getSnapshotDiff)(current, snapshot);
+    const nestedActionEvents = [];
+    const mutationOptions = {
+        autoPurgeSystemCache: false,
+        bypassEmitAction: (params) => nestedActionEvents.push(params),
+    };
     await database.transaction(async (trx) => {
         const collectionsService = new services_1.CollectionsService({ knex: trx, schema });
         const getNestedCollectionsToCreate = (currentLevelCollection) => snapshotDiff.collections.filter(({ diff }) => { var _a, _b; return ((_b = (_a = diff[0].rhs) === null || _a === void 0 ? void 0 : _a.meta) === null || _b === void 0 ? void 0 : _b.group) === currentLevelCollection; });
@@ -49,7 +55,7 @@ async function applySnapshot(snapshot, options) {
                         await collectionsService.createOne({
                             ...diff[0].rhs,
                             fields,
-                        });
+                        }, mutationOptions);
                     }
                     catch (err) {
                         logger_1.default.error(`Failed to create collection "${collection}"`);
@@ -69,7 +75,7 @@ async function applySnapshot(snapshot, options) {
                         const relationsService = new services_1.RelationsService({ knex: trx, schema });
                         for (const relation of relations) {
                             try {
-                                await relationsService.deleteOne(relation.collection, relation.field);
+                                await relationsService.deleteOne(relation.collection, relation.field, mutationOptions);
                             }
                             catch (err) {
                                 logger_1.default.error(`Failed to delete collection "${collection}" due to relation "${relation.collection}.${relation.field}"`);
@@ -81,7 +87,7 @@ async function applySnapshot(snapshot, options) {
                     }
                     await deleteCollections(getNestedCollectionsToDelete(collection));
                     try {
-                        await collectionsService.deleteOne(collection);
+                        await collectionsService.deleteOne(collection, mutationOptions);
                     }
                     catch (err) {
                         logger_1.default.error(`Failed to delete collection "${collection}"`);
@@ -130,7 +136,7 @@ async function applySnapshot(snapshot, options) {
                 });
                 if (newValues) {
                     try {
-                        await collectionsService.updateOne(collection, newValues);
+                        await collectionsService.updateOne(collection, newValues, mutationOptions);
                     }
                     catch (err) {
                         logger_1.default.error(`Failed to update collection "${collection}"`);
@@ -139,11 +145,14 @@ async function applySnapshot(snapshot, options) {
                 }
             }
         }
-        const fieldsService = new services_1.FieldsService({ knex: trx, schema: await (0, get_schema_1.getSchema)({ database: trx }) });
+        const fieldsService = new services_1.FieldsService({
+            knex: trx,
+            schema: await (0, get_schema_1.getSchema)({ database: trx, bypassCache: true }),
+        });
         for (const { collection, field, diff } of snapshotDiff.fields) {
             if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === 'N' && !isNestedMetaUpdate(diff === null || diff === void 0 ? void 0 : diff[0])) {
                 try {
-                    await fieldsService.createField(collection, diff[0].rhs);
+                    await fieldsService.createField(collection, diff[0].rhs, undefined, mutationOptions);
                 }
                 catch (err) {
                     logger_1.default.error(`Failed to create field "${collection}.${field}"`);
@@ -158,7 +167,7 @@ async function applySnapshot(snapshot, options) {
                     try {
                         await fieldsService.updateField(collection, {
                             ...newValues,
-                        });
+                        }, mutationOptions);
                     }
                     catch (err) {
                         logger_1.default.error(`Failed to update field "${collection}.${field}"`);
@@ -168,7 +177,7 @@ async function applySnapshot(snapshot, options) {
             }
             if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === 'D' && !isNestedMetaUpdate(diff === null || diff === void 0 ? void 0 : diff[0])) {
                 try {
-                    await fieldsService.deleteField(collection, field);
+                    await fieldsService.deleteField(collection, field, mutationOptions);
                 }
                 catch (err) {
                     logger_1.default.error(`Failed to delete field "${collection}.${field}"`);
@@ -179,7 +188,10 @@ async function applySnapshot(snapshot, options) {
                 snapshotDiff.relations = snapshotDiff.relations.filter((relation) => (relation.collection === collection && relation.field === field) === false);
             }
         }
-        const relationsService = new services_1.RelationsService({ knex: trx, schema: await (0, get_schema_1.getSchema)({ database: trx }) });
+        const relationsService = new services_1.RelationsService({
+            knex: trx,
+            schema: await (0, get_schema_1.getSchema)({ database: trx, bypassCache: true }),
+        });
         for (const { collection, field, diff } of snapshotDiff.relations) {
             const structure = {};
             for (const diffEdit of diff) {
@@ -187,7 +199,7 @@ async function applySnapshot(snapshot, options) {
             }
             if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === 'N') {
                 try {
-                    await relationsService.createOne(diff[0].rhs);
+                    await relationsService.createOne(diff[0].rhs, mutationOptions);
                 }
                 catch (err) {
                     logger_1.default.error(`Failed to create relation "${collection}.${field}"`);
@@ -200,7 +212,7 @@ async function applySnapshot(snapshot, options) {
                 });
                 if (newValues) {
                     try {
-                        await relationsService.updateOne(collection, field, newValues);
+                        await relationsService.updateOne(collection, field, newValues, mutationOptions);
                     }
                     catch (err) {
                         logger_1.default.error(`Failed to update relation "${collection}.${field}"`);
@@ -210,7 +222,7 @@ async function applySnapshot(snapshot, options) {
             }
             if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === 'D') {
                 try {
-                    await relationsService.deleteOne(collection, field);
+                    await relationsService.deleteOne(collection, field, mutationOptions);
                 }
                 catch (err) {
                     logger_1.default.error(`Failed to delete relation "${collection}.${field}"`);
@@ -220,6 +232,13 @@ async function applySnapshot(snapshot, options) {
         }
     });
     await (systemCache === null || systemCache === void 0 ? void 0 : systemCache.clear());
+    if (nestedActionEvents.length > 0) {
+        const updatedSchema = await (0, get_schema_1.getSchema)({ database, bypassCache: true });
+        for (const nestedActionEvent of nestedActionEvents) {
+            nestedActionEvent.context.schema = updatedSchema;
+            emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+        }
+    }
 }
 exports.applySnapshot = applySnapshot;
 function isNestedMetaUpdate(diff) {

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

@@ -1,6 +1,10 @@
-import { Accountability, SchemaOverview } from '@directus/shared/types';
+import { SchemaOverview } from '@directus/shared/types';
 import { Knex } from 'knex';
 export declare function getSchema(options?: {
-    accountability?: Accountability;
     database?: Knex;
+    /**
+     * To bypass any cached schema if bypassCache is enabled.
+     * Used to ensure schema snapshot/apply is not using outdated schema
+     */
+    bypassCache?: boolean;
 }): Promise<SchemaOverview>;

package/dist/utils/get-schema.js

@@ -21,7 +21,7 @@ async function getSchema(options) {
     const database = (options === null || options === void 0 ? void 0 : options.database) || (0, database_1.default)();
     const schemaInspector = (0, schema_1.default)(database);
     let result;
-    if (env_1.default.CACHE_SCHEMA !== false) {
+    if (!(options === null || options === void 0 ? void 0 : options.bypassCache) && env_1.default.CACHE_SCHEMA !== false) {
         let cachedSchema;
         try {
             cachedSchema = (await (0, cache_1.getSystemCache)('schema'));

package/dist/utils/get-snapshot.js

@@ -12,7 +12,7 @@ const lodash_1 = require("lodash");
 async function getSnapshot(options) {
     var _a, _b;
     const database = (_a = options === null || options === void 0 ? void 0 : options.database) !== null && _a !== void 0 ? _a : (0, database_1.default)();
-    const schema = (_b = options === null || options === void 0 ? void 0 : options.schema) !== null && _b !== void 0 ? _b : (await (0, get_schema_1.getSchema)({ database }));
+    const schema = (_b = options === null || options === void 0 ? void 0 : options.schema) !== null && _b !== void 0 ? _b : (await (0, get_schema_1.getSchema)({ database, bypassCache: true }));
     const collectionsService = new services_1.CollectionsService({ knex: database, schema });
     const fieldsService = new services_1.FieldsService({ knex: database, schema });
     const relationsService = new services_1.RelationsService({ knex: database, schema });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "directus",
-  "version": "9.21.0",
+  "version": "9.21.2",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "keywords": [
     "directus",
@@ -66,16 +66,7 @@
   "dependencies": {
     "@authenio/samlify-node-xmllint": "2.0.0",
     "@aws-sdk/client-ses": "3.211.0",
-    "@directus/app": "9.21.0",
-    "@directus/drive": "9.21.0",
-    "@directus/drive-azure": "9.21.0",
-    "@directus/drive-gcs": "9.21.0",
-    "@directus/drive-s3": "9.21.0",
-    "@directus/extensions-sdk": "9.21.0",
     "@directus/format-title": "9.15.0",
-    "@directus/schema": "9.21.0",
-    "@directus/shared": "9.21.0",
-    "@directus/specs": "9.21.0",
     "@godaddy/terminus": "4.11.2",
     "@rollup/plugin-alias": "4.0.2",
     "@rollup/plugin-virtual": "3.0.1",
@@ -94,7 +85,6 @@
     "csv-parser": "3.0.0",
     "date-fns": "2.29.3",
     "deep-diff": "1.0.2",
-    "deep-map": "2.0.0",
     "destroy": "1.2.0",
     "dotenv": "16.0.3",
     "encodeurl": "1.0.2",
@@ -140,7 +130,6 @@
     "pino-http-print": "3.1.0",
     "qs": "6.11.0",
     "rate-limiter-flexible": "2.4.1",
-    "resolve-cwd": "3.0.0",
     "rollup": "3.3.0",
     "samlify": "2.8.7",
     "sanitize-html": "2.7.3",
@@ -153,10 +142,18 @@
     "uuid": "9.0.0",
     "uuid-validate": "0.0.3",
     "vm2": "3.9.11",
-    "wellknown": "0.5.0"
+    "wellknown": "0.5.0",
+    "@directus/app": "9.21.2",
+    "@directus/drive": "9.21.2",
+    "@directus/drive-azure": "9.21.2",
+    "@directus/drive-gcs": "9.21.2",
+    "@directus/drive-s3": "9.21.2",
+    "@directus/extensions-sdk": "9.21.2",
+    "@directus/schema": "9.21.2",
+    "@directus/shared": "9.21.2",
+    "@directus/specs": "9.21.2"
   },
   "devDependencies": {
-    "@otplib/preset-default": "12.0.1",
     "@types/async": "3.2.15",
     "@types/busboy": "1.5.0",
     "@types/bytes": "3.1.1",
@@ -166,9 +163,7 @@
     "@types/destroy": "1.0.0",
     "@types/encodeurl": "1.0.0",
     "@types/express": "4.17.14",
-    "@types/express-pino-logger": "4.0.3",
     "@types/express-serve-static-core": "4.17.31",
-    "@types/express-session": "1.17.5",
     "@types/fast-redact": "3.0.2",
     "@types/flat": "5.0.2",
     "@types/fs-extra": "9.0.13",
@@ -192,7 +187,6 @@
     "@types/sanitize-html": "2.6.2",
     "@types/sharp": "0.31.0",
     "@types/stream-json": "1.7.2",
-    "@types/supertest": "2.0.12",
     "@types/uuid": "8.3.4",
     "@types/uuid-validate": "0.0.1",
     "@types/wellknown": "0.5.4",
@@ -200,8 +194,6 @@
     "copyfiles": "2.4.1",
     "form-data": "4.0.0",
     "knex-mock-client": "1.8.4",
-    "rimraf": "3.0.2",
-    "supertest": "6.3.1",
     "ts-node": "10.9.1",
     "ts-node-dev": "2.0.0",
     "typescript": "4.9.3",
@@ -222,9 +214,7 @@
     "node": ">=12.20.0"
   },
   "scripts": {
-    "prebuild": "pnpm cleanup",
     "build": "tsc --build && copyfiles \"src/**/*.{yaml,liquid}\" -u 1 dist",
-    "cleanup": "rimraf dist",
     "cli": "NODE_ENV=development SERVE_APP=false ts-node --script-mode --transpile-only src/cli/run.ts",
     "dev": "NODE_ENV=development SERVE_APP=false ts-node-dev --files --transpile-only --respawn --watch \".env\" --inspect=0 --exit-child -- src/start.ts",
     "start": "npx directus start",