directus 9.13.0 → 9.14.0

package/dist/app.js

@@ -173,13 +173,18 @@ async function createApp() {
         // Set the App's base path according to the APIs public URL
         const html = await fs_extra_1.default.readFile(adminPath, 'utf8');
         const htmlWithBase = html.replace(/<base \/>/, `<base href="${adminUrl.toString({ rootRelative: true })}/" />`);
-        const noCacheIndexHtmlHandler = (_req, res) => {
+        const sendHtml = (_req, res) => {
             res.setHeader('Cache-Control', 'no-cache');
+            res.setHeader('Vary', 'Origin, Cache-Control');
             res.send(htmlWithBase);
         };
-        app.get('/admin', noCacheIndexHtmlHandler);
-        app.use('/admin', express_1.default.static(path_1.default.join(adminPath, '..')));
-        app.use('/admin/*', noCacheIndexHtmlHandler);
+        const setStaticHeaders = (res) => {
+            res.setHeader('Cache-Control', 'max-age=31536000, immutable');
+            res.setHeader('Vary', 'Origin, Cache-Control');
+        };
+        app.get('/admin', sendHtml);
+        app.use('/admin', express_1.default.static(path_1.default.join(adminPath, '..'), { setHeaders: setStaticHeaders }));
+        app.use('/admin/*', sendHtml);
     }
     // use the rate limiter - all routes for now
     if (env_1.default.RATE_LIMITER_ENABLED === true) {

package/dist/auth/drivers/openid.js

@@ -51,7 +51,10 @@ class OpenIDAuthDriver extends local_1.LocalAuthDriver {
                     ...clientOptionsOverrides,
                 }));
             })
-                .catch(reject);
+                .catch((e) => {
+                logger_1.default.error(e, '[OpenID] Failed to fetch provider config');
+                process.exit(1);
+            });
         });
     }
     generateCodeVerifier() {

package/dist/controllers/files.js

@@ -32,7 +32,7 @@ const multipartHandler = (req, res, next) => {
             'content-type': 'application/octet-stream',
         };
     }
-    const busboy = (0, busboy_1.default)({ headers });
+    const busboy = (0, busboy_1.default)({ headers, defParamCharset: 'utf8' });
     const savedFiles = [];
     const service = new services_1.FilesService({ accountability: req.accountability, schema: req.schema });
     const existingPrimaryKey = req.params.pk || undefined;

package/dist/emitter.js

