directus 9.21.0 → 9.22.0

package/dist/services/graphql/index.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GraphQLService = void 0;
 const types_1 = require("@directus/shared/types");
+const utils_1 = require("@directus/shared/utils");
 const argon2_1 = __importDefault(require("argon2"));
 const graphql_1 = require("graphql");
 const graphql_compose_1 = require("graphql-compose");
@@ -13,7 +14,6 @@ const lodash_1 = require("lodash");
 const ms_1 = __importDefault(require("ms"));
 const cache_1 = require("../../cache");
 const constants_1 = require("../../constants");
-const constants_2 = require("@directus/shared/constants");
 const database_1 = __importDefault(require("../../database"));
 const env_1 = __importDefault(require("../../env"));
 const exceptions_1 = require("../../exceptions");
@@ -44,7 +44,7 @@ const shares_1 = require("../shares");
 const specifications_1 = require("../specifications");
 const tfa_1 = require("../tfa");
 const users_1 = require("../users");
-const utils_1 = require("../utils");
+const utils_2 = require("../utils");
 const webhooks_1 = require("../webhooks");
 const date_1 = require("./types/date");
 const geojson_1 = require("./types/geojson");
@@ -53,6 +53,7 @@ const void_1 = require("./types/void");
 const add_path_to_validation_error_1 = require("./utils/add-path-to-validation-error");
 const hash_1 = require("./types/hash");
 const bigint_1 = require("./types/bigint");
+const constants_2 = require("@directus/shared/constants");
 const validationRules = Array.from(graphql_1.specifiedRules);
 if (env_1.default.GRAPHQL_INTROSPECTION === false) {
     validationRules.push(graphql_1.NoSchemaIntrospectionCustomRule);
@@ -1111,14 +1112,7 @@ class GraphQLService {
         // Transform count(a.b.c) into a.b.count(c)
         if ((_c = query.fields) === null || _c === void 0 ? void 0 : _c.length) {
             for (let fieldIndex = 0; fieldIndex < query.fields.length; fieldIndex++) {
-                if (query.fields[fieldIndex].includes('(') && query.fields[fieldIndex].includes(')')) {
-                    const functionName = query.fields[fieldIndex].split('(')[0];
-                    const columnNames = query.fields[fieldIndex].match(constants_2.REGEX_BETWEEN_PARENS)[1].split('.');
-                    if (columnNames.length > 1) {
-                        const column = columnNames.pop();
-                        query.fields[fieldIndex] = columnNames.join('.') + '.' + functionName + '(' + column + ')';
-                    }
-                }
+                query.fields[fieldIndex] = (0, utils_1.parseFilterFunctionPath)(query.fields[fieldIndex]);
             }
         }
         const result = await this.read(collection, query);
@@ -1347,28 +1341,10 @@ class GraphQLService {
             }
             return (0, lodash_1.uniq)(fields);
         };
-        const replaceFuncs = (filter) => {
-            if (!filter)
-                return filter;
-            return replaceFuncDeep(filter);
-            function replaceFuncDeep(filter) {
-                return (0, lodash_1.transform)(filter, (result, value, key) => {
-                    let currentKey = key;
-                    if (typeof key === 'string' && key.endsWith('_func')) {
-                        const functionName = Object.keys(value)[0];
-                        currentKey = `${functionName}(${currentKey.slice(0, -5)})`;
-                        result[currentKey] = Object.values(value)[0];
-                    }
-                    else {
-                        result[currentKey] =
-                            (value === null || value === void 0 ? void 0 : value.constructor) === Object || (value === null || value === void 0 ? void 0 : value.constructor) === Array ? replaceFuncDeep(value) : value;
-                    }
-                });
-            }
-        };
         query.alias = parseAliases(selections);
         query.fields = parseFields(selections);
-        query.filter = replaceFuncs(query.filter);
+        query.filter = this.replaceFuncs(query.filter);
+        query.deep = this.replaceFuncs(query.deep);
         (0, validate_query_1.validateQuery)(query);
         return query;
     }
@@ -1393,9 +1369,31 @@ class GraphQLService {
                     return selectionNode.name.value;
                 })) !== null && _b !== void 0 ? _b : [];
         }
+        query.filter = this.replaceFuncs(query.filter);
         (0, validate_query_1.validateQuery)(query);
         return query;
     }
