directus 9.1.2 → 9.3.0

package/dist/database/index.js

@@ -15,7 +15,7 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const lodash_1 = require("lodash");
 const util_1 = require("util");
-const geometry_1 = require("./helpers/geometry");
+const helpers_1 = require("./helpers");
 let database = null;
 let inspector = null;
 function getDatabase() {
@@ -197,11 +197,11 @@ exports.validateMigrations = validateMigrations;
  */
 async function validateDatabaseExtensions() {
     const database = getDatabase();
-    const databaseClient = getDatabaseClient(database);
-    const geometryHelper = (0, geometry_1.getGeometryHelper)(database);
-    const geometrySupport = await geometryHelper.supported();
+    const client = getDatabaseClient(database);
+    const helpers = (0, helpers_1.getHelpers)(database);
+    const geometrySupport = await helpers.st.supported();
     if (!geometrySupport) {
-        switch (databaseClient) {
+        switch (client) {
             case 'postgres':
                 logger_1.default.warn(`PostGIS isn't installed. Geometry type support will be limited.`);
                 break;
@@ -209,7 +209,7 @@ async function validateDatabaseExtensions() {
                 logger_1.default.warn(`Spatialite isn't installed. Geometry type support will be limited.`);
                 break;
             default:
-                logger_1.default.warn(`Geometry type not supported on ${databaseClient}`);
+                logger_1.default.warn(`Geometry type not supported on ${client}`);
         }
     }
 }

package/dist/database/run-ast.js

@@ -10,14 +10,14 @@ const apply_query_1 = __importDefault(require("../utils/apply-query"));
 const get_column_1 = require("../utils/get-column");
 const strip_function_1 = require("../utils/strip-function");
 const utils_1 = require("@directus/shared/utils");
-const index_1 = __importDefault(require("./index"));
-const geometry_1 = require("../database/helpers/geometry");
+const _1 = __importDefault(require("."));
+const helpers_1 = require("../database/helpers");
 /**
  * Execute a given AST using Knex. Returns array of items based on requested AST.
  */
 async function runAST(originalAST, schema, options) {
     const ast = (0, lodash_1.cloneDeep)(originalAST);
-    const knex = (options === null || options === void 0 ? void 0 : options.knex) || (0, index_1.default)();
+    const knex = (options === null || options === void 0 ? void 0 : options.knex) || (0, _1.default)();
     if (ast.type === 'm2a') {
         const results = {};
         for (const collection of ast.names) {
@@ -111,7 +111,7 @@ async function parseCurrentLevel(schema, collection, children, query) {
     return { fieldNodes, nestedCollectionNodes, primaryKeyField };
 }
 function getColumnPreprocessor(knex, schema, table) {
-    const helper = (0, geometry_1.getGeometryHelper)();
+    const helpers = (0, helpers_1.getHelpers)(knex);
     return function (fieldNode) {
         let field;
         if (fieldNode.type === 'field') {
@@ -125,7 +125,7 @@ function getColumnPreprocessor(knex, schema, table) {
             alias = fieldNode.fieldKey;
         }
         if (field.type.startsWith('geometry')) {
-            return helper.asText(table, field.field);
+            return helpers.st.asText(table, field.field);
         }
         return (0, get_column_1.getColumn)(knex, table, fieldNode.name, alias);
     };

package/dist/database/seeds/run.js

@@ -7,8 +7,9 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const js_yaml_1 = __importDefault(require("js-yaml"));
 const lodash_1 = require("lodash");
 const path_1 = __importDefault(require("path"));
-const geometry_1 = require("../helpers/geometry");
+const helpers_1 = require("../helpers");
 async function runSeed(database) {
+    const helpers = (0, helpers_1.getHelpers)(database);
     const exists = await database.schema.hasTable('directus_collections');
     if (exists) {
         throw new Error('Database is already installed');
@@ -38,8 +39,7 @@ async function runSeed(database) {
                     column = tableBuilder.string(columnName, 255);
                 }
                 else if ((_a = columnInfo.type) === null || _a === void 0 ? void 0 : _a.startsWith('geometry')) {
-                    const helper = (0, geometry_1.getGeometryHelper)();
-                    column = helper.createColumn(tableBuilder, { field: columnName, type: columnInfo.type });
+                    column = helpers.st.createColumn(tableBuilder, { field: columnName, type: columnInfo.type });
                 }
                 else {
                     // @ts-ignore

package/dist/database/system-data/fields/notifications.yaml

@@ -4,6 +4,7 @@ fields:
   - field: id
   - field: timestamp
     special: date-created
+  - field: status
   - field: recipient
   - field: sender
   - field: subject

package/dist/emitter.d.ts

@@ -1,10 +1,9 @@
 import { ActionHandler, FilterHandler, HookContext, InitHandler } from './types';
-declare class Emitter {
+export declare class Emitter {
     private filterEmitter;
     private actionEmitter;
     private initEmitter;
     constructor();
-    eventsToEmit(event: string, meta: Record<string, any>): string[];
     emitFilter<T>(event: string, payload: T, meta: Record<string, any>, context: HookContext): Promise<T>;
     emitAction(event: string, meta: Record<string, any>, context: HookContext): void;
     emitInit(event: string, meta: Record<string, any>): Promise<void>;
@@ -14,6 +13,8 @@ declare class Emitter {
     offFilter(event: string, handler: FilterHandler): void;
     offAction(event: string, handler: ActionHandler): void;
     offInit(event: string, handler: InitHandler): void;
+    offAll(): void;
+    private eventsToEmit;
 }
 declare const emitter: Emitter;
 export default emitter;

package/dist/emitter.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Emitter = void 0;
 const eventemitter2_1 = require("eventemitter2");
 const logger_1 = __importDefault(require("./logger"));
 class Emitter {
@@ -18,12 +19,6 @@ class Emitter {
         this.actionEmitter = new eventemitter2_1.EventEmitter2(emitterOptions);
         this.initEmitter = new eventemitter2_1.EventEmitter2(emitterOptions);
     }
-    eventsToEmit(event, meta) {
-        if (event.startsWith('items')) {
-            return [event, `${meta.collection}.${event}`];
-        }
-        return [event];
-    }
     async emitFilter(event, payload, meta, context) {
         const events = this.eventsToEmit(event, meta);
         const listeners = events.flatMap((event) => this.filterEmitter.listeners(event));
@@ -72,6 +67,18 @@ class Emitter {
     offInit(event, handler) {
         this.initEmitter.off(event, handler);
     }
+    offAll() {
+        this.filterEmitter.removeAllListeners();
+        this.actionEmitter.removeAllListeners();
+        this.initEmitter.removeAllListeners();
+    }
+    eventsToEmit(event, meta) {
+        if (event.startsWith('items')) {
+            return [event, `${meta.collection}.${event}`];
+        }
+        return [event];
+    }
 }
+exports.Emitter = Emitter;
 const emitter = new Emitter();
 exports.default = emitter;

package/dist/env.js

@@ -50,6 +50,7 @@ const defaults = {
     CACHE_SCHEMA: true,
     CACHE_PERMISSIONS: true,
     AUTH_PROVIDERS: '',
+    AUTH_DISABLE_DEFAULT: false,
     EXTENSIONS_PATH: './extensions',
     EMAIL_FROM: 'no-reply@directus.io',
     EMAIL_TRANSPORT: 'sendmail',

package/dist/exceptions/index.d.ts

@@ -8,9 +8,11 @@ export * from './invalid-ip';
 export * from './invalid-otp';
 export * from './invalid-payload';
 export * from './invalid-query';
+export * from './invalid-token';
 export * from './method-not-allowed';
 export * from './range-not-satisfiable';
 export * from './route-not-found';
 export * from './service-unavailable';
 export * from './unprocessable-entity';
 export * from './user-suspended';
+export * from './unexpected-response';

package/dist/exceptions/index.js

@@ -20,9 +20,11 @@ __exportStar(require("./invalid-ip"), exports);
 __exportStar(require("./invalid-otp"), exports);
 __exportStar(require("./invalid-payload"), exports);
 __exportStar(require("./invalid-query"), exports);
+__exportStar(require("./invalid-token"), exports);
 __exportStar(require("./method-not-allowed"), exports);
 __exportStar(require("./range-not-satisfiable"), exports);
 __exportStar(require("./route-not-found"), exports);
 __exportStar(require("./service-unavailable"), exports);
 __exportStar(require("./unprocessable-entity"), exports);
 __exportStar(require("./user-suspended"), exports);
+__exportStar(require("./unexpected-response"), exports);

package/dist/exceptions/invalid-token.d.ts

@@ -0,0 +1,4 @@
+import { BaseException } from '@directus/shared/exceptions';
+export declare class InvalidTokenException extends BaseException {
+    constructor(message?: string);
+}

package/dist/exceptions/invalid-token.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InvalidTokenException = void 0;
+const exceptions_1 = require("@directus/shared/exceptions");
+class InvalidTokenException extends exceptions_1.BaseException {
+    constructor(message = 'Invalid token') {
+        super(message, 403, 'INVALID_TOKEN');
+    }
+}
+exports.InvalidTokenException = InvalidTokenException;

package/dist/exceptions/unexpected-response.d.ts

@@ -0,0 +1,4 @@
+import { BaseException } from '@directus/shared/exceptions';
+export declare class UnexpectedResponseException extends BaseException {
+    constructor(message: string);
+}

package/dist/exceptions/unexpected-response.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UnexpectedResponseException = void 0;
+const exceptions_1 = require("@directus/shared/exceptions");
+class UnexpectedResponseException extends exceptions_1.BaseException {
+    constructor(message) {
+        super(message, 503, 'UNEXPECTED_RESPONSE');
+    }
+}
+exports.UnexpectedResponseException = UnexpectedResponseException;

package/dist/extensions.d.ts

@@ -7,6 +7,7 @@ declare class ExtensionManager {
     private appExtensions;
     private apiHooks;
     private apiEndpoints;
+    private apiEmitter;
     private endpointRouter;
     private isScheduleHookEnabled;
     constructor();

package/dist/extensions.js

@@ -28,9 +28,10 @@ const path_1 = __importDefault(require("path"));
 const node_1 = require("@directus/shared/utils/node");
 const constants_1 = require("@directus/shared/constants");
 const database_1 = __importDefault(require("./database"));
-const emitter_1 = __importDefault(require("./emitter"));
+const emitter_1 = __importStar(require("./emitter"));
 const env_1 = __importDefault(require("./env"));
 const exceptions = __importStar(require("./exceptions"));
+const sharedExceptions = __importStar(require("@directus/shared/exceptions"));
 const logger_1 = __importDefault(require("./logger"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const get_schema_1 = require("./utils/get-schema");
@@ -60,6 +61,7 @@ class ExtensionManager {
         this.apiHooks = [];
         this.apiEndpoints = [];
         this.isScheduleHookEnabled = true;
+        this.apiEmitter = new emitter_1.Emitter();
         this.endpointRouter = (0, express_1.Router)();
     }
     async initialize({ schedule } = { schedule: true }) {
@@ -91,6 +93,7 @@ class ExtensionManager {
         logger_1.default.info('Reloading extensions');
         this.unregisterHooks();
         this.unregisterEndpoints();
+        this.apiEmitter.offAll();
         if (env_1.default.SERVE_APP) {
             this.appExtensions = {};
         }
@@ -231,7 +234,15 @@ class ExtensionManager {
                 }
             },
         };
-        register(registerFunctions, { services, exceptions, env: env_1.default, database: (0, database_1.default)(), logger: logger_1.default, getSchema: get_schema_1.getSchema });
+        register(registerFunctions, {
+            services,
+            exceptions: { ...exceptions, ...sharedExceptions },
+            env: env_1.default,
+            database: (0, database_1.default)(),
+            emitter: this.apiEmitter,
+            logger: logger_1.default,
+            getSchema: get_schema_1.getSchema,
+        });
     }
     registerEndpoint(endpoint, router) {
         const endpointPath = path_1.default.resolve(endpoint.path, endpoint.entrypoint || '');
@@ -241,7 +252,15 @@ class ExtensionManager {
         const routeName = typeof mod === 'function' ? endpoint.name : mod.id;
         const scopedRouter = express_1.default.Router();
         router.use(`/${routeName}`, scopedRouter);
-        register(scopedRouter, { services, exceptions, env: env_1.default, database: (0, database_1.default)(), logger: logger_1.default, getSchema: get_schema_1.getSchema });
+        register(scopedRouter, {
+            services,
+            exceptions: { ...exceptions, ...sharedExceptions },
+            env: env_1.default,
+            database: (0, database_1.default)(),
+            emitter: this.apiEmitter,
+            logger: logger_1.default,
+            getSchema: get_schema_1.getSchema,
+        });
         this.apiEndpoints.push({
             path: endpointPath,
         });

package/dist/middleware/sanitize-query.js

@@ -6,7 +6,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const sanitize_query_1 = require("../utils/sanitize-query");
 const validate_query_1 = require("../utils/validate-query");
-const sanitizeQueryMiddleware = (req, res, next) => {
+const sanitizeQueryMiddleware = (req, _res, next) => {
     req.sanitizedQuery = {};
     if (!req.query)
         return;

package/dist/services/activity.js

@@ -15,6 +15,7 @@ const logger_1 = __importDefault(require("../logger"));
 const user_name_1 = require("../utils/user-name");
 const lodash_1 = require("lodash");
 const env_1 = __importDefault(require("../env"));
+const uuid_validate_1 = __importDefault(require("uuid-validate"));
 class ActivityService extends index_1.ItemsService {
     constructor(options) {
         super('directus_activity', options);
@@ -55,9 +56,13 @@ class ActivityService extends index_1.ItemsService {
                     }, {});
                     let comment = data.comment;
                     for (const mention of mentions) {
-                        comment = comment.replace(mention, (_h = userPreviews[mention.substring(1)]) !== null && _h !== void 0 ? _h : '@Unknown User');
+                        const uuid = mention.substring(1);
+                        // We only match on UUIDs in the first place. This is just an extra sanity check
+                        if ((0, uuid_validate_1.default)(uuid) === false)
+                            continue;
+                        comment = comment.replace(new RegExp(mention, 'gm'), (_h = userPreviews[uuid]) !== null && _h !== void 0 ? _h : '@Unknown User');
                     }
-                    comment = `> ${comment}`;
+                    comment = `> ${comment.replace(/\n+/gm, '\n> ')}`;
                     const message = `
 Hello ${(0, user_name_1.userName)(user)},
 

package/dist/services/assets.js

@@ -34,6 +34,7 @@ const exceptions_1 = require("../exceptions");
 const storage_1 = __importDefault(require("../storage"));
 const authorization_1 = require("./authorization");
 const TransformationUtils = __importStar(require("../utils/transformations"));
+const uuid_validate_1 = __importDefault(require("uuid-validate"));
 sharp_1.default.concurrency(1);
 // Note: don't put this in the service. The service can be initialized in multiple places, but they
 // should all share the same semaphore instance.
@@ -54,7 +55,20 @@ class AssetsService {
         if (systemPublicKeys.includes(id) === false && ((_a = this.accountability) === null || _a === void 0 ? void 0 : _a.admin) !== true) {
             await this.authorizationService.checkAccess('read', 'directus_files', id);
         }
+        /**
+         * This is a little annoying. Postgres will error out if you're trying to search in `where`
+         * with a wrong type. In case of directus_files where id is a uuid, we'll have to verify the
+         * validity of the uuid ahead of time.
+         */
+        const isValidUUID = (0, uuid_validate_1.default)(id, 4);
+        if (isValidUUID === false)
+            throw new exceptions_1.ForbiddenException();
         const file = (await this.knex.select('*').from('directus_files').where({ id }).first());
+        if (!file)
+            throw new exceptions_1.ForbiddenException();
+        const { exists } = await storage_1.default.disk(file.storage).exists(file.filename_disk);
+        if (!exists)
+            throw new exceptions_1.ForbiddenException();
         if (range) {
             if (range.start >= file.filesize || (range.end && range.end >= file.filesize)) {
                 throw new exceptions_1.RangeNotSatisfiableException(range);

package/dist/services/fields.d.ts

@@ -6,9 +6,11 @@ import { PayloadService } from '../services/payload';
 import { AbstractServiceOptions, SchemaOverview } from '../types';
 import { Accountability } from '@directus/shared/types';
 import { Field, RawField, Type } from '@directus/shared/types';
+import { Helpers } from '../database/helpers';
 import Keyv from 'keyv';
 export declare class FieldsService {
     knex: Knex;
+    helpers: Helpers;
     accountability: Accountability | null;
     itemsService: ItemsService;
     payloadService: PayloadService;

package/dist/services/fields.js

@@ -39,10 +39,11 @@ const get_local_type_1 = __importDefault(require("../utils/get-local-type"));
 const utils_1 = require("@directus/shared/utils");
 const lodash_1 = require("lodash");
 const relations_1 = require("./relations");
-const geometry_1 = require("../database/helpers/geometry");
+const helpers_1 = require("../database/helpers");
 class FieldsService {
     constructor(options) {
         this.knex = options.knex || (0, database_1.default)();
+        this.helpers = (0, helpers_1.getHelpers)(this.knex);
         this.schemaInspector = options.knex ? (0, schema_1.default)(options.knex) : (0, database_1.getSchemaInspector)();
         this.accountability = options.accountability || null;
         this.itemsService = new items_1.ItemsService('directus_fields', options);
@@ -211,23 +212,39 @@ class FieldsService {
                 accountability: this.accountability,
                 schema: this.schema,
             });
-            if (field.type && constants_1.ALIAS_TYPES.includes(field.type) === false) {
+            const hookAdjustedField = await emitter_1.default.emitFilter(`fields.create`, field, {
+                collection: collection,
+            }, {
+                database: trx,
+                schema: this.schema,
+                accountability: this.accountability,
+            });
+            if (hookAdjustedField.type && constants_1.ALIAS_TYPES.includes(hookAdjustedField.type) === false) {
                 if (table) {
-                    this.addColumnToTable(table, field);
+                    this.addColumnToTable(table, hookAdjustedField);
                 }
                 else {
                     await trx.schema.alterTable(collection, (table) => {
-                        this.addColumnToTable(table, field);
+                        this.addColumnToTable(table, hookAdjustedField);
                     });
                 }
             }
-            if (field.meta) {
+            if (hookAdjustedField.meta) {
                 await itemsService.createOne({
-                    ...field.meta,
+                    ...hookAdjustedField.meta,
                     collection: collection,
-                    field: field.field,
-                });
+                    field: hookAdjustedField.field,
+                }, { emitEvents: false });
             }
+            emitter_1.default.emitAction(`fields.create`, {
+                payload: hookAdjustedField,
+                key: hookAdjustedField.field,
+                collection: collection,
+            }, {
+                database: (0, database_1.default)(),
+                schema: this.schema,
+                accountability: this.accountability,
+            });
         });
         if (this.cache && env_1.default.CACHE_AUTO_PURGE) {
             await this.cache.clear();
@@ -238,12 +255,23 @@ class FieldsService {
         if (this.accountability && this.accountability.admin !== true) {
             throw new exceptions_1.ForbiddenException();
         }
-        if (field.schema) {
-            const existingColumn = await this.schemaInspector.columnInfo(collection, field.field);
-            if (!(0, lodash_1.isEqual)(existingColumn, field.schema)) {
+        const hookAdjustedField = await emitter_1.default.emitFilter(`fields.update`, field, {
+            keys: [field.field],
+            collection: collection,
+        }, {
+            database: this.knex,
+            schema: this.schema,
+            accountability: this.accountability,
+        });
+        const record = field.meta
+            ? await this.knex.select('id').from('directus_fields').where({ collection, field: field.field }).first()
+            : null;
+        if (hookAdjustedField.schema) {
+            const existingColumn = await this.schemaInspector.columnInfo(collection, hookAdjustedField.field);
+            if (!(0, lodash_1.isEqual)(existingColumn, hookAdjustedField.schema)) {
                 try {
                     await this.knex.schema.alterTable(collection, (table) => {
-                        if (!field.schema)
+                        if (!hookAdjustedField.schema)
                             return;
                         this.addColumnToTable(table, field, existingColumn);
                     });
@@ -253,31 +281,35 @@ class FieldsService {
                 }
             }
         }
-        if (field.meta) {
-            const record = await this.knex
-                .select('id')
-                .from('directus_fields')
-                .where({ collection, field: field.field })
-                .first();
+        if (hookAdjustedField.meta) {
             if (record) {
                 await this.itemsService.updateOne(record.id, {
-                    ...field.meta,
+                    ...hookAdjustedField.meta,
                     collection: collection,
-                    field: field.field,
-                });
+                    field: hookAdjustedField.field,
+                }, { emitEvents: false });
             }
             else {
                 await this.itemsService.createOne({
-                    ...field.meta,
+                    ...hookAdjustedField.meta,
                     collection: collection,
-                    field: field.field,
-                });
+                    field: hookAdjustedField.field,
+                }, { emitEvents: false });
             }
         }
         if (this.cache && env_1.default.CACHE_AUTO_PURGE) {
             await this.cache.clear();
         }
         await this.systemCache.clear();
+        emitter_1.default.emitAction(`fields.update`, {
+            payload: hookAdjustedField,
+            keys: [hookAdjustedField.field],
+            collection: collection,
+        }, {
+            database: (0, database_1.default)(),
+            schema: this.schema,
+            accountability: this.accountability,
+        });
         return field.field;
     }
     async deleteField(collection, field) {
@@ -402,8 +434,7 @@ class FieldsService {
             column = table.timestamp(field.field, { useTz: true });
         }
         else if (field.type.startsWith('geometry')) {
-            const helper = (0, geometry_1.getGeometryHelper)();
-            column = helper.createColumn(table, field);
+            column = this.helpers.st.createColumn(table, field);
         }
         else {
             // @ts-ignore

package/dist/services/files.d.ts

@@ -9,7 +9,7 @@ export declare class FilesService extends ItemsService {
     uploadOne(stream: NodeJS.ReadableStream, data: Partial<File> & {
         filename_download: string;
         storage: string;
-    }, primaryKey?: PrimaryKey): Promise<PrimaryKey>;
+    }, primaryKey?: PrimaryKey, opts?: MutationOptions): Promise<PrimaryKey>;
     /**
      * Import a single file from an external URL
      */

package/dist/services/files.js

@@ -26,7 +26,7 @@ class FilesService extends items_1.ItemsService {
     /**
      * Upload a single new file to the configured storage adapter
      */
-    async uploadOne(stream, data, primaryKey) {
+    async uploadOne(stream, data, primaryKey, opts) {
         var _a, _b, _c, _d, _e, _f;
         const payload = (0, lodash_1.clone)(data);
         if ('folder' in payload === false) {
@@ -64,14 +64,20 @@ class FilesService extends items_1.ItemsService {
         payload.filesize = size;
         if (['image/jpeg', 'image/png', 'image/webp', 'image/gif', 'image/tiff'].includes(payload.type)) {
             const buffer = await storage_1.default.disk(data.storage).getBuffer(payload.filename_disk);
-            const meta = await (0, sharp_1.default)(buffer.content, {}).metadata();
-            if (meta.orientation && meta.orientation >= 5) {
-                payload.height = meta.width;
-                payload.width = meta.height;
+            try {
+                const meta = await (0, sharp_1.default)(buffer.content, {}).metadata();
+                if (meta.orientation && meta.orientation >= 5) {
+                    payload.height = meta.width;
+                    payload.width = meta.height;
+                }
+                else {
+                    payload.width = meta.width;
+                    payload.height = meta.height;
+                }
             }
-            else {
-                payload.width = meta.width;
-                payload.height = meta.height;
+            catch (err) {
+                logger_1.default.warn(`Couldn't extract sharp metadata from file`);
+                logger_1.default.warn(err);
             }
             payload.metadata = {};
             try {
@@ -95,7 +101,7 @@ class FilesService extends items_1.ItemsService {
                 }
             }
             catch (err) {
-                logger_1.default.warn(`Couldn't extract metadata from file`);
+                logger_1.default.warn(`Couldn't extract EXIF metadata from file`);
                 logger_1.default.warn(err);
             }
         }
@@ -109,15 +115,17 @@ class FilesService extends items_1.ItemsService {
         if (this.cache && env_1.default.CACHE_AUTO_PURGE) {
             await this.cache.clear();
         }
-        emitter_1.default.emitAction('files.upload', {
-            payload,
-            key: primaryKey,
-            collection: this.collection,
-        }, {
-            database: this.knex,
-            schema: this.schema,
-            accountability: this.accountability,
-        });
+        if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false) {
+            emitter_1.default.emitAction('files.upload', {
+                payload,
+                key: primaryKey,
+                collection: this.collection,
+            }, {
+                database: this.knex,
+                schema: this.schema,
+                accountability: this.accountability,
+            });
+        }
         return primaryKey;
     }
     /**
@@ -126,7 +134,7 @@ class FilesService extends items_1.ItemsService {
     async importOne(importURL, body) {
         var _a, _b, _c;
         const fileCreatePermissions = (_b = (_a = this.accountability) === null || _a === void 0 ? void 0 : _a.permissions) === null || _b === void 0 ? void 0 : _b.find((permission) => permission.collection === 'directus_files' && permission.action === 'create');
-        if (((_c = this.accountability) === null || _c === void 0 ? void 0 : _c.admin) !== true && !fileCreatePermissions) {
+        if (this.accountability && ((_c = this.accountability) === null || _c === void 0 ? void 0 : _c.admin) !== true && !fileCreatePermissions) {
             throw new exceptions_1.ForbiddenException();
         }
         let fileResponse;

package/dist/services/graphql.js

@@ -726,6 +726,9 @@ class GraphQLService {
                     args: {
                         groupBy: new graphql_1.GraphQLList(graphql_1.GraphQLString),
                         filter: ReadableCollectionFilterTypes[collection.collection],
+                        limit: {
+                            type: graphql_1.GraphQLInt,
+                        },
                         search: {
                             type: graphql_1.GraphQLString,
                         },