directus 9.8.0 → 9.10.0

package/dist/services/graphql.js

@@ -5,20 +5,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GraphQLService = exports.GraphQLDate = exports.GraphQLGeoJSON = void 0;
 const argon2_1 = __importDefault(require("argon2"));
-const validate_query_1 = require("../utils/validate-query");
 const graphql_1 = require("graphql");
 const graphql_compose_1 = require("graphql-compose");
 const lodash_1 = require("lodash");
 const ms_1 = __importDefault(require("ms"));
 const cache_1 = require("../cache");
+const constants_1 = require("../constants");
 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");
 const sanitize_query_1 = require("../utils/sanitize-query");
+const validate_query_1 = require("../utils/validate-query");
 const activity_1 = require("./activity");
 const authentication_1 = require("./authentication");
 const collections_1 = require("./collections");
@@ -26,9 +28,9 @@ const fields_1 = require("./fields");
 const files_1 = require("./files");
 const folders_1 = require("./folders");
 const items_1 = require("./items");
+const notifications_1 = require("./notifications");
 const permissions_1 = require("./permissions");
 const presets_1 = require("./presets");
-const notifications_1 = require("./notifications");
 const relations_1 = require("./relations");
 const revisions_1 = require("./revisions");
 const roles_1 = require("./roles");
@@ -40,8 +42,6 @@ const tfa_1 = require("./tfa");
 const users_1 = require("./users");
 const utils_1 = require("./utils");
 const webhooks_1 = require("./webhooks");
-const generate_hash_1 = require("../utils/generate-hash");
-const constants_1 = require("../constants");
 const GraphQLVoid = new graphql_1.GraphQLScalarType({
     name: 'Void',
     description: 'Represents NULL values',
@@ -89,7 +89,16 @@ class GraphQLService {
     async execute({ document, variables, operationName, contextValue, }) {
         var _a;
         const schema = this.getSchema();
-        const validationErrors = (0, graphql_1.validate)(schema, document, graphql_1.specifiedRules);
+        const validationErrors = (0, graphql_1.validate)(schema, document, [
+            ...graphql_1.specifiedRules,
+            (context) => ({
+                Field(node) {
+                    if (env_1.default.GRAPHQL_INTROSPECTION === false && (node.name.value === '__schema' || node.name.value === '__type')) {
+                        context.reportError(new graphql_1.GraphQLError('GraphQL introspection is not allowed. The query contained __schema or __type.', [node]));
+                    }
+                },
+            }),
+        ]);
         if (validationErrors.length > 0) {
             throw new exceptions_1.GraphQLValidationException({ graphqlErrors: validationErrors });
         }
@@ -235,6 +244,14 @@ class GraphQLService {
         function getTypes(action) {
             var _a, _b, _c, _d, _e;
             const CollectionTypes = {};
+            const CountFunctions = schemaComposer.createObjectTC({
+                name: 'count_functions',
+                fields: {
+                    count: {
+                        type: graphql_1.GraphQLInt,
+                    },
+                },
+            });
             const DateFunctions = schemaComposer.createObjectTC({
                 name: 'date_functions',
                 fields: {
@@ -328,6 +345,15 @@ class GraphQLService {
                                 },
                             };
                         }
+                        if (field.type === 'json' || field.type === 'alias') {
+                            acc[`${field.field}_func`] = {
+                                type: CountFunctions,
+                                resolve: (obj) => {
+                                    const funcFields = Object.keys(CountFunctions.getFields()).map((key) => `${field.field}_${key}`);
+                                    return (0, lodash_1.mapKeys)((0, lodash_1.pick)(obj, funcFields), (_value, key) => key.substring(field.field.length + 1));
+                                },
+                            };
+                        }
                         return acc;
                     }, {}),
                 });
@@ -550,6 +576,14 @@ class GraphQLService {
                     },
                 },
             });