+    /**
+     * Replace functions from GraphQL format to Directus-Filter format
+     */
+    replaceFuncs(filter) {
+        if (!filter)
+            return filter;
+        return replaceFuncDeep(filter);
+        function replaceFuncDeep(filter) {
+            return (0, lodash_1.transform)(filter, (result, value, key) => {
+                const isFunctionKey = typeof key === 'string' && key.endsWith('_func') && constants_2.FUNCTIONS.includes(Object.keys(value)[0]);
+                if (isFunctionKey) {
+                    const functionName = Object.keys(value)[0];
+                    const fieldName = key.slice(0, -5);
+                    result[`${functionName}(${fieldName})`] = Object.values(value)[0];
+                }
+                else {
+                    result[key] = (value === null || value === void 0 ? void 0 : value.constructor) === Object || (value === null || value === void 0 ? void 0 : value.constructor) === Array ? replaceFuncDeep(value) : value;
+                }
+            });
+        }
+    }
     /**
      * Convert Directus-Exception into a GraphQL format, so it can be returned by GraphQL properly.
      */
@@ -1870,7 +1868,7 @@ class GraphQLService {
                     to: new graphql_1.GraphQLNonNull(graphql_1.GraphQLID),
                 },
                 resolve: async (_, args) => {
-                    const service = new utils_1.UtilsService({
+                    const service = new utils_2.UtilsService({
                         accountability: this.accountability,
                         schema: this.schema,
                     });

package/dist/services/import-export.d.ts

@@ -2,14 +2,15 @@
 import { Accountability, Query, SchemaOverview } from '@directus/shared/types';
 import { Knex } from 'knex';
 import { AbstractServiceOptions, File } from '../types';
+import type { Readable } from 'node:stream';
 export declare class ImportService {
     knex: Knex;
     accountability: Accountability | null;
     schema: SchemaOverview;
     constructor(options: AbstractServiceOptions);
-    import(collection: string, mimetype: string, stream: NodeJS.ReadableStream): Promise<void>;
-    importJSON(collection: string, stream: NodeJS.ReadableStream): Promise<void>;
-    importCSV(collection: string, stream: NodeJS.ReadableStream): Promise<void>;
+    import(collection: string, mimetype: string, stream: Readable): Promise<void>;
+    importJSON(collection: string, stream: Readable): Promise<void>;
+    importCSV(collection: string, stream: Readable): Promise<void>;
 }
 export declare class ExportService {
     knex: Knex;

package/dist/services/items.js

@@ -8,6 +8,7 @@ const types_1 = require("@directus/shared/types");
 const lodash_1 = require("lodash");
 const cache_1 = require("../cache");
 const database_1 = __importDefault(require("../database"));
+const helpers_1 = require("../database/helpers");
 const run_ast_1 = __importDefault(require("../database/run-ast"));
 const emitter_1 = __importDefault(require("../emitter"));
 const env_1 = __importDefault(require("../env"));
@@ -98,7 +99,12 @@ class ItemsService {
                     .returning(primaryKeyField)
                     .then((result) => result[0]);
                 const returnedKey = typeof result === 'object' ? result[primaryKeyField] : result;
-                primaryKey = primaryKey !== null && primaryKey !== void 0 ? primaryKey : returnedKey;
+                if (this.schema.collections[this.collection].fields[primaryKeyField].type === 'uuid') {
+                    primaryKey = (0, helpers_1.getHelpers)(trx).schema.formatUUID(primaryKey !== null && primaryKey !== void 0 ? primaryKey : returnedKey);
+                }
+                else {
+                    primaryKey = primaryKey !== null && primaryKey !== void 0 ? primaryKey : returnedKey;
+                }
             }
             catch (err) {
                 throw await (0, translate_1.translateDatabaseError)(err);

package/dist/services/meta.js

@@ -40,7 +40,7 @@ class MetaService {
             if (!permissionsRecord)
                 throw new exceptions_1.ForbiddenException();
             const permissions = (_d = permissionsRecord.permissions) !== null && _d !== void 0 ? _d : {};
-            (0, apply_query_1.applyFilter)(this.knex, this.schema, dbQuery, permissions, collection);
+            (0, apply_query_1.applyFilter)(this.knex, this.schema, dbQuery, permissions, collection, {});
         }
         const result = await dbQuery;
         return Number((_e = result === null || result === void 0 ? void 0 : result.count) !== null && _e !== void 0 ? _e : 0);
@@ -64,7 +64,7 @@ class MetaService {
             }
         }
         if (Object.keys(filter).length > 0) {
-            (0, apply_query_1.applyFilter)(this.knex, this.schema, dbQuery, filter, collection);
+            (0, apply_query_1.applyFilter)(this.knex, this.schema, dbQuery, filter, collection, {});
         }
         if (query.search) {
             (0, apply_query_1.applySearch)(this.schema, dbQuery, query.search, collection);

package/dist/services/operations.d.ts

@@ -5,9 +5,7 @@ export declare class OperationsService extends ItemsService<OperationRaw> {
     constructor(options: AbstractServiceOptions);
     createOne(data: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey>;
     createMany(data: Partial<Item>[], opts?: MutationOptions): Promise<PrimaryKey[]>;
-    updateOne(key: PrimaryKey, data: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey>;
     updateBatch(data: Partial<Item>[], opts?: MutationOptions): Promise<PrimaryKey[]>;
     updateMany(keys: PrimaryKey[], data: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey[]>;
-    deleteOne(key: PrimaryKey, opts?: MutationOptions): Promise<PrimaryKey>;
     deleteMany(keys: PrimaryKey[], opts?: MutationOptions): Promise<PrimaryKey[]>;
 }

package/dist/services/operations.js

@@ -19,12 +19,6 @@ class OperationsService extends items_1.ItemsService {
         await flowManager.reload();
         return result;
     }
-    async updateOne(key, data, opts) {
-        const flowManager = (0, flows_1.getFlowManager)();
-        const result = await super.updateOne(key, data, opts);
-        await flowManager.reload();
-        return result;
-    }
     async updateBatch(data, opts) {
         const flowManager = (0, flows_1.getFlowManager)();
         const result = await super.updateBatch(data, opts);
@@ -37,12 +31,6 @@ class OperationsService extends items_1.ItemsService {
         await flowManager.reload();
         return result;
     }
-    async deleteOne(key, opts) {
-        const flowManager = (0, flows_1.getFlowManager)();
-        const result = await super.deleteOne(key, opts);
-        await flowManager.reload();
-        return result;
-    }
     async deleteMany(keys, opts) {
         const flowManager = (0, flows_1.getFlowManager)();
         const result = await super.deleteMany(keys, opts);

package/dist/services/operations.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/services/permissions.d.ts

@@ -10,13 +10,8 @@ export declare class PermissionsService extends ItemsService {
     readMany(keys: PrimaryKey[], query?: Query, opts?: QueryOptions): Promise<Partial<Item>[]>;
     createOne(data: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey>;
     createMany(data: Partial<Item>[], opts?: MutationOptions): Promise<PrimaryKey[]>;
-    updateByQuery(query: Query, data: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey[]>;
-    updateOne(key: PrimaryKey, data: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey>;
     updateBatch(data: Partial<Item>[], opts?: MutationOptions): Promise<PrimaryKey[]>;
     updateMany(keys: PrimaryKey[], data: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey[]>;
-    upsertOne(payload: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey>;
     upsertMany(payloads: Partial<Item>[], opts?: MutationOptions): Promise<PrimaryKey[]>;
-    deleteByQuery(query: Query, opts?: MutationOptions): Promise<PrimaryKey[]>;
-    deleteOne(key: PrimaryKey, opts?: MutationOptions): Promise<PrimaryKey>;
     deleteMany(keys: PrimaryKey[], opts?: MutationOptions): Promise<PrimaryKey[]>;
 }

package/dist/services/permissions.js

@@ -60,16 +60,6 @@ class PermissionsService extends items_1.ItemsService {
         await (0, cache_1.clearSystemCache)();
         return res;
     }
-    async updateByQuery(query, data, opts) {
-        const res = await super.updateByQuery(query, data, opts);
-        await (0, cache_1.clearSystemCache)();
-        return res;
-    }
-    async updateOne(key, data, opts) {
-        const res = await super.updateOne(key, data, opts);
-        await (0, cache_1.clearSystemCache)();
-        return res;
-    }
     async updateBatch(data, opts) {
         const res = await super.updateBatch(data, opts);
         await (0, cache_1.clearSystemCache)();
@@ -80,26 +70,11 @@ class PermissionsService extends items_1.ItemsService {
         await (0, cache_1.clearSystemCache)();
         return res;
     }
-    async upsertOne(payload, opts) {
-        const res = await super.upsertOne(payload, opts);
-        await (0, cache_1.clearSystemCache)();
-        return res;
-    }
     async upsertMany(payloads, opts) {
         const res = await super.upsertMany(payloads, opts);
         await (0, cache_1.clearSystemCache)();
         return res;
     }
-    async deleteByQuery(query, opts) {
-        const res = await super.deleteByQuery(query, opts);
-        await (0, cache_1.clearSystemCache)();
-        return res;
-    }
-    async deleteOne(key, opts) {
-        const res = await super.deleteOne(key, opts);
-        await (0, cache_1.clearSystemCache)();
-        return res;
-    }
     async deleteMany(keys, opts) {
         const res = await super.deleteMany(keys, opts);
         await (0, cache_1.clearSystemCache)();

package/dist/services/permissions.test.d.ts

@@ -0,0 +1 @@
+export {};

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/roles.js

@@ -56,9 +56,6 @@ class RolesService extends items_1.ItemsService {
         return;
     }
     async updateOne(key, data, opts) {
-        if ('admin_access' in data && data.admin_access === false) {
-            await this.checkForOtherAdminRoles([key]);
-        }
         if ('users' in data) {
             await this.checkForOtherAdminUsers(key, data.users);
         }

package/dist/services/roles.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/services/server.js

@@ -28,7 +28,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServerService = void 0;
 const lodash_1 = require("lodash");
-const nanoid_1 = require("nanoid");
 const os_1 = __importDefault(require("os"));
 const perf_hooks_1 = require("perf_hooks");
 // @ts-ignore
@@ -38,11 +37,12 @@ const database_1 = __importStar(require("../database"));
 const env_1 = __importDefault(require("../env"));
 const logger_1 = __importDefault(require("../logger"));
 const rate_limiter_1 = require("../middleware/rate-limiter");
-const storage_1 = __importDefault(require("../storage"));
+const storage_1 = require("../storage");
 const utils_1 = require("@directus/shared/utils");
 const mailer_1 = __importDefault(require("../mailer"));
 const settings_1 = require("./settings");
 const get_os_info_1 = require("../utils/get-os-info");
+const node_stream_1 = require("node:stream");
 class ServerService {
     constructor(options) {
         this.knex = options.knex || (0, database_1.default)();
@@ -101,7 +101,8 @@ class ServerService {
     }
     async health() {
         var _a;
-        const checkID = (0, nanoid_1.nanoid)(5);
+        const { nanoid } = await import('nanoid');
+        const checkID = nanoid(5);
         const data = {
             status: 'ok',
             releaseId: package_json_1.version,
@@ -246,9 +247,10 @@ class ServerService {
             return checks;
         }
         async function testStorage() {
+            const storage = await (0, storage_1.getStorage)();
             const checks = {};
             for (const location of (0, utils_1.toArray)(env_1.default.STORAGE_LOCATIONS)) {
-                const disk = storage_1.default.disk(location);
+                const disk = storage.location(location);
                 const envThresholdKey = `STORAGE_${location}_HEALTHCHECK_THRESHOLD`.toUpperCase();
                 checks[`storage:${location}:responseTime`] = [
                     {
@@ -261,8 +263,8 @@ class ServerService {
                 ];
                 const startTime = perf_hooks_1.performance.now();
                 try {
-                    await disk.put(`health-${checkID}`, 'check');
-                    await disk.get(`health-${checkID}`);
+                    await disk.write(`health-${checkID}`, node_stream_1.Readable.from(['check']));
+                    await disk.read(`health-${checkID}`);
                     await disk.delete(`health-${checkID}`);
                 }
                 catch (err) {

package/dist/services/shares.js

@@ -10,7 +10,6 @@ const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const ms_1 = __importDefault(require("ms"));
 const exceptions_1 = require("../exceptions");
 const env_1 = __importDefault(require("../env"));
-const nanoid_1 = require("nanoid");
 const authorization_1 = require("./authorization");
 const users_1 = require("./users");
 const mail_1 = require("./mail");
@@ -32,6 +31,7 @@ class SharesService extends items_1.ItemsService {
     }
     async login(payload) {
         var _a, _b, _c;
+        const { nanoid } = await import('nanoid');
         const record = await this.knex
             .select({
             share_id: 'id',
@@ -79,7 +79,7 @@ class SharesService extends items_1.ItemsService {
             expiresIn: env_1.default.ACCESS_TOKEN_TTL,
             issuer: 'directus',
         });
-        const refreshToken = (0, nanoid_1.nanoid)(64);
+        const refreshToken = nanoid(64);
         const refreshTokenExpiration = new Date(Date.now() + (0, ms_1.default)(env_1.default.REFRESH_TOKEN_TTL));
         await this.knex('directus_sessions').insert({
             token: refreshToken,

package/dist/services/specifications.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SpecificationService = void 0;
-const format_title_1 = __importDefault(require("@directus/format-title"));
 const specs_1 = __importDefault(require("@directus/specs"));
 const lodash_1 = require("lodash");
 // @ts-ignore
@@ -16,6 +15,9 @@ const collections_1 = require("./collections");
 const fields_1 = require("./fields");
 const graphql_1 = require("./graphql");
 const relations_1 = require("./relations");
+const constants_1 = require("../constants");
+// @ts-ignore
+const format_title_1 = __importDefault(require("@directus/format-title"));
 class SpecificationService {
     constructor(options) {
         this.accountability = options.accountability || null;
@@ -330,10 +332,19 @@ class OASSpecsService {
         return paths;
     }
     async generateComponents(collections, fields, relations, tags) {
+        var _a;
         let components = (0, lodash_1.cloneDeep)(specs_1.default.components);
         if (!components)
             components = {};
         components.schemas = {};
+        // Always includes the schemas with these names
+        if (((_a = specs_1.default.components) === null || _a === void 0 ? void 0 : _a.schemas) !== null) {
+            for (const schemaName of constants_1.OAS_REQUIRED_SCHEMAS) {
+                if (specs_1.default.components.schemas[schemaName] !== null) {
+                    components.schemas[schemaName] = (0, lodash_1.cloneDeep)(specs_1.default.components.schemas[schemaName]);
+                }
+            }
+        }
         if (!tags)
             return;
         for (const collection of collections) {

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/services/webhooks.d.ts

@@ -6,8 +6,6 @@ export declare class WebhooksService extends ItemsService<Webhook> {
     constructor(options: AbstractServiceOptions);
     createOne(data: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey>;
     createMany(data: Partial<Item>[], opts?: MutationOptions): Promise<PrimaryKey[]>;
-    updateOne(key: PrimaryKey, data: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey>;
     updateMany(keys: PrimaryKey[], data: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey[]>;
-    deleteOne(key: PrimaryKey, opts?: MutationOptions): Promise<PrimaryKey>;
     deleteMany(keys: PrimaryKey[], opts?: MutationOptions): Promise<PrimaryKey[]>;
 }

package/dist/services/webhooks.js

@@ -18,21 +18,11 @@ class WebhooksService extends items_1.ItemsService {
         this.messenger.publish('webhooks', { type: 'reload' });
         return result;
     }
-    async updateOne(key, data, opts) {
-        const result = await super.updateOne(key, data, opts);
-        this.messenger.publish('webhooks', { type: 'reload' });
-        return result;
-    }
     async updateMany(keys, data, opts) {
         const result = await super.updateMany(keys, data, opts);
         this.messenger.publish('webhooks', { type: 'reload' });
         return result;
     }
-    async deleteOne(key, opts) {
-        const result = await super.deleteOne(key, opts);
-        this.messenger.publish('webhooks', { type: 'reload' });
-        return result;
-    }
     async deleteMany(keys, opts) {
         const result = await super.deleteMany(keys, opts);
         this.messenger.publish('webhooks', { type: 'reload' });

package/dist/services/webhooks.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/storage/get-storage-driver.d.ts

@@ -0,0 +1,3 @@
+import type { Driver } from '@directus/storage';
+export declare const _aliasMap: Record<string, string>;
+export declare const getStorageDriver: (driverName: string) => Promise<typeof Driver>;

package/dist/storage/get-storage-driver.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getStorageDriver = exports._aliasMap = void 0;
+exports._aliasMap = {
+    local: '@directus/storage-driver-local',
+    s3: '@directus/storage-driver-s3',
+    gcs: '@directus/storage-driver-gcs',
+    azure: '@directus/storage-driver-azure',
+    cloudinary: '@directus/storage-driver-cloudinary',
+};
+const getStorageDriver = async (driverName) => {
+    if (driverName in exports._aliasMap) {
+        driverName = exports._aliasMap[driverName];
+    }
+    else {
+        throw new Error(`Driver "${driverName}" doesn't exist.`);
+    }
+    return (await import(driverName)).default;
+};
+exports.getStorageDriver = getStorageDriver;

package/dist/storage/get-storage-driver.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/storage/index.d.ts

@@ -0,0 +1,5 @@
+import type { StorageManager } from '@directus/storage';
+export declare const _cache: {
+    storage: any | null;
+};
+export declare const getStorage: () => Promise<StorageManager>;

package/dist/storage/index.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getStorage = exports._cache = void 0;
+const validate_env_1 = require("../utils/validate-env");
+const register_drivers_1 = require("./register-drivers");
+const register_locations_1 = require("./register-locations");
+exports._cache = {
+    storage: null,
+};
+const getStorage = async () => {
+    if (exports._cache.storage)
+        return exports._cache.storage;
+    const { StorageManager } = await import('@directus/storage');
+    (0, validate_env_1.validateEnv)(['STORAGE_LOCATIONS']);
+    exports._cache.storage = new StorageManager();
+    await (0, register_drivers_1.registerDrivers)(exports._cache.storage);
+    await (0, register_locations_1.registerLocations)(exports._cache.storage);
+    return exports._cache.storage;
+};
+exports.getStorage = getStorage;