directus 9.10.0 → 9.12.0

package/dist/services/flows.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FlowsService = void 0;
+const messenger_1 = require("../messenger");
+const items_1 = require("./items");
+class FlowsService extends items_1.ItemsService {
+    constructor(options) {
+        super('directus_flows', options);
+        this.messenger = (0, messenger_1.getMessenger)();
+    }
+    async createOne(data, opts) {
+        const result = await super.createOne(data, opts);
+        this.messenger.publish('flows', { type: 'reload' });
+        return result;
+    }
+    async createMany(data, opts) {
+        const result = await super.createMany(data, opts);
+        this.messenger.publish('flows', { type: 'reload' });
+        return result;
+    }
+    async updateOne(key, data, opts) {
+        const result = await super.updateOne(key, data, opts);
+        this.messenger.publish('flows', { type: 'reload' });
+        return result;
+    }
+    async updateMany(keys, data, opts) {
+        const result = await super.updateMany(keys, data, opts);
+        this.messenger.publish('flows', { type: 'reload' });
+        return result;
+    }
+    async deleteOne(key, opts) {
+        const result = await super.deleteOne(key, opts);
+        this.messenger.publish('flows', { type: 'reload' });
+        return result;
+    }
+    async deleteMany(keys, opts) {
+        const result = await super.deleteMany(keys, opts);
+        this.messenger.publish('flows', { type: 'reload' });
+        return result;
+    }
+}
+exports.FlowsService = FlowsService;

package/dist/services/graphql.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GraphQLService = exports.GraphQLDate = exports.GraphQLGeoJSON = void 0;
+const types_1 = require("@directus/shared/types");
 const argon2_1 = __importDefault(require("argon2"));
 const graphql_1 = require("graphql");
 const graphql_compose_1 = require("graphql-compose");
@@ -15,7 +16,6 @@ const database_1 = __importDefault(require("../database"));
 const env_1 = __importDefault(require("../env"));
 const exceptions_1 = require("../exceptions");
 const extensions_1 = require("../extensions");
-const types_1 = require("../types");
 const generate_hash_1 = require("../utils/generate-hash");
 const get_graphql_type_1 = require("../utils/get-graphql-type");
 const reduce_schema_1 = require("../utils/reduce-schema");
@@ -26,9 +26,11 @@ const authentication_1 = require("./authentication");
 const collections_1 = require("./collections");
 const fields_1 = require("./fields");
 const files_1 = require("./files");
+const flows_1 = require("./flows");
 const folders_1 = require("./folders");
 const items_1 = require("./items");
 const notifications_1 = require("./notifications");
+const operations_1 = require("./operations");
 const permissions_1 = require("./permissions");
 const presets_1 = require("./presets");
 const relations_1 = require("./relations");
@@ -170,16 +172,7 @@ class GraphQLService {
                 acc[collectionName] = ReadCollectionTypes[collection.collection].getResolver(collection.collection);
                 if (this.schema.collections[collection.collection].singleton === false) {
                     acc[`${collectionName}_by_id`] = ReadCollectionTypes[collection.collection].getResolver(`${collection.collection}_by_id`);
-                    const hasAggregate = Object.values(collection.fields).some((field) => {
-                        const graphqlType = (0, get_graphql_type_1.getGraphQLType)(field.type);
-                        if (graphqlType === graphql_1.GraphQLInt || graphqlType === graphql_1.GraphQLFloat) {
-                            return true;
-                        }
-                        return false;
-                    });
-                    if (hasAggregate) {
-                        acc[`${collectionName}_aggregated`] = ReadCollectionTypes[collection.collection].getResolver(`${collection.collection}_aggregated`);
-                    }
+                    acc[`${collectionName}_aggregated`] = ReadCollectionTypes[collection.collection].getResolver(`${collection.collection}_aggregated`);
                 }
                 return acc;
             }, {}));