+            const CountFunctionFilterOperators = schemaComposer.createInputTC({
+                name: 'count_function_filter_operators',
+                fields: {
+                    count: {
+                        type: NumberFilterOperators,
+                    },
+                },
+            });
             const DateFunctionFilterOperators = schemaComposer.createInputTC({
                 name: 'date_function_filter_operators',
                 fields: {
@@ -634,6 +668,11 @@ class GraphQLService {
                                 type: DateTimeFunctionFilterOperators,
                             };
                         }
+                        if (field.type === 'json' || field.type === 'alias') {
+                            acc[`${field.field}_func`] = {
+                                type: CountFunctionFilterOperators,
+                            };
+                        }
                         return acc;
                     }, {}),
                 });
@@ -1145,6 +1184,7 @@ class GraphQLService {
                     continue;
                 selection = selection;
                 let current;
+                let currentAlias = null;
                 // Union type (Many-to-Any)
                 if (selection.kind === 'InlineFragment') {
                     if (selection.typeCondition.name.value.startsWith('__'))
@@ -1157,8 +1197,20 @@ class GraphQLService {
                     if (selection.name.value.startsWith('__'))
                         continue;
                     current = selection.name.value;
+                    if (selection.alias) {
+                        currentAlias = selection.alias.value;
+                    }
                     if (parent) {
                         current = `${parent}.${current}`;
+                        if (currentAlias) {
+                            currentAlias = `${parent}.${currentAlias}`;
+                            // add nested aliases into deep query
+                            if (selection.selectionSet) {
+                                if (!query.deep)
+                                    query.deep = {};
+                                (0, lodash_1.set)(query.deep, parent, (0, lodash_1.merge)((0, lodash_1.get)(query.deep, parent), { _alias: { [selection.alias.value]: selection.name.value } }));
+                            }
+                        }
                     }
                 }
                 if (selection.selectionSet) {
@@ -1173,7 +1225,7 @@ class GraphQLService {
                         }
                     }
                     else {
-                        children = parseFields(selection.selectionSet.selections, current);
+                        children = parseFields(selection.selectionSet.selections, currentAlias !== null && currentAlias !== void 0 ? currentAlias : current);
                     }
                     fields.push(...children);
                 }
@@ -1244,8 +1296,10 @@ class GraphQLService {
      */
     formatError(error) {
         if (Array.isArray(error)) {
+            error[0].extensions.code = error[0].code;
             return new graphql_1.GraphQLError(error[0].message, undefined, undefined, undefined, undefined, error[0]);
         }
+        error.extensions.code = error.code;
         return new graphql_1.GraphQLError(error.message, undefined, undefined, undefined, undefined, error);
     }
     /**
@@ -1308,7 +1362,7 @@ class GraphQLService {
         return result;
     }
     injectSystemResolvers(schemaComposer, { CreateCollectionTypes, ReadCollectionTypes, UpdateCollectionTypes, DeleteCollectionTypes, }, schema) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         const AuthTokens = schemaComposer.createObjectTC({
             name: 'auth_tokens',
             fields: {
@@ -2131,7 +2185,7 @@ class GraphQLService {
                 },
             });
         }
-        if ('directus_users' in schema.update.collections) {
+        if ('directus_users' in schema.update.collections && ((_c = this.accountability) === null || _c === void 0 ? void 0 : _c.user)) {
             schemaComposer.Mutation.addFields({
                 update_users_me: {
                     type: ReadCollectionTypes['directus_users'],
@@ -2160,7 +2214,7 @@ class GraphQLService {
         if ('directus_activity' in schema.create.collections) {
             schemaComposer.Mutation.addFields({
                 create_comment: {
-                    type: (_c = ReadCollectionTypes['directus_activity']) !== null && _c !== void 0 ? _c : graphql_1.GraphQLBoolean,
+                    type: (_d = ReadCollectionTypes['directus_activity']) !== null && _d !== void 0 ? _d : graphql_1.GraphQLBoolean,
                     args: {
                         collection: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
                         item: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLID),
@@ -2192,7 +2246,7 @@ class GraphQLService {
         if ('directus_activity' in schema.update.collections) {
             schemaComposer.Mutation.addFields({
                 update_comment: {
-                    type: (_d = ReadCollectionTypes['directus_activity']) !== null && _d !== void 0 ? _d : graphql_1.GraphQLBoolean,
+                    type: (_e = ReadCollectionTypes['directus_activity']) !== null && _e !== void 0 ? _e : graphql_1.GraphQLBoolean,
                     args: {
                         id: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLID),
                         comment: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
@@ -2235,7 +2289,7 @@ class GraphQLService {
         if ('directus_files' in schema.create.collections) {
             schemaComposer.Mutation.addFields({
                 import_file: {
-                    type: (_e = ReadCollectionTypes['directus_files']) !== null && _e !== void 0 ? _e : graphql_1.GraphQLBoolean,
+                    type: (_f = ReadCollectionTypes['directus_files']) !== null && _f !== void 0 ? _f : graphql_1.GraphQLBoolean,
                     args: {
                         url: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
                         data: (0, graphql_compose_1.toInputObjectType)(CreateCollectionTypes['directus_files']).setTypeName('create_directus_files_input'),

package/dist/services/import-export.js

@@ -22,6 +22,7 @@ const get_date_formatted_1 = require("../utils/get-date-formatted");
 const utils_1 = require("@directus/shared/utils");
 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)();
@@ -91,6 +92,7 @@ class ImportService {
             });
             return new Promise((resolve, reject) => {
                 stream
+                    .pipe((0, strip_bom_stream_1.default)())
                     .pipe((0, csv_parser_1.default)())
                     .on('data', (value) => {
                     const obj = (0, lodash_1.transform)(value, (result, value, key) => {

package/dist/services/items.js

@@ -90,8 +90,13 @@ class ItemsService {
             // In case of manual string / UUID primary keys, the PK already exists in the object we're saving.
             let primaryKey = payloadWithTypeCasting[primaryKeyField];
             try {
-                const result = await trx.insert(payloadWithoutAliases).into(this.collection).returning(primaryKeyField);
-                primaryKey = primaryKey !== null && primaryKey !== void 0 ? primaryKey : result[0];
+                const result = await trx
+                    .insert(payloadWithoutAliases)
+                    .into(this.collection)
+                    .returning(primaryKeyField)
+                    .then((result) => result[0]);
+                const returnedKey = typeof result === 'object' ? result[primaryKeyField] : result;
+                primaryKey = primaryKey !== null && primaryKey !== void 0 ? primaryKey : returnedKey;
             }
             catch (err) {
                 throw await (0, translate_1.translateDatabaseError)(err);
@@ -354,13 +359,14 @@ class ItemsService {
                         knex: trx,
                         schema: this.schema,
                     });
-                    const revisionIDs = await revisionsService.createMany(await Promise.all(activity.map(async (activity, index) => ({
+                    const revisions = (await Promise.all(activity.map(async (activity, index) => ({
                         activity: activity,
                         collection: this.collection,
                         item: keys[index],
                         data: snapshots && Array.isArray(snapshots) ? JSON.stringify(snapshots[index]) : JSON.stringify(snapshots),
                         delta: await payloadService.prepareDelta(payloadWithTypeCasting),
-                    }))));
+                    })))).filter((revision) => revision.delta);
+                    const revisionIDs = await revisionsService.createMany(revisions);
                     for (let i = 0; i < revisionIDs.length; i++) {
                         const revisionID = revisionIDs[i];
                         if (opts === null || opts === void 0 ? void 0 : opts.onRevisionCreate) {
@@ -529,7 +535,8 @@ class ItemsService {
                     defaults[name] = null;
                     continue;
                 }
-                defaults[name] = field.defaultValue;
+                if (field.defaultValue)
+                    defaults[name] = field.defaultValue;
             }
             return defaults;
         }

package/dist/services/payload.d.ts

@@ -10,6 +10,7 @@ declare type Transformers = {
         payload: Partial<Item>;
         accountability: Accountability | null;
         specials: string[];
+        helpers: Helpers;
     }) => Promise<any>;
 };
 /**
@@ -64,6 +65,6 @@ export declare class PayloadService {
      * Transforms the input partial payload to match the output structure, to have consistency
      * between delta and data
      */
-    prepareDelta(data: Partial<Item>): Promise<string>;
+    prepareDelta(data: Partial<Item>): Promise<string | null>;
 }
 export {};

package/dist/services/payload.js

@@ -89,14 +89,14 @@ class PayloadService {
                     return (accountability === null || accountability === void 0 ? void 0 : accountability.role) || null;
                 return value;
             },
-            async 'date-created'({ action, value }) {
+            async 'date-created'({ action, value, helpers }) {
                 if (action === 'create')
-                    return new Date();
+                    return new Date(helpers.date.writeTimestamp(new Date().toISOString()));
                 return value;
             },
-            async 'date-updated'({ action, value }) {
+            async 'date-updated'({ action, value, helpers }) {
                 if (action === 'update')
-                    return new Date();
+                    return new Date(helpers.date.writeTimestamp(new Date().toISOString()));
                 return value;
             },
             async 'cast-csv'({ action, value }) {
@@ -181,6 +181,7 @@ class PayloadService {
                     payload,
                     accountability,
                     specials: fieldSpecials,
+                    helpers: this.helpers,
                 });
             }
         }
@@ -233,21 +234,23 @@ class PayloadService {
                         value = new Date(value);
                     }
                     if (dateColumn.type === 'timestamp') {
-                        const newValue = value.toISOString();
+                        const newValue = this.helpers.date.readTimestampString(value.toISOString());
                         payload[name] = newValue;
                     }
                     if (dateColumn.type === 'dateTime') {
-                        const year = String(value.getUTCFullYear());
-                        const month = String(value.getUTCMonth() + 1).padStart(2, '0');
-                        const date = String(value.getUTCDate()).padStart(2, '0');
-                        const hours = String(value.getUTCHours()).padStart(2, '0');
-                        const minutes = String(value.getUTCMinutes()).padStart(2, '0');
-                        const seconds = String(value.getUTCSeconds()).padStart(2, '0');
-                        const newValue = `${year}-${month}-${date}T${hours}:${minutes}:${seconds}`;
+                        const year = String(value.getFullYear());
+                        const month = String(value.getMonth() + 1).padStart(2, '0');
+                        const day = String(value.getDate()).padStart(2, '0');
+                        const hours = String(value.getHours()).padStart(2, '0');
+                        const minutes = String(value.getMinutes()).padStart(2, '0');
+                        const seconds = String(value.getSeconds()).padStart(2, '0');
+                        const newValue = `${year}-${month}-${day}T${hours}:${minutes}:${seconds}`;
                         payload[name] = newValue;
                     }
                     if (dateColumn.type === 'date') {
-                        const [year, month, day] = value.toISOString().slice(0, 10).split('-');
+                        const year = String(value.getFullYear());
+                        const month = String(value.getMonth() + 1).padStart(2, '0');
+                        const day = String(value.getDate()).padStart(2, '0');
                         // Strip off the time / timezone information from a date-only value
                         const newValue = `${year}-${month}-${day}`;
                         payload[name] = newValue;
@@ -258,16 +261,16 @@ class PayloadService {
                         if (dateColumn.type === 'date') {
                             const [date] = value.split('T');
                             const [year, month, day] = date.split('-');
-                            payload[name] = new Date(Date.UTC(Number(year), Number(month) - 1, Number(day)));
+                            payload[name] = new Date(Number(year), Number(month) - 1, Number(day));
                         }
                         if (dateColumn.type === 'dateTime') {
                             const [date, time] = value.split('T');
                             const [year, month, day] = date.split('-');
                             const [hours, minutes, seconds] = time.substring(0, 8).split(':');
-                            payload[name] = new Date(Date.UTC(Number(year), Number(month) - 1, Number(day), Number(hours), Number(minutes), Number(seconds)));
+                            payload[name] = new Date(Number(year), Number(month) - 1, Number(day), Number(hours), Number(minutes), Number(seconds));
                         }
                         if (dateColumn.type === 'timestamp') {
-                            const newValue = (0, date_fns_1.parseISO)(value);
+                            const newValue = this.helpers.date.writeTimestamp(value);
                             payload[name] = newValue;
                         }
                     }
@@ -315,7 +318,7 @@ class PayloadService {
             }
             const allowedCollections = relation.meta.one_allowed_collections;
             if (allowedCollections.includes(relatedCollection) === false) {
-                throw new exceptions_1.InvalidPayloadException(`"${relation.collection}.${relation.field}" can't be linked to collection "${relatedCollection}`);
+                throw new exceptions_1.InvalidPayloadException(`"${relation.collection}.${relation.field}" can't be linked to collection "${relatedCollection}"`);
             }
             const itemsService = new items_1.ItemsService(relatedCollection, {
                 accountability: this.accountability,
@@ -575,6 +578,8 @@ class PayloadService {
             }
         }
         payload = await this.processValues('read', payload);
+        if (Object.keys(payload).length === 0)
+            return null;
         return JSON.stringify(payload);
     }
 }

package/dist/services/specifications.js

@@ -315,9 +315,7 @@ class OASSpecsService {
                                                     schema: {
                                                         properties: {
                                                             data: {
-                                                                items: {
-                                                                    $ref: `#/components/schemas/${tag.name}`,
-                                                                },
+                                                                $ref: `#/components/schemas/${tag.name}`,
                                                             },
                                                         },
                                                     },

package/dist/services/users.js

@@ -140,8 +140,11 @@ class UsersService extends items_1.ItemsService {
      * Update many users by primary key
      */
     async updateMany(keys, data, opts) {
+        var _a, _b;
         if (data.role) {
-            const newRole = await this.knex.select('admin_access').from('directus_roles').where('id', data.role).first();
+            // data.role will be an object with id with GraphQL mutations
+            const roleId = (_b = (_a = data.role) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : data.role;
+            const newRole = await this.knex.select('admin_access').from('directus_roles').where('id', roleId).first();
             if (!(newRole === null || newRole === void 0 ? void 0 : newRole.admin_access)) {
                 await this.checkRemainingAdminExistence(keys);
             }

package/dist/types/files.d.ts

@@ -19,3 +19,11 @@ export declare type File = {
     tags: string | null;
     metadata: Record<string, any> | null;
 };
+export declare type Metadata = {
+    height?: number | undefined;
+    width?: number | undefined;
+    description?: string | undefined;
+    title?: string | undefined;
+    tags?: any | undefined;
+    metadata?: any | undefined;
+};

package/dist/utils/apply-query.d.ts

@@ -1,9 +1,10 @@
-import { Knex } from 'knex';
 import { Aggregate, Filter, Query, SchemaOverview } from '@directus/shared/types';
+import { Knex } from 'knex';
 /**
  * Apply the Query to a given Knex query builder instance
  */
 export default function applyQuery(knex: Knex, collection: string, dbQuery: Knex.QueryBuilder, query: Query, schema: SchemaOverview, subQuery?: boolean): Knex.QueryBuilder;
+export declare function applySort(knex: Knex, schema: SchemaOverview, rootQuery: Knex.QueryBuilder, rootSort: string[], collection: string, subQuery?: boolean): void;
 export declare function applyFilter(knex: Knex, schema: SchemaOverview, rootQuery: Knex.QueryBuilder, rootFilter: Filter, collection: string, subQuery?: boolean): Knex.QueryBuilder<any, any>;
 export declare function applySearch(schema: SchemaOverview, dbQuery: Knex.QueryBuilder, searchQuery: string, collection: string): Promise<void>;
 export declare function applyAggregate(dbQuery: Knex.QueryBuilder, aggregate: Aggregate, collection: string): void;