@@ -21,12 +21,17 @@ class Emitter {
     }
     async emitFilter(event, payload, meta, context) {
         const events = Array.isArray(event) ? event : [event];
-        const listeners = events.flatMap((event) => this.filterEmitter.listeners(event));
+        const eventListeners = events.map((event) => ({
+            event,
+            listeners: this.filterEmitter.listeners(event),
+        }));
         let updatedPayload = payload;
-        for (const listener of listeners) {
-            const result = await listener(updatedPayload, meta, context);
-            if (result !== undefined) {
-                updatedPayload = result;
+        for (const { event, listeners } of eventListeners) {
+            for (const listener of listeners) {
+                const result = await listener(updatedPayload, { event, ...meta }, context);
+                if (result !== undefined) {
+                    updatedPayload = result;
+                }
             }
         }
         return updatedPayload;
@@ -34,7 +39,7 @@ class Emitter {
     emitAction(event, meta, context) {
         const events = Array.isArray(event) ? event : [event];
         for (const event of events) {
-            this.actionEmitter.emitAsync(event, meta, context).catch((err) => {
+            this.actionEmitter.emitAsync(event, { event, ...meta }, context).catch((err) => {
                 logger_1.default.warn(`An error was thrown while executing action "${event}"`);
                 logger_1.default.warn(err);
             });
@@ -42,7 +47,7 @@ class Emitter {
     }
     async emitInit(event, meta) {
         try {
-            await this.initEmitter.emitAsync(event, meta);
+            await this.initEmitter.emitAsync(event, { event, ...meta });
         }
         catch (err) {
             logger_1.default.warn(`An error was thrown while executing init "${event}"`);

package/dist/operations/item-read/index.d.ts

@@ -3,6 +3,7 @@ declare type Options = {
     collection: string;
     key?: PrimaryKey | PrimaryKey[] | null;
     query?: Record<string, any> | string | null;
+    emitEvents: boolean;
     permissions: string;
 };
 declare const _default: import("@directus/shared/types").OperationApiConfig<Options>;

package/dist/operations/item-read/index.js

@@ -6,7 +6,7 @@ const get_accountability_for_role_1 = require("../../utils/get-accountability-fo
 const sanitize_query_1 = require("../../utils/sanitize-query");
 exports.default = (0, utils_1.defineOperationApi)({
     id: 'item-read',
-    handler: async ({ collection, key, query, permissions }, { accountability, database, getSchema }) => {
+    handler: async ({ collection, key, query, emitEvents, permissions }, { accountability, database, getSchema }) => {
         const schema = await getSchema({ database });
         let customAccountability;
         if (!permissions || permissions === '$trigger') {
@@ -35,10 +35,10 @@ exports.default = (0, utils_1.defineOperationApi)({
         else {
             const keys = (0, utils_1.toArray)(key);
             if (keys.length === 1) {
-                result = await itemsService.readOne(keys[0], sanitizedQueryObject);
+                result = await itemsService.readOne(keys[0], sanitizedQueryObject, { emitEvents });
             }
             else {
-                result = await itemsService.readMany(keys, sanitizedQueryObject);
+                result = await itemsService.readMany(keys, sanitizedQueryObject, { emitEvents });
             }
         }
         return result;

package/dist/services/import-export.js

@@ -102,7 +102,12 @@ class ImportService {
                         else {
                             try {
                                 const parsedJson = (0, utils_1.parseJSON)(value);
-                                (0, lodash_1.set)(result, key, parsedJson);
+                                if (typeof parsedJson === 'number') {
+                                    (0, lodash_1.set)(result, key, value);
+                                }
+                                else {
+                                    (0, lodash_1.set)(result, key, parsedJson);
+                                }
                             }
                             catch {
                                 (0, lodash_1.set)(result, key, value);

package/dist/services/items.d.ts

@@ -5,6 +5,7 @@ import { AbstractService, AbstractServiceOptions, Item as AnyItem, MutationOptio
 export declare type QueryOptions = {
     stripNonRequested?: boolean;
     permissionsAction?: PermissionsAction;
+    emitEvents?: boolean;
 };
 export declare class ItemsService<Item extends AnyItem = AnyItem> implements AbstractService {
     collection: string;

package/dist/services/items.js

@@ -221,23 +221,27 @@ class ItemsService {
         if (records === null) {
             throw new exceptions_1.ForbiddenException();
         }
-        const filteredRecords = await emitter_1.default.emitFilter(this.eventScope === 'items' ? ['items.read', `${this.collection}.items.read`] : `${this.eventScope}.read`, records, {
-            query,
-            collection: this.collection,
-        }, {
-            database: this.knex,
-            schema: this.schema,
-            accountability: this.accountability,
-        });
-        emitter_1.default.emitAction(this.eventScope === 'items' ? ['items.read', `${this.collection}.items.read`] : `${this.eventScope}.read`, {
-            payload: filteredRecords,
-            query,
-            collection: this.collection,
-        }, {
-            database: this.knex || (0, database_1.default)(),
-            schema: this.schema,
-            accountability: this.accountability,
-        });
+        const filteredRecords = (opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false
+            ? await emitter_1.default.emitFilter(this.eventScope === 'items' ? ['items.read', `${this.collection}.items.read`] : `${this.eventScope}.read`, records, {
+                query,
+                collection: this.collection,
+            }, {
+                database: this.knex,
+                schema: this.schema,
+                accountability: this.accountability,
+            })
+            : records;
+        if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false) {
+            emitter_1.default.emitAction(this.eventScope === 'items' ? ['items.read', `${this.collection}.items.read`] : `${this.eventScope}.read`, {
+                payload: filteredRecords,
+                query,
+                collection: this.collection,
+            }, {
+                database: this.knex || (0, database_1.default)(),
+                schema: this.schema,
+                accountability: this.accountability,
+            });
+        }
         return filteredRecords;
     }
     /**

package/dist/services/notifications.js

@@ -1,10 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NotificationsService = void 0;
 const items_1 = require("./items");
 const md_1 = require("../utils/md");
 const users_1 = require("./users");
 const mail_1 = require("./mail");
+const logger_1 = __importDefault(require("../logger"));
 class NotificationsService extends items_1.ItemsService {
     constructor(options) {
         super('directus_notifications', options);
@@ -12,29 +16,36 @@ class NotificationsService extends items_1.ItemsService {
         this.mailService = new mail_1.MailService({ schema: this.schema, accountability: this.accountability });
     }
     async createOne(data, opts) {
+        const response = await super.createOne(data, opts);
         await this.sendEmail(data);
-        return super.createOne(data, opts);
+        return response;
     }
     async createMany(data, opts) {
+        const response = await super.createMany(data, opts);
         for (const notification of data) {
             await this.sendEmail(notification);
         }
-        return super.createMany(data, opts);
+        return response;
     }
     async sendEmail(data) {
         if (data.recipient) {
             const user = await this.usersService.readOne(data.recipient, { fields: ['email', 'email_notifications'] });
             if (user.email && user.email_notifications === true) {
-                await this.mailService.send({
-                    template: {
-                        name: 'base',
-                        data: {
-                            html: data.message ? (0, md_1.md)(data.message) : '',
+                try {
+                    await this.mailService.send({
+                        template: {
+                            name: 'base',
+                            data: {
+                                html: data.message ? (0, md_1.md)(data.message) : '',
+                            },
                         },
-                    },
-                    to: user.email,
-                    subject: data.subject,
-                });
+                        to: user.email,
+                        subject: data.subject,
+                    });
+                }
+                catch (error) {
+                    logger_1.default.error(error.message);
+                }
             }
         }
     }

package/dist/services/payload.js

@@ -4,8 +4,8 @@ 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 utils_1 = require("@directus/shared/utils");
 const flat_1 = require("flat");
 const joi_1 = __importDefault(require("joi"));
 const lodash_1 = require("lodash");
@@ -259,15 +259,18 @@ class PayloadService {
                 else {
                     if (value instanceof Date === false && typeof value === 'string') {
                         if (dateColumn.type === 'date') {
-                            const [date] = value.split('T');
-                            const [year, month, day] = date.split('-');
-                            payload[name] = new Date(Number(year), Number(month) - 1, Number(day));
+                            const parsedDate = (0, date_fns_1.parseISO)(value);
+                            if (!(0, date_fns_1.isValid)(parsedDate)) {
+                                throw new exceptions_1.InvalidPayloadException(`Invalid Date format in field "${dateColumn.field}"`);
+                            }
+                            payload[name] = parsedDate;
                         }
                         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(Number(year), Number(month) - 1, Number(day), Number(hours), Number(minutes), Number(seconds));
+                            const parsedDate = (0, date_fns_1.parseISO)(value);
+                            if (!(0, date_fns_1.isValid)(parsedDate)) {
+                                throw new exceptions_1.InvalidPayloadException(`Invalid DateTime format in field "${dateColumn.field}"`);
+                            }
+                            payload[name] = parsedDate;
                         }
                         if (dateColumn.type === 'timestamp') {
                             const newValue = this.helpers.date.writeTimestamp(value);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "directus",
-	"version": "9.13.0",
+	"version": "9.14.0",
 	"license": "GPL-3.0-only",
 	"homepage": "https://github.com/directus/directus#readme",
 	"description": "Directus is a real-time API and App dashboard for managing SQL database content.",
@@ -77,16 +77,16 @@
 	],
 	"dependencies": {
 		"@aws-sdk/client-ses": "^3.107.0",
-		"@directus/app": "9.13.0",
-		"@directus/drive": "9.13.0",
-		"@directus/drive-azure": "9.13.0",
-		"@directus/drive-gcs": "9.13.0",
-		"@directus/drive-s3": "9.13.0",
-		"@directus/extensions-sdk": "9.13.0",
-		"@directus/format-title": "9.13.0",
-		"@directus/schema": "9.13.0",
-		"@directus/shared": "9.13.0",
-		"@directus/specs": "9.13.0",
+		"@directus/app": "9.14.0",
+		"@directus/drive": "9.14.0",
+		"@directus/drive-azure": "9.14.0",
+		"@directus/drive-gcs": "9.14.0",
+		"@directus/drive-s3": "9.14.0",
+		"@directus/extensions-sdk": "9.14.0",
+		"@directus/format-title": "9.14.0",
+		"@directus/schema": "9.14.0",
+		"@directus/shared": "9.14.0",
+		"@directus/specs": "9.14.0",
 		"@godaddy/terminus": "^4.10.2",
 		"@rollup/plugin-alias": "^3.1.9",
 		"@rollup/plugin-virtual": "^2.1.0",
@@ -174,7 +174,7 @@
 		"sqlite3": "^5.0.8",
 		"tedious": "^13.0.0"
 	},
-	"gitHead": "fd55233b1124a2887e04e4418f04c7a7b94398b7",
+	"gitHead": "d952222058dca96cf823b3e91dc146266ff89bd0",
 	"devDependencies": {
 		"@types/async": "3.2.13",
 		"@types/body-parser": "1.19.2",