@@ -424,7 +417,8 @@ class GraphQLService {
             const { CollectionTypes: ReadCollectionTypes } = getTypes('read');
             const ReadableCollectionFilterTypes = {};
             const AggregatedFunctions = {};
-            const AggregatedFilters = {};
+            const AggregatedFields = {};
+            const AggregateMethods = {};
             const StringFilterOperators = schemaComposer.createInputTC({
                 name: 'string_filter_operators',
                 fields: {
@@ -680,7 +674,7 @@ class GraphQLService {
                     _and: [ReadableCollectionFilterTypes[collection.collection]],
                     _or: [ReadableCollectionFilterTypes[collection.collection]],
                 });
-                AggregatedFilters[collection.collection] = schemaComposer.createObjectTC({
+                AggregatedFields[collection.collection] = schemaComposer.createObjectTC({
                     name: `${collection.collection}_aggregated_fields`,
                     fields: Object.values(collection.fields).reduce((acc, field) => {
                         const graphqlType = (0, get_graphql_type_1.getGraphQLType)(field.type);
@@ -698,46 +692,71 @@ class GraphQLService {
                         return acc;
                     }, {}),
                 });
-                AggregatedFunctions[collection.collection] = schemaComposer.createObjectTC({
-                    name: `${collection.collection}_aggregated`,
-                    fields: {
-                        group: {
-                            name: 'group',
-                            type: graphql_compose_1.GraphQLJSON,
-                        },
+                AggregateMethods[collection.collection] = {
+                    group: {
+                        name: 'group',
+                        type: graphql_compose_1.GraphQLJSON,
+                    },
+                    countAll: {
+                        name: 'countAll',
+                        type: graphql_1.GraphQLInt,
+                    },
+                    count: {
+                        name: 'count',
+                        type: schemaComposer.createObjectTC({
+                            name: `${collection.collection}_aggregated_count`,
+                            fields: Object.values(collection.fields).reduce((acc, field) => {
+                                acc[field.field] = {
+                                    type: graphql_1.GraphQLInt,
+                                    description: field.note,
+                                };
+                                return acc;
+                            }, {}),
+                        }),
+                    },
+                };
+                const hasNumericAggregates = Object.values(collection.fields).some((field) => {
+                    const graphqlType = (0, get_graphql_type_1.getGraphQLType)(field.type);
+                    if (graphqlType === graphql_1.GraphQLInt || graphqlType === graphql_1.GraphQLFloat) {
+                        return true;
+                    }
+                    return false;
+                });
+                if (hasNumericAggregates) {
+                    Object.assign(AggregateMethods[collection.collection], {
                         avg: {
                             name: 'avg',
-                            type: AggregatedFilters[collection.collection],
+                            type: AggregatedFields[collection.collection],
                         },
                         sum: {
                             name: 'sum',
-                            type: AggregatedFilters[collection.collection],
-                        },
-                        count: {
-                            name: 'count',
-                            type: AggregatedFilters[collection.collection],
+                            type: AggregatedFields[collection.collection],
                         },
                         countDistinct: {
                             name: 'countDistinct',
-                            type: AggregatedFilters[collection.collection],
+                            type: AggregatedFields[collection.collection],
                         },
                         avgDistinct: {
                             name: 'avgDistinct',
-                            type: AggregatedFilters[collection.collection],
+                            type: AggregatedFields[collection.collection],
                         },
                         sumDistinct: {
                             name: 'sumDistinct',
-                            type: AggregatedFilters[collection.collection],
+                            type: AggregatedFields[collection.collection],
                         },
                         min: {
                             name: 'min',
-                            type: AggregatedFilters[collection.collection],
+                            type: AggregatedFields[collection.collection],
                         },
                         max: {
                             name: 'max',
-                            type: AggregatedFilters[collection.collection],
+                            type: AggregatedFields[collection.collection],
                         },
-                    },
+                    });
+                }
+                AggregatedFunctions[collection.collection] = schemaComposer.createObjectTC({
+                    name: `${collection.collection}_aggregated`,
+                    fields: AggregateMethods[collection.collection],
                 });
                 ReadCollectionTypes[collection.collection].addResolver({
                     name: collection.collection,
@@ -1237,7 +1256,7 @@ class GraphQLService {
                         if (!query.deep)
                             query.deep = {};
                         const args = this.parseArgs(selection.arguments, variableValues);
-                        (0, lodash_1.set)(query.deep, current, (0, lodash_1.merge)((0, lodash_1.get)(query.deep, current), (0, lodash_1.mapKeys)((0, sanitize_query_1.sanitizeQuery)(args, this.accountability), (value, key) => `_${key}`)));
+                        (0, lodash_1.set)(query.deep, currentAlias !== null && currentAlias !== void 0 ? currentAlias : current, (0, lodash_1.merge)((0, lodash_1.get)(query.deep, currentAlias !== null && currentAlias !== void 0 ? currentAlias : current), (0, lodash_1.mapKeys)((0, sanitize_query_1.sanitizeQuery)(args, this.accountability), (value, key) => `_${key}`)));
                     }
                 }
             }
@@ -1337,6 +1356,10 @@ class GraphQLService {
                 return new webhooks_1.WebhooksService(opts);
             case 'directus_shares':
                 return new shares_1.SharesService(opts);
+            case 'directus_flows':
+                return new flows_1.FlowsService(opts);
+            case 'directus_operations':
+                return new operations_1.OperationsService(opts);
             default:
                 return new items_1.ItemsService(collection, opts);
         }

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

@@ -1,7 +1,7 @@
 /// <reference types="node" />
+import { Accountability, Query, SchemaOverview } from '@directus/shared/types';
 import { Knex } from 'knex';
 import { AbstractServiceOptions, File } from '../types';
-import { Accountability, Query, SchemaOverview } from '@directus/shared/types';
 export declare class ImportService {
     knex: Knex;
     accountability: Accountability | null;

package/dist/services/import-export.js

@@ -4,25 +4,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExportService = exports.ImportService = void 0;
-const database_1 = __importDefault(require("../database"));
-const exceptions_1 = require("../exceptions");
-const StreamArray_1 = __importDefault(require("stream-json/streamers/StreamArray"));
-const items_1 = require("./items");
+const utils_1 = require("@directus/shared/utils");
 const async_1 = require("async");
-const destroy_1 = __importDefault(require("destroy"));
 const csv_parser_1 = __importDefault(require("csv-parser"));
-const lodash_1 = require("lodash");
+const destroy_1 = __importDefault(require("destroy"));
+const fs_extra_1 = require("fs-extra");
 const js2xmlparser_1 = require("js2xmlparser");
 const json2csv_1 = require("json2csv");
-const fs_extra_1 = require("fs-extra");
+const lodash_1 = require("lodash");
+const StreamArray_1 = __importDefault(require("stream-json/streamers/StreamArray"));
+const strip_bom_stream_1 = __importDefault(require("strip-bom-stream"));
 const tmp_promise_1 = require("tmp-promise");
+const database_1 = __importDefault(require("../database"));
 const env_1 = __importDefault(require("../env"));
-const files_1 = require("./files");
+const exceptions_1 = require("../exceptions");
+const logger_1 = __importDefault(require("../logger"));
 const get_date_formatted_1 = require("../utils/get-date-formatted");
-const utils_1 = require("@directus/shared/utils");
+const parse_json_1 = require("../utils/parse-json");
+const files_1 = require("./files");
+const items_1 = require("./items");
 const notifications_1 = require("./notifications");
-const logger_1 = __importDefault(require("../logger"));
-const strip_bom_stream_1 = __importDefault(require("strip-bom-stream"));
 class ImportService {
     constructor(options) {
         this.knex = options.knex || (0, database_1.default)();
@@ -101,7 +102,7 @@ class ImportService {
                         }
                         else {
                             try {
-                                const parsedJson = JSON.parse(value);
+                                const parsedJson = (0, parse_json_1.parseJSON)(value);
                                 (0, lodash_1.set)(result, key, parsedJson);
                             }
                             catch {

package/dist/services/index.d.ts

@@ -7,12 +7,14 @@ export * from './collections';
 export * from './dashboards';
 export * from './fields';
 export * from './files';
+export * from './flows';
 export * from './folders';
 export * from './graphql';
 export * from './import-export';
 export * from './mail';
 export * from './meta';
 export * from './notifications';
+export * from './operations';
 export * from './panels';
 export * from './payload';
 export * from './permissions';

package/dist/services/index.js

@@ -20,12 +20,14 @@ __exportStar(require("./collections"), exports);
 __exportStar(require("./dashboards"), exports);
 __exportStar(require("./fields"), exports);
 __exportStar(require("./files"), exports);
+__exportStar(require("./flows"), exports);
 __exportStar(require("./folders"), exports);
 __exportStar(require("./graphql"), exports);
 __exportStar(require("./import-export"), exports);
 __exportStar(require("./mail"), exports);
 __exportStar(require("./meta"), exports);
 __exportStar(require("./notifications"), exports);
+__exportStar(require("./operations"), exports);
 __exportStar(require("./panels"), exports);
 __exportStar(require("./payload"), exports);
 __exportStar(require("./permissions"), exports);

package/dist/services/items.d.ts

@@ -1,7 +1,7 @@
-import { Knex } from 'knex';
+import { Accountability, PermissionsAction, Query, SchemaOverview } from '@directus/shared/types';
 import Keyv from 'keyv';
-import { Accountability, Query, PermissionsAction, SchemaOverview } from '@directus/shared/types';
-import { AbstractService, AbstractServiceOptions, Item as AnyItem, PrimaryKey, MutationOptions } from '../types';
+import { Knex } from 'knex';
+import { AbstractService, AbstractServiceOptions, Item as AnyItem, MutationOptions, PrimaryKey } from '../types';
 export declare type QueryOptions = {
     stripNonRequested?: boolean;
     permissionsAction?: PermissionsAction;

package/dist/services/items.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ItemsService = void 0;
+const types_1 = require("@directus/shared/types");
 const lodash_1 = require("lodash");
 const cache_1 = require("../cache");
 const database_1 = __importDefault(require("../database"));
@@ -12,11 +13,11 @@ const emitter_1 = __importDefault(require("../emitter"));
 const env_1 = __importDefault(require("../env"));
 const exceptions_1 = require("../exceptions");
 const translate_1 = require("../exceptions/database/translate");
-const types_1 = require("../types");
 const get_ast_from_query_1 = __importDefault(require("../utils/get-ast-from-query"));
 const authorization_1 = require("./authorization");
-const payload_1 = require("./payload");
 const index_1 = require("./index");
+const payload_1 = require("./payload");
+const validate_keys_1 = require("../utils/validate-keys");
 class ItemsService {
     constructor(collection, options) {
         this.collection = collection;
@@ -244,6 +245,7 @@ class ItemsService {
      */
     async readOne(key, query = {}, opts) {
         const primaryKeyField = this.schema.collections[this.collection].primary;
+        (0, validate_keys_1.validateKeys)(this.schema, this.collection, primaryKeyField, key);
         const filterWithKey = (0, lodash_1.assign)({}, query.filter, { [primaryKeyField]: { _eq: key } });
         const queryWithKey = (0, lodash_1.assign)({}, query, { filter: filterWithKey });
         const results = await this.readByQuery(queryWithKey, opts);
@@ -258,8 +260,13 @@ class ItemsService {
     async readMany(keys, query = {}, opts) {
         var _a;
         const primaryKeyField = this.schema.collections[this.collection].primary;
+        (0, validate_keys_1.validateKeys)(this.schema, this.collection, primaryKeyField, keys);
         const filterWithKey = { _and: [{ [primaryKeyField]: { _in: keys } }, (_a = query.filter) !== null && _a !== void 0 ? _a : {}] };
         const queryWithKey = (0, lodash_1.assign)({}, query, { filter: filterWithKey });
+        // Set query limit as the number of keys
+        if (Array.isArray(keys) && keys.length > 0 && !queryWithKey.limit) {
+            queryWithKey.limit = keys.length;
+        }
         const results = await this.readByQuery(queryWithKey, opts);
         return results;
     }
@@ -268,12 +275,16 @@ class ItemsService {
      */
     async updateByQuery(query, data, opts) {
         const keys = await this.getKeysByQuery(query);
+        const primaryKeyField = this.schema.collections[this.collection].primary;
+        (0, validate_keys_1.validateKeys)(this.schema, this.collection, primaryKeyField, keys);
         return keys.length ? await this.updateMany(keys, data, opts) : [];
     }
     /**
      * Update a single item by primary key
      */
     async updateOne(key, data, opts) {
+        const primaryKeyField = this.schema.collections[this.collection].primary;
+        (0, validate_keys_1.validateKeys)(this.schema, this.collection, primaryKeyField, key);
         await this.updateMany([key], data, opts);
         return key;
     }
@@ -282,6 +293,7 @@ class ItemsService {
      */
     async updateMany(keys, data, opts) {
         const primaryKeyField = this.schema.collections[this.collection].primary;
+        (0, validate_keys_1.validateKeys)(this.schema, this.collection, primaryKeyField, keys);
         const fields = Object.keys(this.schema.collections[this.collection].fields);
         const aliases = Object.values(this.schema.collections[this.collection].fields)
             .filter((field) => field.alias === true)
@@ -306,6 +318,8 @@ class ItemsService {
                 accountability: this.accountability,
             })
             : payload;
+        // Sort keys to ensure that the order is maintained
+        keys.sort();
         if (this.accountability) {
             await authorizationService.checkAccess('update', this.collection, keys);
         }
@@ -409,6 +423,9 @@ class ItemsService {
     async upsertOne(payload, opts) {
         const primaryKeyField = this.schema.collections[this.collection].primary;
         const primaryKey = payload[primaryKeyField];
+        if (primaryKey) {
+            (0, validate_keys_1.validateKeys)(this.schema, this.collection, primaryKeyField, primaryKey);
+        }
         const exists = primaryKey &&
             !!(await this.knex
                 .select(primaryKeyField)
@@ -449,12 +466,16 @@ class ItemsService {
      */
     async deleteByQuery(query, opts) {
         const keys = await this.getKeysByQuery(query);
+        const primaryKeyField = this.schema.collections[this.collection].primary;
+        (0, validate_keys_1.validateKeys)(this.schema, this.collection, primaryKeyField, keys);
         return keys.length ? await this.deleteMany(keys, opts) : [];
     }
     /**
      * Delete a single item by primary key
      */
     async deleteOne(key, opts) {
+        const primaryKeyField = this.schema.collections[this.collection].primary;
+        (0, validate_keys_1.validateKeys)(this.schema, this.collection, primaryKeyField, key);
         await this.deleteMany([key], opts);
         return key;
     }
@@ -463,10 +484,12 @@ class ItemsService {
      */
     async deleteMany(keys, opts) {
         const primaryKeyField = this.schema.collections[this.collection].primary;
+        (0, validate_keys_1.validateKeys)(this.schema, this.collection, primaryKeyField, keys);
         if (this.accountability && this.accountability.admin !== true) {
             const authorizationService = new authorization_1.AuthorizationService({
                 accountability: this.accountability,
                 schema: this.schema,
+                knex: this.knex,
             });
             await authorizationService.checkAccess('delete', this.collection, keys);
         }

package/dist/services/mail/index.js

@@ -65,13 +65,14 @@ class MailService {
     }
     async getDefaultTemplateData() {
         const projectInfo = await this.knex
-            .select(['project_name', 'project_logo', 'project_color'])
+            .select(['project_name', 'project_logo', 'project_color', 'project_url'])
             .from('directus_settings')
             .first();
         return {
             projectName: (projectInfo === null || projectInfo === void 0 ? void 0 : projectInfo.project_name) || 'Directus',
             projectColor: (projectInfo === null || projectInfo === void 0 ? void 0 : projectInfo.project_color) || '#546e7a',
             projectLogo: getProjectLogoURL(projectInfo === null || projectInfo === void 0 ? void 0 : projectInfo.project_logo),
+            projectUrl: (projectInfo === null || projectInfo === void 0 ? void 0 : projectInfo.project_url) || '',
         };
         function getProjectLogoURL(logoID) {
             const projectLogoUrl = new url_1.Url(env_1.default.PUBLIC_URL);

package/dist/services/notifications.d.ts

@@ -1,7 +1,8 @@
-import { UsersService, MailService } from '.';
 import { AbstractServiceOptions, PrimaryKey, MutationOptions } from '../types';
 import { ItemsService } from './items';
 import { Notification } from '@directus/shared/types';
+import { UsersService } from './users';
+import { MailService } from './mail';
 export declare class NotificationsService extends ItemsService {
     usersService: UsersService;
     mailService: MailService;

package/dist/services/notifications.js

@@ -1,14 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NotificationsService = void 0;
-const _1 = require(".");
 const items_1 = require("./items");
 const md_1 = require("../utils/md");
+const users_1 = require("./users");
+const mail_1 = require("./mail");
 class NotificationsService extends items_1.ItemsService {
     constructor(options) {
         super('directus_notifications', options);
-        this.usersService = new _1.UsersService({ schema: this.schema });
-        this.mailService = new _1.MailService({ schema: this.schema, accountability: this.accountability });
+        this.usersService = new users_1.UsersService({ schema: this.schema });
+        this.mailService = new mail_1.MailService({ schema: this.schema, accountability: this.accountability });
     }
     async createOne(data, opts) {
         await this.sendEmail(data);

package/dist/services/operations.d.ts

@@ -0,0 +1,14 @@
+import { OperationRaw } from '@directus/shared/types';
+import { Messenger } from '../messenger';
+import { AbstractServiceOptions, Item, MutationOptions, PrimaryKey } from '../types';
+import { ItemsService } from './items';
+export declare class OperationsService extends ItemsService<OperationRaw> {
+    messenger: Messenger;
+    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/operations.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OperationsService = void 0;
+const messenger_1 = require("../messenger");
+const items_1 = require("./items");
+class OperationsService extends items_1.ItemsService {
+    constructor(options) {
+        super('directus_operations', options);
+        this.messenger = (0, messenger_1.getMessenger)();
+    }
+    async createOne(data, opts) {
+        const result = await super.createOne(data, opts);
+        this.messenger.publish('flows', { type: 'reload' });
+        return result;
+    }
+    async createMany(data, opts) {
+        const result = await super.createMany(data, opts);
+        this.messenger.publish('flows', { type: 'reload' });
+        return result;
+    }
+    async updateOne(key, data, opts) {
+        const result = await super.updateOne(key, data, opts);
+        this.messenger.publish('flows', { type: 'reload' });
+        return result;
+    }
+    async updateMany(keys, data, opts) {
+        const result = await super.updateMany(keys, data, opts);
+        this.messenger.publish('flows', { type: 'reload' });
+        return result;
+    }
+    async deleteOne(key, opts) {
+        const result = await super.deleteOne(key, opts);
+        this.messenger.publish('flows', { type: 'reload' });
+        return result;
+    }
+    async deleteMany(keys, opts) {
+        const result = await super.deleteMany(keys, opts);
+        this.messenger.publish('flows', { type: 'reload' });
+        return result;
+    }
+}
+exports.OperationsService = OperationsService;

package/dist/services/payload.d.ts

@@ -1,7 +1,7 @@
-import { Knex } from 'knex';
-import { AbstractServiceOptions, Item, PrimaryKey } from '../types';
 import { Accountability, SchemaOverview } from '@directus/shared/types';
+import { Knex } from 'knex';
 import { Helpers } from '../database/helpers';
+import { AbstractServiceOptions, Item, PrimaryKey } from '../types';
 declare type Action = 'create' | 'read' | 'update';
 declare type Transformers = {
     [type: string]: (context: {

package/dist/services/payload.js

@@ -4,18 +4,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PayloadService = void 0;
+const utils_1 = require("@directus/shared/utils");
 const date_fns_1 = require("date-fns");
+const flat_1 = require("flat");
 const joi_1 = __importDefault(require("joi"));
 const lodash_1 = require("lodash");
 const uuid_1 = require("uuid");
+const wellknown_1 = require("wellknown");
 const database_1 = __importDefault(require("../database"));
-const exceptions_1 = require("../exceptions");
-const utils_1 = require("@directus/shared/utils");
-const items_1 = require("./items");
-const flat_1 = require("flat");
 const helpers_1 = require("../database/helpers");
-const wellknown_1 = require("wellknown");
+const exceptions_1 = require("../exceptions");
 const generate_hash_1 = require("../utils/generate-hash");
+const parse_json_1 = require("../utils/parse-json");
+const items_1 = require("./items");
 /**
  * Process a given payload for a collection to ensure the special fields (hash, uuid, date etc) are
  * handled correctly.
@@ -55,7 +56,7 @@ class PayloadService {
                 if (action === 'read') {
                     if (typeof value === 'string') {
                         try {
-                            return JSON.parse(value);
+                            return (0, parse_json_1.parseJSON)(value);
                         }
                         catch {
                             return value;
@@ -196,7 +197,7 @@ class PayloadService {
     processGeometries(payloads, action) {
         const process = action == 'read'
             ? (value) => (typeof value === 'string' ? (0, wellknown_1.parse)(value) : value)
-            : (value) => this.helpers.st.fromGeoJSON(typeof value == 'string' ? JSON.parse(value) : value);
+            : (value) => this.helpers.st.fromGeoJSON(typeof value == 'string' ? (0, parse_json_1.parseJSON)(value) : value);
         const fieldsInCollection = Object.entries(this.schema.collections[this.collection].fields);
         const geometryColumns = fieldsInCollection.filter(([_, field]) => field.type.startsWith('geometry'));
         for (const [name] of geometryColumns) {

package/dist/services/users.d.ts

@@ -18,6 +18,10 @@ export declare class UsersService extends ItemsService {
      */
     private checkPasswordPolicy;
     private checkRemainingAdminExistence;
+    /**
+     * Make sure there's at least one active admin user when updating user status
+     */
+    private checkRemainingActiveAdmin;
     /**
      * Create a new user
      */

package/dist/services/users.js

@@ -101,6 +101,23 @@ class UsersService extends items_1.ItemsService {
             throw new exceptions_2.UnprocessableEntityException(`You can't remove the last admin user from the role.`);
         }
     }
+    /**
+     * Make sure there's at least one active admin user when updating user status
+     */
+    async checkRemainingActiveAdmin(excludeKeys) {
+        const otherAdminUsers = await this.knex
+            .count('*', { as: 'count' })
+            .from('directus_users')
+            .whereNotIn('directus_users.id', excludeKeys)
+            .andWhere({ 'directus_roles.admin_access': true })
+            .andWhere({ 'directus_users.status': 'active' })
+            .leftJoin('directus_roles', 'directus_users.role', 'directus_roles.id')
+            .first();
+        const otherAdminUsersCount = +((otherAdminUsers === null || otherAdminUsers === void 0 ? void 0 : otherAdminUsers.count) || 0);
+        if (otherAdminUsersCount === 0) {
+            throw new exceptions_2.UnprocessableEntityException(`You can't change the active status of the last admin user.`);
+        }
+    }
     /**
      * Create a new user
      */
@@ -149,6 +166,9 @@ class UsersService extends items_1.ItemsService {
                 await this.checkRemainingAdminExistence(keys);
             }
         }
+        if (data.status !== undefined && data.status !== 'active') {
+            await this.checkRemainingActiveAdmin(keys);
+        }
         if (data.email) {
             if (keys.length > 1) {
                 throw new record_not_unique_1.RecordNotUniqueException('email', {

package/dist/services/webhooks.d.ts

@@ -1,6 +1,8 @@
 import { AbstractServiceOptions, Item, PrimaryKey, Webhook, MutationOptions } from '../types';
 import { ItemsService } from './items';
+import { Messenger } from '../messenger';
 export declare class WebhooksService extends ItemsService<Webhook> {
+    messenger: Messenger;
     constructor(options: AbstractServiceOptions);
     createOne(data: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey>;
     createMany(data: Partial<Item>[], opts?: MutationOptions): Promise<PrimaryKey[]>;