directus 9.23.4 → 9.24.0

package/dist/app.js

@@ -81,7 +81,7 @@ const lodash_1 = require("lodash");
 const auth_2 = require("./auth");
 const cache_2 = require("./cache");
 const get_config_from_env_1 = require("./utils/get-config-from-env");
-const track_1 = require("./utils/track");
+const telemetry_1 = require("./utils/telemetry");
 const url_1 = require("./utils/url");
 const validate_env_1 = require("./utils/validate-env");
 const validate_storage_1 = require("./utils/validate-storage");
@@ -198,7 +198,7 @@ async function createApp() {
     if (env_1.default['RATE_LIMITER_ENABLED'] === true) {
         app.use(rate_limiter_ip_1.default);
     }
-    app.get('/server/ping', (req, res) => res.send('pong'));
+    app.get('/server/ping', (_req, res) => res.send('pong'));
     app.use(authenticate_1.default);
     app.use(check_ip_1.checkIP);
     app.use(sanitize_query_1.default);
@@ -243,7 +243,7 @@ async function createApp() {
     await emitter_1.default.emitInit('routes.after', { app });
     // Register all webhooks
     await (0, webhooks_2.init)();
-    (0, track_1.track)('serverStarted');
+    (0, telemetry_1.collectTelemetry)();
     await emitter_1.default.emitInit('app.after', { app });
     return app;
 }

package/dist/controllers/activity.js

@@ -117,7 +117,7 @@ router.patch('/comment/:pk', (0, async_handler_1.default)(async (req, res, next)
     }
     return next();
 }), respond_1.respond);
-router.delete('/comment/:pk', (0, async_handler_1.default)(async (req, res, next) => {
+router.delete('/comment/:pk', (0, async_handler_1.default)(async (req, _res, next) => {
     const service = new services_1.ActivityService({
         accountability: req.accountability,
         schema: req.schema,

package/dist/controllers/assets.js

@@ -103,7 +103,7 @@ router.get('/:pk/:filename?',
 }), 
 // Return file
 (0, async_handler_1.default)(async (req, res) => {
-    const id = req.params['pk']?.substring(0, 36);
+    const id = req.params['pk'].substring(0, 36);
     const service = new services_1.AssetsService({
         accountability: req.accountability,
         schema: req.schema,

package/dist/controllers/auth.js

@@ -107,7 +107,7 @@ router.post('/logout', (0, async_handler_1.default)(async (req, res, next) => {
     }
     return next();
 }), respond_1.respond);
-router.post('/password/request', (0, async_handler_1.default)(async (req, res, next) => {
+router.post('/password/request', (0, async_handler_1.default)(async (req, _res, next) => {
     if (typeof req.body.email !== 'string') {
         throw new exceptions_1.InvalidPayloadException(`"email" field is required.`);
     }
@@ -136,7 +136,7 @@ router.post('/password/request', (0, async_handler_1.default)(async (req, res, n
         }
     }
 }), respond_1.respond);
-router.post('/password/reset', (0, async_handler_1.default)(async (req, res, next) => {
+router.post('/password/reset', (0, async_handler_1.default)(async (req, _res, next) => {
     if (typeof req.body.token !== 'string') {
         throw new exceptions_1.InvalidPayloadException(`"token" field is required.`);
     }
@@ -157,7 +157,7 @@ router.post('/password/reset', (0, async_handler_1.default)(async (req, res, nex
     await service.resetPassword(req.body.token, req.body.password);
     return next();
 }), respond_1.respond);
-router.get('/', (0, async_handler_1.default)(async (req, res, next) => {
+router.get('/', (0, async_handler_1.default)(async (_req, res, next) => {
     res.locals['payload'] = {
         data: (0, get_auth_providers_1.getAuthProviders)(),
         disableDefault: env_1.default['AUTH_DISABLE_DEFAULT'],

package/dist/controllers/collections.js

@@ -94,7 +94,7 @@ router.patch('/:collection', (0, async_handler_1.default)(async (req, res, next)
     }
     return next();
 }), respond_1.respond);
-router.delete('/:collection', (0, async_handler_1.default)(async (req, res, next) => {
+router.delete('/:collection', (0, async_handler_1.default)(async (req, _res, next) => {
     const collectionsService = new services_1.CollectionsService({
         accountability: req.accountability,
         schema: req.schema,

package/dist/controllers/dashboards.js

@@ -116,7 +116,7 @@ router.patch('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
     }
     return next();
 }), respond_1.respond);
-router.delete('/', (0, async_handler_1.default)(async (req, res, next) => {
+router.delete('/', (0, async_handler_1.default)(async (req, _res, next) => {
     const service = new services_1.DashboardsService({
         accountability: req.accountability,
         schema: req.schema,
@@ -133,7 +133,7 @@ router.delete('/', (0, async_handler_1.default)(async (req, res, next) => {
     }
     return next();
 }), respond_1.respond);
-router.delete('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
+router.delete('/:pk', (0, async_handler_1.default)(async (req, _res, next) => {
     const service = new services_1.DashboardsService({
         accountability: req.accountability,
         schema: req.schema,

package/dist/controllers/fields.js

@@ -149,7 +149,7 @@ router.patch('/:collection/:field', collection_exists_1.default, (0, async_handl
     }
     return next();
 }), respond_1.respond);
-router.delete('/:collection/:field', collection_exists_1.default, (0, async_handler_1.default)(async (req, res, next) => {
+router.delete('/:collection/:field', collection_exists_1.default, (0, async_handler_1.default)(async (req, _res, next) => {
     const service = new fields_1.FieldsService({
         accountability: req.accountability,
         schema: req.schema,

package/dist/controllers/files.js

@@ -246,7 +246,7 @@ router.patch('/:pk', (0, async_handler_1.default)(exports.multipartHandler), (0,
     }
     return next();
 }), respond_1.respond);
-router.delete('/', (0, validate_batch_1.validateBatch)('delete'), (0, async_handler_1.default)(async (req, res, next) => {
+router.delete('/', (0, validate_batch_1.validateBatch)('delete'), (0, async_handler_1.default)(async (req, _res, next) => {
     const service = new services_1.FilesService({
         accountability: req.accountability,
         schema: req.schema,
@@ -263,7 +263,7 @@ router.delete('/', (0, validate_batch_1.validateBatch)('delete'), (0, async_hand
     }
     return next();
 }), respond_1.respond);
-router.delete('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
+router.delete('/:pk', (0, async_handler_1.default)(async (req, _res, next) => {
     const service = new services_1.FilesService({
         accountability: req.accountability,
         schema: req.schema,

package/dist/controllers/flows.js

@@ -135,7 +135,7 @@ router.patch('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
     }
     return next();
 }), respond_1.respond);
-router.delete('/', (0, async_handler_1.default)(async (req, res, next) => {
+router.delete('/', (0, async_handler_1.default)(async (req, _res, next) => {
     const service = new services_1.FlowsService({
         accountability: req.accountability,
         schema: req.schema,
@@ -152,7 +152,7 @@ router.delete('/', (0, async_handler_1.default)(async (req, res, next) => {
     }
     return next();
 }), respond_1.respond);
-router.delete('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
+router.delete('/:pk', (0, async_handler_1.default)(async (req, _res, next) => {
     const service = new services_1.FlowsService({
         accountability: req.accountability,
         schema: req.schema,

package/dist/controllers/folders.js

@@ -125,7 +125,7 @@ router.patch('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
     }
     return next();
 }), respond_1.respond);
-router.delete('/', (0, validate_batch_1.validateBatch)('delete'), (0, async_handler_1.default)(async (req, res, next) => {
+router.delete('/', (0, validate_batch_1.validateBatch)('delete'), (0, async_handler_1.default)(async (req, _res, next) => {
     const service = new services_1.FoldersService({
         accountability: req.accountability,
         schema: req.schema,
@@ -142,7 +142,7 @@ router.delete('/', (0, validate_batch_1.validateBatch)('delete'), (0, async_hand
     }
     return next();
 }), respond_1.respond);
-router.delete('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
+router.delete('/:pk', (0, async_handler_1.default)(async (req, _res, next) => {
     const service = new services_1.FoldersService({
         accountability: req.accountability,
         schema: req.schema,

package/dist/controllers/items.js

@@ -151,7 +151,7 @@ router.patch('/:collection/:pk', collection_exists_1.default, (0, async_handler_
     }
     return next();
 }), respond_1.respond);
-router.delete('/:collection', collection_exists_1.default, (0, validate_batch_1.validateBatch)('delete'), (0, async_handler_1.default)(async (req, res, next) => {
+router.delete('/:collection', collection_exists_1.default, (0, validate_batch_1.validateBatch)('delete'), (0, async_handler_1.default)(async (req, _res, next) => {
     if (req.params['collection'].startsWith('directus_'))
         throw new exceptions_1.ForbiddenException();
     const service = new services_1.ItemsService(req.collection, {
@@ -170,7 +170,7 @@ router.delete('/:collection', collection_exists_1.default, (0, validate_batch_1.
     }
     return next();
 }), respond_1.respond);
-router.delete('/:collection/:pk', collection_exists_1.default, (0, async_handler_1.default)(async (req, res, next) => {
+router.delete('/:collection/:pk', collection_exists_1.default, (0, async_handler_1.default)(async (req, _res, next) => {
     if (req.params['collection'].startsWith('directus_'))
         throw new exceptions_1.ForbiddenException();
     const service = new services_1.ItemsService(req.collection, {

package/dist/controllers/notifications.js

@@ -125,7 +125,7 @@ router.patch('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
     }
     return next();
 }), respond_1.respond);
-router.delete('/', (0, validate_batch_1.validateBatch)('delete'), (0, async_handler_1.default)(async (req, res, next) => {
+router.delete('/', (0, validate_batch_1.validateBatch)('delete'), (0, async_handler_1.default)(async (req, _res, next) => {
     const service = new services_1.NotificationsService({
         accountability: req.accountability,
         schema: req.schema,
@@ -142,7 +142,7 @@ router.delete('/', (0, validate_batch_1.validateBatch)('delete'), (0, async_hand
     }
     return next();
 }), respond_1.respond);
-router.delete('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
+router.delete('/:pk', (0, async_handler_1.default)(async (req, _res, next) => {
     const service = new services_1.NotificationsService({
         accountability: req.accountability,
         schema: req.schema,

package/dist/controllers/operations.js

@@ -116,7 +116,7 @@ router.patch('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
     }
     return next();
 }), respond_1.respond);
-router.delete('/', (0, async_handler_1.default)(async (req, res, next) => {
+router.delete('/', (0, async_handler_1.default)(async (req, _res, next) => {
     const service = new services_1.OperationsService({
         accountability: req.accountability,
         schema: req.schema,
@@ -133,7 +133,7 @@ router.delete('/', (0, async_handler_1.default)(async (req, res, next) => {
     }
     return next();
 }), respond_1.respond);
-router.delete('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
+router.delete('/:pk', (0, async_handler_1.default)(async (req, _res, next) => {
     const service = new services_1.OperationsService({
         accountability: req.accountability,
         schema: req.schema,

package/dist/controllers/panels.js

@@ -116,7 +116,7 @@ router.patch('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
     }
     return next();
 }), respond_1.respond);
-router.delete('/', (0, async_handler_1.default)(async (req, res, next) => {
+router.delete('/', (0, async_handler_1.default)(async (req, _res, next) => {
     const service = new services_1.PanelsService({
         accountability: req.accountability,
         schema: req.schema,
@@ -133,7 +133,7 @@ router.delete('/', (0, async_handler_1.default)(async (req, res, next) => {
     }
     return next();
 }), respond_1.respond);
-router.delete('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
+router.delete('/:pk', (0, async_handler_1.default)(async (req, _res, next) => {
     const service = new services_1.PanelsService({
         accountability: req.accountability,
         schema: req.schema,

package/dist/controllers/permissions.js

@@ -127,7 +127,7 @@ router.patch('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
     }
     return next();
 }), respond_1.respond);
-router.delete('/', (0, validate_batch_1.validateBatch)('delete'), (0, async_handler_1.default)(async (req, res, next) => {
+router.delete('/', (0, validate_batch_1.validateBatch)('delete'), (0, async_handler_1.default)(async (req, _res, next) => {
     const service = new services_1.PermissionsService({
         accountability: req.accountability,
         schema: req.schema,
@@ -144,7 +144,7 @@ router.delete('/', (0, validate_batch_1.validateBatch)('delete'), (0, async_hand
     }
     return next();
 }), respond_1.respond);
-router.delete('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
+router.delete('/:pk', (0, async_handler_1.default)(async (req, _res, next) => {
     const service = new services_1.PermissionsService({
         accountability: req.accountability,
         schema: req.schema,

package/dist/controllers/presets.js

@@ -125,7 +125,7 @@ router.patch('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
     }
     return next();
 }), respond_1.respond);
-router.delete('/', (0, validate_batch_1.validateBatch)('delete'), (0, async_handler_1.default)(async (req, res, next) => {
+router.delete('/', (0, validate_batch_1.validateBatch)('delete'), (0, async_handler_1.default)(async (req, _res, next) => {
     const service = new services_1.PresetsService({
         accountability: req.accountability,
         schema: req.schema,
@@ -142,7 +142,7 @@ router.delete('/', (0, validate_batch_1.validateBatch)('delete'), (0, async_hand
     }
     return next();
 }), respond_1.respond);
-router.delete('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
+router.delete('/:pk', (0, async_handler_1.default)(async (req, _res, next) => {
     const service = new services_1.PresetsService({
         accountability: req.accountability,
         schema: req.schema,

package/dist/controllers/relations.js

@@ -106,7 +106,7 @@ router.patch('/:collection/:field', collection_exists_1.default, (0, async_handl
     }
     return next();
 }), respond_1.respond);
-router.delete('/:collection/:field', collection_exists_1.default, (0, async_handler_1.default)(async (req, res, next) => {
+router.delete('/:collection/:field', collection_exists_1.default, (0, async_handler_1.default)(async (req, _res, next) => {
     const service = new services_1.RelationsService({
         accountability: req.accountability,
         schema: req.schema,

package/dist/controllers/roles.js

@@ -116,7 +116,7 @@ router.patch('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
     }
     return next();
 }), respond_1.respond);
-router.delete('/', (0, validate_batch_1.validateBatch)('delete'), (0, async_handler_1.default)(async (req, res, next) => {
+router.delete('/', (0, validate_batch_1.validateBatch)('delete'), (0, async_handler_1.default)(async (req, _res, next) => {
     const service = new services_1.RolesService({
         accountability: req.accountability,
         schema: req.schema,
@@ -133,7 +133,7 @@ router.delete('/', (0, validate_batch_1.validateBatch)('delete'), (0, async_hand
     }
     return next();
 }), respond_1.respond);
-router.delete('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
+router.delete('/:pk', (0, async_handler_1.default)(async (req, _res, next) => {
     const service = new services_1.RolesService({
         accountability: req.accountability,
         schema: req.schema,

package/dist/controllers/shares.js

@@ -38,7 +38,7 @@ const sharedInviteSchema = joi_1.default.object({
     share: joi_1.default.string().required(),
     emails: joi_1.default.array().items(joi_1.default.string()),
 }).unknown();
-router.post('/invite', (0, async_handler_1.default)(async (req, res, next) => {
+router.post('/invite', (0, async_handler_1.default)(async (req, _res, next) => {
     const service = new services_1.SharesService({
         schema: req.schema,
         accountability: req.accountability,

package/dist/controllers/utils.js

@@ -55,7 +55,7 @@ router.post('/sort/:collection', collection_exists_1.default, (0, async_handler_
     await service.sort(req.collection, req.body);
     return res.status(200).end();
 }));
-router.post('/revert/:revision', (0, async_handler_1.default)(async (req, res, next) => {
+router.post('/revert/:revision', (0, async_handler_1.default)(async (req, _res, next) => {
     const service = new services_1.RevisionsService({
         accountability: req.accountability,
         schema: req.schema,
@@ -93,7 +93,7 @@ router.post('/import/:collection', collection_exists_1.default, (0, async_handle
     busboy.on('error', (err) => next(err));
     req.pipe(busboy);
 }));
-router.post('/export/:collection', collection_exists_1.default, (0, async_handler_1.default)(async (req, res, next) => {
+router.post('/export/:collection', collection_exists_1.default, (0, async_handler_1.default)(async (req, _res, next) => {
     if (!req.body.query) {
         throw new exceptions_1.InvalidPayloadException(`"query" is required.`);
     }

package/dist/controllers/webhooks.js

@@ -113,7 +113,7 @@ router.patch('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
     }
     return next();
 }), respond_1.respond);
-router.delete('/', (0, async_handler_1.default)(async (req, res, next) => {
+router.delete('/', (0, async_handler_1.default)(async (req, _res, next) => {
     const service = new services_1.WebhooksService({
         accountability: req.accountability,
         schema: req.schema,
@@ -130,7 +130,7 @@ router.delete('/', (0, async_handler_1.default)(async (req, res, next) => {
     }
     return next();
 }), respond_1.respond);
-router.delete('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
+router.delete('/:pk', (0, async_handler_1.default)(async (req, _res, next) => {
     const service = new services_1.WebhooksService({
         accountability: req.accountability,
         schema: req.schema,

package/dist/database/run-ast.js

@@ -280,7 +280,7 @@ function applyParentFilters(schema, nestedCollectionNodes, parentItem) {
             continue;
         if (nestedNode.type === 'm2o') {
             const foreignField = schema.collections[nestedNode.relation.related_collection].primary;
-            const foreignIds = (0, lodash_1.uniq)(parentItems.map((res) => res[nestedNode.relation.field])).filter((id) => id);
+            const foreignIds = (0, lodash_1.uniq)(parentItems.map((res) => res[nestedNode.relation.field])).filter((id) => !(0, lodash_1.isNil)(id));
             (0, lodash_1.merge)(nestedNode, { query: { filter: { [foreignField]: { _in: foreignIds } } } });
         }
         else if (nestedNode.type === 'o2m') {
@@ -302,7 +302,7 @@ function applyParentFilters(schema, nestedCollectionNodes, parentItem) {
                 });
             }
             const foreignField = nestedNode.relation.field;
-            const foreignIds = (0, lodash_1.uniq)(parentItems.map((res) => res[nestedNode.parentKey])).filter((id) => id);
+            const foreignIds = (0, lodash_1.uniq)(parentItems.map((res) => res[nestedNode.parentKey])).filter((id) => !(0, lodash_1.isNil)(id));
             (0, lodash_1.merge)(nestedNode, { query: { filter: { [foreignField]: { _in: foreignIds } } } });
         }
         else if (nestedNode.type === 'a2o') {

package/dist/exceptions/database/dialects/mssql.js

@@ -54,8 +54,8 @@ async function uniqueViolation(error) {
     const parenMatches = error.message.match(betweenParens);
     if (!quoteMatches || !parenMatches)
         return error;
-    const keyName = quoteMatches[1]?.slice(1, -1);
-    let collection = quoteMatches[0]?.slice(1, -1);
+    const keyName = quoteMatches[1].slice(1, -1);
+    let collection = quoteMatches[0].slice(1, -1);
     let field = null;
     if (keyName) {
         const database = (0, database_1.default)();

package/dist/exceptions/database/dialects/mysql.js

@@ -49,7 +49,7 @@ function uniqueViolation(error) {
      */
     /** MySQL 8+ style error message */
     if (matches[1].includes('.')) {
-        const collection = matches[1]?.slice(1, -1).split('.')[0];
+        const collection = matches[1].slice(1, -1).split('.')[0];
         let field = null;
         const indexName = matches[1]?.slice(1, -1).split('.')[1];
         if (indexName?.startsWith(`${collection}_`) && indexName.endsWith('_unique')) {
@@ -64,7 +64,7 @@ function uniqueViolation(error) {
     }
     else {
         /** MySQL 5.7 style error message */
-        const indexName = matches[1]?.slice(1, -1);
+        const indexName = matches[1].slice(1, -1);
         const collection = indexName.split('_')[0];
         let field = null;
         if (indexName?.startsWith(`${collection}_`) && indexName.endsWith('_unique')) {
@@ -127,9 +127,9 @@ function foreignKeyViolation(error) {
     const parenMatches = error.sql.match(betweenParens);
     if (!tickMatches || !parenMatches)
         return error;
-    const collection = tickMatches[1]?.slice(1, -1);
-    const field = tickMatches[3]?.slice(1, -1);
-    const invalid = parenMatches[1]?.slice(1, -1);
+    const collection = tickMatches[1].slice(1, -1);
+    const field = tickMatches[3].slice(1, -1);
+    const invalid = parenMatches[1].slice(1, -1);
     return new invalid_foreign_key_1.InvalidForeignKeyException(field, {
         collection,
         field,
@@ -143,6 +143,6 @@ function containsNullValues(error) {
     const tickMatches = error.sql.match(betweenTicks);
     if (!tickMatches)
         return error;
-    const field = tickMatches[1]?.slice(1, -1);
+    const field = tickMatches[1].slice(1, -1);
     return new contains_null_values_1.ContainsNullValuesException(field);
 }

package/dist/exceptions/database/record-not-unique.d.ts

@@ -2,7 +2,7 @@ import { BaseException } from '@directus/shared/exceptions';
 type Extensions = {
     collection: string;
     field: string | null;
-    invalid?: string;
+    invalid?: string | undefined;
 };
 export declare class RecordNotUniqueException extends BaseException {
     constructor(field: string | null, extensions?: Extensions);

package/dist/middleware/authenticate.d.ts

@@ -3,6 +3,6 @@ import type { NextFunction, Request, Response } from 'express';
 /**
  * Verify the passed JWT and assign the user ID and role to `req`
  */
-export declare const handler: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+export declare const handler: (req: Request, _res: Response, next: NextFunction) => Promise<void>;
 declare const _default: (req: Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, next: NextFunction) => Promise<void>;
 export default _default;

package/dist/middleware/authenticate.js

@@ -16,7 +16,7 @@ const jwt_1 = require("../utils/jwt");
 /**
  * Verify the passed JWT and assign the user ID and role to `req`
  */
-const handler = async (req, res, next) => {
+const handler = async (req, _res, next) => {
     const defaultAccountability = {
         user: null,
         role: null,

package/dist/middleware/collection-exists.js

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const collections_1 = require("../database/system-data/collections");
 const exceptions_1 = require("../exceptions");
 const async_handler_1 = __importDefault(require("../utils/async-handler"));
-const collectionExists = (0, async_handler_1.default)(async (req, res, next) => {
+const collectionExists = (0, async_handler_1.default)(async (req, _res, next) => {
     if (!req.params['collection'])
         return next();
     if (req.params['collection'] in req.schema.collections === false) {

package/dist/middleware/cors.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const cors_1 = __importDefault(require("cors"));
 const env_1 = __importDefault(require("../env"));
-let corsMiddleware = (req, res, next) => next();
+let corsMiddleware = (_req, _res, next) => next();
 if (env_1.default['CORS_ENABLED'] === true) {
     corsMiddleware = (0, cors_1.default)({
         origin: env_1.default['CORS_ORIGIN'] || true,

package/dist/middleware/extract-token.js

@@ -8,7 +8,7 @@
  * and store in req.token
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const extractToken = (req, res, next) => {
+const extractToken = (req, _res, next) => {
     let token = null;
     if (req.query && req.query['access_token']) {
         token = req.query['access_token'];

package/dist/middleware/get-permissions.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const async_handler_1 = __importDefault(require("../utils/async-handler"));
 const get_permissions_1 = require("../utils/get-permissions");
-const getPermissions = (0, async_handler_1.default)(async (req, res, next) => {
+const getPermissions = (0, async_handler_1.default)(async (req, _res, next) => {
     if (!req.accountability) {
         throw new Error('getPermissions middleware needs to be called after authenticate');
     }

package/dist/middleware/schema.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const async_handler_1 = __importDefault(require("../utils/async-handler"));
 const get_schema_1 = require("../utils/get-schema");
-const schema = (0, async_handler_1.default)(async (req, res, next) => {
+const schema = (0, async_handler_1.default)(async (req, _res, next) => {
     req.schema = await (0, get_schema_1.getSchema)();
     return next();
 });

package/dist/middleware/use-collection.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const async_handler_1 = __importDefault(require("../utils/async-handler"));
-const useCollection = (collection) => (0, async_handler_1.default)(async (req, res, next) => {
+const useCollection = (collection) => (0, async_handler_1.default)(async (req, _res, next) => {
     req.collection = collection;
     next();
 });

package/dist/middleware/validate-batch.js

@@ -9,7 +9,7 @@ const exceptions_1 = require("../exceptions");
 const exceptions_2 = require("@directus/shared/exceptions");
 const async_handler_1 = __importDefault(require("../utils/async-handler"));
 const sanitize_query_1 = require("../utils/sanitize-query");
-const validateBatch = (scope) => (0, async_handler_1.default)(async (req, res, next) => {
+const validateBatch = (scope) => (0, async_handler_1.default)(async (req, _res, next) => {
     if (req.method.toLowerCase() === 'get') {
         req.body = {};
         return next();

package/dist/services/files.js

@@ -79,12 +79,12 @@ class FilesService extends items_1.ItemsService {
         if (['image/jpeg', 'image/png', 'image/webp', 'image/gif', 'image/tiff'].includes(payload.type)) {
             const stream = await storage.location(data.storage).read(payload.filename_disk);
             const { height, width, description, title, tags, metadata } = await this.getMetadata(stream);
-            payload.height = height ?? null;
-            payload.width = width ?? null;
-            payload.description = description ?? null;
-            payload.title = title ?? null;
-            payload.tags = tags ?? null;
-            payload.metadata = metadata ?? null;
+            payload.height ??= height ?? null;
+            payload.width ??= width ?? null;
+            payload.description ??= description ?? null;
+            payload.title ??= title ?? null;
+            payload.tags ??= tags ?? null;
+            payload.metadata ??= metadata ?? null;
         }
         // We do this in a service without accountability. Even if you don't have update permissions to the file,
         // we still want to be able to set the extracted values from the file on create

package/dist/services/graphql/index.js

@@ -378,7 +378,7 @@ class GraphQLService {
                             type: new graphql_1.GraphQLUnionType({
                                 name: `${relation.collection}_${relation.field}_union`,
                                 types: relation.meta.one_allowed_collections.map((collection) => CollectionTypes[collection].getType()),
-                                resolveType(value, context, info) {
+                                resolveType(_value, context, info) {
                                     let path = [];
                                     let currentPath = info.path;
                                     while (currentPath.prev) {
@@ -959,9 +959,7 @@ class GraphQLService {
                         resolve: async ({ args, info }) => await self.resolveMutation(args, info),
                     };
                     if (collectionIsReadable) {
-                        resolverDefinition.args = ReadCollectionTypes[collection.collection]
-                            .getResolver(collection.collection)
-                            .getArgs();
+                        resolverDefinition.args = ReadCollectionTypes[collection.collection].getResolver(collection.collection).getArgs();
                     }
                     CreateCollectionTypes[collection.collection].addResolver(resolverDefinition);
                     CreateCollectionTypes[collection.collection].addResolver({
@@ -970,17 +968,13 @@ class GraphQLService {
                         resolve: async ({ args, info }) => await self.resolveMutation(args, info),
                     });
                     CreateCollectionTypes[collection.collection].getResolver(`create_${collection.collection}_items`).addArgs({
-                        ...CreateCollectionTypes[collection.collection]
-                            .getResolver(`create_${collection.collection}_items`)
-                            .getArgs(),
+                        ...CreateCollectionTypes[collection.collection].getResolver(`create_${collection.collection}_items`).getArgs(),
                         data: [
                             (0, graphql_compose_1.toInputObjectType)(CreateCollectionTypes[collection.collection]).setTypeName(`create_${collection.collection}_input`).NonNull,
                         ],
                     });
                     CreateCollectionTypes[collection.collection].getResolver(`create_${collection.collection}_item`).addArgs({
-                        ...CreateCollectionTypes[collection.collection]
-                            .getResolver(`create_${collection.collection}_item`)
-                            .getArgs(),
+                        ...CreateCollectionTypes[collection.collection].getResolver(`create_${collection.collection}_item`).getArgs(),
                         data: (0, graphql_compose_1.toInputObjectType)(CreateCollectionTypes[collection.collection]).setTypeName(`create_${collection.collection}_input`).NonNull,
                     });
                 }
@@ -1343,7 +1337,7 @@ class GraphQLService {
                         if (!query.deep)
                             query.deep = {};
                         const args = this.parseArgs(selection.arguments, variableValues);
-                        (0, lodash_1.set)(query.deep, currentAlias ?? current, (0, lodash_1.merge)({}, (0, lodash_1.get)(query.deep, currentAlias ?? current), (0, lodash_1.mapKeys)((0, sanitize_query_1.sanitizeQuery)(args, this.accountability), (value, key) => `_${key}`)));
+                        (0, lodash_1.set)(query.deep, currentAlias ?? current, (0, lodash_1.merge)({}, (0, lodash_1.get)(query.deep, currentAlias ?? current), (0, lodash_1.mapKeys)((0, sanitize_query_1.sanitizeQuery)(args, this.accountability), (_value, key) => `_${key}`)));
                     }
                 }
             }
@@ -1498,15 +1492,60 @@ class GraphQLService {
         const ServerInfo = schemaComposer.createObjectTC({
             name: 'server_info',
             fields: {
-                project_name: { type: graphql_1.GraphQLString },
-                project_logo: { type: graphql_1.GraphQLString },
-                project_color: { type: graphql_1.GraphQLString },
-                project_foreground: { type: graphql_1.GraphQLString },
-                project_background: { type: graphql_1.GraphQLString },
-                project_note: { type: graphql_1.GraphQLString },
-                custom_css: { type: graphql_1.GraphQLString },
+                project: {
+                    type: new graphql_1.GraphQLObjectType({
+                        name: 'server_info_project',
+                        fields: {
+                            project_name: { type: graphql_1.GraphQLString },
+                            project_descriptor: { type: graphql_1.GraphQLString },
+                            project_logo: { type: graphql_1.GraphQLString },
+                            project_color: { type: graphql_1.GraphQLString },
+                            default_language: { type: graphql_1.GraphQLString },
+                            public_foreground: { type: graphql_1.GraphQLString },
+                            public_background: { type: graphql_1.GraphQLString },
+                            public_note: { type: graphql_1.GraphQLString },
+                            custom_css: { type: graphql_1.GraphQLString },
+                        },
+                    }),
+                },
             },
         });
+        if (this.accountability?.user) {
+            ServerInfo.addFields({
+                rateLimit: env_1.default['RATE_LIMITER_ENABLED']
+                    ? {
+                        type: new graphql_1.GraphQLObjectType({
+                            name: 'server_info_rate_limit',
+                            fields: {
+                                points: { type: graphql_1.GraphQLInt },
+                                duration: { type: graphql_1.GraphQLInt },
+                            },
+                        }),
+                    }
+                    : graphql_1.GraphQLBoolean,
+                rateLimitGlobal: env_1.default['RATE_LIMITER_GLOBAL_ENABLED']
+                    ? {
+                        type: new graphql_1.GraphQLObjectType({
+                            name: 'server_info_rate_limit_global',
+                            fields: {
+                                points: { type: graphql_1.GraphQLInt },
+                                duration: { type: graphql_1.GraphQLInt },
+                            },
+                        }),
+                    }
+                    : graphql_1.GraphQLBoolean,
+                flows: {
+                    type: new graphql_1.GraphQLObjectType({
+                        name: 'server_info_flows',
+                        fields: {
+                            execAllowedModules: {
+                                type: new graphql_1.GraphQLList(graphql_1.GraphQLString),
+                            },
+                        },
+                    }),
+                },
+            });
+        }
         if (this.accountability?.admin === true) {
             ServerInfo.addFields({
                 directus: {
@@ -1860,6 +1899,19 @@ class GraphQLService {
                     return true;
                 },
             },
+            utils_random_string: {
+                type: graphql_1.GraphQLString,
+                args: {
+                    length: graphql_1.GraphQLInt,
+                },
+                resolve: async (_, args) => {
+                    const { nanoid } = await import('nanoid');
+                    if (args['length'] && Number(args['length']) > 500) {
+                        throw new exceptions_1.InvalidPayloadException(`"length" can't be more than 500 characters`);
+                    }
+                    return nanoid(args['length'] ? Number(args['length']) : 32);
+                },
+            },
             utils_hash_generate: {
                 type: graphql_1.GraphQLString,
                 args: {

package/dist/services/relations.js

@@ -442,15 +442,15 @@ class RelationsService {
                 collectionsAllowed = false;
             }
             if (!allowedFields[relation.collection] ||
-                (allowedFields[relation.collection].includes('*') === false &&
-                    allowedFields[relation.collection].includes(relation.field) === false)) {
+                (allowedFields[relation.collection]?.includes('*') === false &&
+                    allowedFields[relation.collection]?.includes(relation.field) === false)) {
                 fieldsAllowed = false;
             }
             if (relation.related_collection &&
                 relation.meta?.one_field &&
                 (!allowedFields[relation.related_collection] ||
-                    (allowedFields[relation.related_collection].includes('*') === false &&
-                        allowedFields[relation.related_collection].includes(relation.meta.one_field) === false))) {
+                    (allowedFields[relation.related_collection]?.includes('*') === false &&
+                        allowedFields[relation.related_collection]?.includes(relation.meta.one_field) === false))) {
                 fieldsAllowed = false;
             }
             return collectionsAllowed && fieldsAllowed;

package/dist/services/users.js

@@ -335,7 +335,7 @@ class UsersService extends items_1.ItemsService {
         const token = jsonwebtoken_1.default.sign(payload, env_1.default['SECRET'], { expiresIn: '1d', issuer: 'directus' });
         const acceptURL = url
             ? new url_1.Url(url).setQuery('token', token).toString()
-            : new url_1.Url(env_1.default['PUBLIC_URL']).addPath('admin', 'reset-password').setQuery('token', token);
+            : new url_1.Url(env_1.default['PUBLIC_URL']).addPath('admin', 'reset-password').setQuery('token', token).toString();
         const subjectLine = subject ? subject : 'Password Reset Request';
         await mailService.send({
             to: email,

package/dist/utils/apply-diff.js

@@ -27,7 +27,7 @@ async function applyDiff(currentSnapshot, snapshotDiff, options) {
         const getNestedCollectionsToDelete = (currentLevelCollection) => snapshotDiff.collections.filter(({ diff }) => diff[0].lhs?.meta?.group === currentLevelCollection);
         const createCollections = async (collections) => {
             for (const { collection, diff } of collections) {
-                if (diff?.[0].kind === types_1.DiffKind.NEW && diff[0].rhs) {
+                if (diff?.[0]?.kind === types_1.DiffKind.NEW && diff[0].rhs) {
                     // We'll nest the to-be-created fields in the same collection creation, to prevent
                     // creating a collection without a primary key
                     const fields = snapshotDiff.fields
@@ -64,7 +64,7 @@ async function applyDiff(currentSnapshot, snapshotDiff, options) {
         };
         const deleteCollections = async (collections) => {
             for (const { collection, diff } of collections) {
-                if (diff?.[0].kind === types_1.DiffKind.DELETE) {
+                if (diff?.[0]?.kind === types_1.DiffKind.DELETE) {
                     const relations = schema.relations.filter((r) => r.related_collection === collection || r.collection === collection);
                     if (relations.length > 0) {
                         const relationsService = new services_1.RelationsService({ knex: trx, schema });
@@ -94,7 +94,7 @@ async function applyDiff(currentSnapshot, snapshotDiff, options) {
         // Finds all collections that need to be created
         const filterCollectionsForCreation = ({ diff }) => {
             // Check new collections only
-            const isNewCollection = diff[0].kind === types_1.DiffKind.NEW;
+            const isNewCollection = diff[0]?.kind === types_1.DiffKind.NEW;
             if (!isNewCollection)
                 return false;
             // Create now if no group
@@ -111,7 +111,7 @@ async function applyDiff(currentSnapshot, snapshotDiff, options) {
             // TopLevelCollection - I exist in current schema
             // 		NestedCollection - I exist in snapshotDiff as a new collection
             //			TheCurrentCollectionInIteration - I exist in snapshotDiff as a new collection but will be created as part of NestedCollection
-            const parentWillBeCreatedInThisApply = snapshotDiff.collections.filter(({ collection, diff }) => diff[0].kind === types_1.DiffKind.NEW && collection === groupName).length > 0;
+            const parentWillBeCreatedInThisApply = snapshotDiff.collections.filter(({ collection, diff }) => diff[0]?.kind === types_1.DiffKind.NEW && collection === groupName).length > 0;
             // Has group, but parent is not new, parent is also not being created in this snapshot apply
             if (parentExists && !parentWillBeCreatedInThisApply)
                 return true;
@@ -121,9 +121,9 @@ async function applyDiff(currentSnapshot, snapshotDiff, options) {
         // then continue with nested collections recursively
         await createCollections(snapshotDiff.collections.filter(filterCollectionsForCreation));
         // delete top level collections (no group) first, then continue with nested collections recursively
-        await deleteCollections(snapshotDiff.collections.filter(({ diff }) => diff[0].kind === types_1.DiffKind.DELETE && diff[0].lhs.meta?.group === null));
+        await deleteCollections(snapshotDiff.collections.filter(({ diff }) => diff[0]?.kind === types_1.DiffKind.DELETE && diff[0].lhs.meta?.group === null));
         for (const { collection, diff } of snapshotDiff.collections) {
-            if (diff?.[0].kind === types_1.DiffKind.EDIT || diff?.[0].kind === types_1.DiffKind.ARRAY) {
+            if (diff?.[0]?.kind === types_1.DiffKind.EDIT || diff?.[0]?.kind === types_1.DiffKind.ARRAY) {
                 const currentCollection = currentSnapshot.collections.find((field) => {
                     return field.collection === collection;
                 });
@@ -147,7 +147,7 @@ async function applyDiff(currentSnapshot, snapshotDiff, options) {
             schema: await (0, get_schema_1.getSchema)({ database: trx, bypassCache: true }),
         });
         for (const { collection, field, diff } of snapshotDiff.fields) {
-            if (diff?.[0].kind === types_1.DiffKind.NEW && !isNestedMetaUpdate(diff?.[0])) {
+            if (diff?.[0]?.kind === types_1.DiffKind.NEW && !isNestedMetaUpdate(diff?.[0])) {
                 try {
                     await fieldsService.createField(collection, diff[0].rhs, undefined, mutationOptions);
                 }
@@ -156,7 +156,7 @@ async function applyDiff(currentSnapshot, snapshotDiff, options) {
                     throw err;
                 }
             }
-            if (diff?.[0].kind === types_1.DiffKind.EDIT || diff?.[0].kind === types_1.DiffKind.ARRAY || isNestedMetaUpdate(diff?.[0])) {
+            if (diff?.[0]?.kind === types_1.DiffKind.EDIT || diff?.[0]?.kind === types_1.DiffKind.ARRAY || isNestedMetaUpdate(diff[0])) {
                 const currentField = currentSnapshot.fields.find((snapshotField) => {
                     return snapshotField.collection === collection && snapshotField.field === field;
                 });
@@ -174,7 +174,7 @@ async function applyDiff(currentSnapshot, snapshotDiff, options) {
                     }
                 }
             }
-            if (diff?.[0].kind === types_1.DiffKind.DELETE && !isNestedMetaUpdate(diff?.[0])) {
+            if (diff?.[0]?.kind === types_1.DiffKind.DELETE && !isNestedMetaUpdate(diff?.[0])) {
                 try {
                     await fieldsService.deleteField(collection, field, mutationOptions);
                 }
@@ -196,7 +196,7 @@ async function applyDiff(currentSnapshot, snapshotDiff, options) {
             for (const diffEdit of diff) {
                 (0, lodash_1.set)(structure, diffEdit.path, undefined);
             }
-            if (diff?.[0].kind === types_1.DiffKind.NEW) {
+            if (diff?.[0]?.kind === types_1.DiffKind.NEW) {
                 try {
                     await relationsService.createOne(diff[0].rhs, mutationOptions);
                 }
@@ -205,7 +205,7 @@ async function applyDiff(currentSnapshot, snapshotDiff, options) {
                     throw err;
                 }
             }
-            if (diff?.[0].kind === types_1.DiffKind.EDIT || diff?.[0].kind === types_1.DiffKind.ARRAY) {
+            if (diff?.[0]?.kind === types_1.DiffKind.EDIT || diff?.[0]?.kind === types_1.DiffKind.ARRAY) {
                 const currentRelation = currentSnapshot.relations.find((relation) => {
                     return relation.collection === collection && relation.field === field;
                 });
@@ -223,7 +223,7 @@ async function applyDiff(currentSnapshot, snapshotDiff, options) {
                     }
                 }
             }
-            if (diff?.[0].kind === types_1.DiffKind.DELETE) {
+            if (diff?.[0]?.kind === types_1.DiffKind.DELETE) {
                 try {
                     await relationsService.deleteOne(collection, field, mutationOptions);
                 }

package/dist/utils/apply-query.js

@@ -362,7 +362,7 @@ function applyFilter(knex, schema, rootQuery, rootFilter, collection, aliasMap)
             }
             // Cast filter value (compareValue) based on type of field being filtered against
             const [collection, field] = key.split('.');
-            const mappedCollection = originalCollectionName || collection;
+            const mappedCollection = (originalCollectionName || collection);
             if (mappedCollection in schema.collections && field in schema.collections[mappedCollection].fields) {
                 const type = schema.collections[mappedCollection].fields[field].type;
                 if (['date', 'dateTime', 'time', 'timestamp'].includes(type)) {

package/dist/utils/get-ast-from-query.js

@@ -296,5 +296,5 @@ async function getASTFromQuery(collection, query, schema, options) {
 }
 exports.default = getASTFromQuery;
 function getDeepQuery(query) {
-    return (0, lodash_1.mapKeys)((0, lodash_1.omitBy)(query, (value, key) => key.startsWith('_') === false), (value, key) => key.substring(1));
+    return (0, lodash_1.mapKeys)((0, lodash_1.omitBy)(query, (_value, key) => key.startsWith('_') === false), (_value, key) => key.substring(1));
 }

package/dist/utils/get-column-path.js

@@ -43,7 +43,8 @@ function getColumnPath({ path, collection, aliasMap, relations, schema }) {
                 addNestedPkField = schema.collections[parent].primary;
             }
             // Nested level alias field
-            else if (remainingParts.length === 1 && schema.collections[parent].fields[remainingParts[0]].type === 'alias') {
+            else if (remainingParts.length === 1 &&
+                schema.collections[parent].fields[remainingParts[0]].type === 'alias') {
                 remainingParts.push(schema.collections[relation.related_collection].primary);
                 addNestedPkField = schema.collections[relation.related_collection].primary;
             }

package/dist/utils/get-schema.js

@@ -81,7 +81,7 @@ async function getDatabaseSchema(database, schemaInspector) {
             note: collectionMeta?.note || null,
             sortField: collectionMeta?.sort_field || null,
             accountability: collectionMeta ? collectionMeta.accountability : 'all',
-            fields: (0, lodash_1.mapValues)(schemaOverview[collection].columns, (column) => {
+            fields: (0, lodash_1.mapValues)(schemaOverview[collection]?.columns, (column) => {
                 return {
                     field: column.column_name,
                     defaultValue: (0, get_default_value_1.default)(column) ?? null,
@@ -108,8 +108,8 @@ async function getDatabaseSchema(database, schemaInspector) {
     for (const field of fields) {
         if (!result.collections[field.collection])
             continue;
-        const existing = result.collections[field.collection].fields[field.field];
-        const column = schemaOverview[field.collection].columns[field.field];
+        const existing = result.collections[field.collection]?.fields[field.field];
+        const column = schemaOverview[field.collection]?.columns[field.field];
         const special = field.special ? (0, utils_1.toArray)(field.special) : [];
         if (constants_1.ALIAS_TYPES.some((type) => special.includes(type)) === false && !existing)
             continue;

package/dist/utils/get-snapshot-diff.js

@@ -73,7 +73,7 @@ function getSnapshotDiff(current, after) {
      * When you delete a collection, we don't have to individually drop all the fields/relations as well
      */
     const deletedCollections = diffedSnapshot.collections
-        .filter((collection) => collection.diff?.[0].kind === types_1.DiffKind.DELETE)
+        .filter((collection) => collection.diff?.[0]?.kind === types_1.DiffKind.DELETE)
         .map(({ collection }) => collection);
     diffedSnapshot.fields = diffedSnapshot.fields.filter((field) => deletedCollections.includes(field.collection) === false);
     diffedSnapshot.relations = diffedSnapshot.relations.filter((relation) => deletedCollections.includes(relation.collection) === false);

package/dist/utils/parse-image-metadata.js

@@ -53,8 +53,8 @@ function parseXmp(buffer) {
         if (!tagMatches || tagMatches.length === 0) {
             return;
         }
-        const value = tagMatches[1].trim();
-        if (value.toLowerCase().indexOf('<rdf:bag>') === 0) {
+        const value = tagMatches[1]?.trim();
+        if (value?.toLowerCase().indexOf('<rdf:bag>') === 0) {
             const r = new RegExp('<rdf:li>(.*?)</rdf:li>', 'smig');
             let match = r.exec(value);
             const result = [];
@@ -65,7 +65,7 @@ function parseXmp(buffer) {
             xmp[x] = result;
         }
         else {
-            xmp[x] = value.replace(/<[^>]*>?/gm, '').trim();
+            xmp[x] = value?.replace(/<[^>]*>?/gm, '').trim();
         }
     });
     return xmp;

package/dist/utils/reduce-schema.js

@@ -56,7 +56,7 @@ function reduceSchema(schema, permissions, actions = ['create', 'read', 'update'
         if (relation.related_collection &&
             (Object.keys(allowedFieldsInCollection).includes(relation.related_collection) === false ||
                 // Ignore legacy permissions with an empty fields array
-                allowedFieldsInCollection[relation.related_collection].length === 0)) {
+                allowedFieldsInCollection[relation.related_collection]?.length === 0)) {
             collectionsAllowed = false;
         }
         if (relation.meta?.one_allowed_collections &&
@@ -64,15 +64,15 @@ function reduceSchema(schema, permissions, actions = ['create', 'read', 'update'
             collectionsAllowed = false;
         }
         if (!allowedFieldsInCollection[relation.collection] ||
-            (allowedFieldsInCollection[relation.collection].includes('*') === false &&
-                allowedFieldsInCollection[relation.collection].includes(relation.field) === false)) {
+            (allowedFieldsInCollection[relation.collection]?.includes('*') === false &&
+                allowedFieldsInCollection[relation.collection]?.includes(relation.field) === false)) {
             fieldsAllowed = false;
         }
         if (relation.related_collection &&
             relation.meta?.one_field &&
             (!allowedFieldsInCollection[relation.related_collection] ||
-                (allowedFieldsInCollection[relation.related_collection].includes('*') === false &&
-                    allowedFieldsInCollection[relation.related_collection].includes(relation.meta?.one_field) === false))) {
+                (allowedFieldsInCollection[relation.related_collection]?.includes('*') === false &&
+                    allowedFieldsInCollection[relation.related_collection]?.includes(relation.meta?.one_field) === false))) {
             fieldsAllowed = false;
         }
         return collectionsAllowed && fieldsAllowed;

package/dist/utils/should-skip-cache.js

@@ -11,9 +11,18 @@ const url_1 = require("./url");
 function shouldSkipCache(req) {
     const env = (0, env_1.getEnv)();
     // Always skip cache for requests coming from the data studio based on Referer header
-    const adminUrl = new url_1.Url(env['PUBLIC_URL']).addPath('admin').toString();
-    if (req.get('Referer')?.startsWith(adminUrl))
-        return true;
+    const referer = req.get('Referer');
+    if (referer) {
+        const adminUrl = new url_1.Url(env['PUBLIC_URL']).addPath('admin');
+        if (adminUrl.isRootRelative()) {
+            const refererUrl = new url_1.Url(referer);
+            if (refererUrl.path.join('/').startsWith(adminUrl.path.join('/')))
+                return true;
+        }
+        else if (referer.startsWith(adminUrl.toString())) {
+            return true;
+        }
+    }
     if (env['CACHE_SKIP_ALLOWED'] && req.get('cache-control')?.includes('no-store'))
         return true;
     return false;

package/dist/utils/strip-function.js

@@ -7,7 +7,7 @@ const constants_1 = require("@directus/shared/constants");
  */
 function stripFunction(field) {
     if (field.includes('(') && field.includes(')')) {
-        return field.match(constants_1.REGEX_BETWEEN_PARENS)[1].trim();
+        return field.match(constants_1.REGEX_BETWEEN_PARENS)?.[1]?.trim() ?? field;
     }
     else {
         return field;

package/dist/utils/telemetry.d.ts

@@ -0,0 +1 @@
+export declare function collectTelemetry(): Promise<void>;

package/dist/utils/telemetry.js

@@ -0,0 +1,30 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.collectTelemetry = void 0;
+const node_machine_id_1 = require("node-machine-id");
+const package_json_1 = require("../../package.json");
+const env_1 = __importDefault(require("../env"));
+const logger_1 = __importDefault(require("../logger"));
+async function collectTelemetry() {
+    const axios = (await import('axios')).default;
+    if (env_1.default['TELEMETRY'] !== false) {
+        try {
+            await axios.post('https://telemetry.directus.io/', {
+                version: package_json_1.version,
+                public_url: env_1.default['PUBLIC_URL'],
+                project_id: env_1.default['KEY'],
+                machine_id: await (0, node_machine_id_1.machineId)(),
+                db_client: env_1.default['DB_CLIENT'],
+            });
+        }
+        catch (err) {
+            if (env_1.default['NODE_ENV'] === 'development') {
+                logger_1.default.error(err);
+            }
+        }
+    }
+}
+exports.collectTelemetry = collectTelemetry;

package/dist/utils/validate-keys.js

@@ -16,7 +16,7 @@ function validateKeys(schema, collection, keyField, keys) {
         }
     }
     else {
-        const primaryKeyFieldType = schema.collections[collection].fields[keyField].type;
+        const primaryKeyFieldType = schema.collections[collection]?.fields[keyField]?.type;
         if (primaryKeyFieldType === 'uuid' && !(0, uuid_validate_1.default)(String(keys))) {
             throw new exceptions_1.ForbiddenException();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "directus",
-  "version": "9.23.4",
+  "version": "9.24.0",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "keywords": [
     "directus",
@@ -144,18 +144,18 @@
     "uuid-validate": "0.0.3",
     "vm2": "3.9.14",
     "wellknown": "0.5.0",
-    "@directus/app": "9.23.4",
-    "@directus/schema": "9.23.4",
-    "@directus/extensions-sdk": "9.23.4",
-    "@directus/shared": "9.23.4",
-    "@directus/storage": "9.23.4",
-    "@directus/specs": "9.23.4",
-    "@directus/storage-driver-azure": "9.23.4",
-    "@directus/storage-driver-cloudinary": "9.23.4",
-    "@directus/storage-driver-gcs": "9.23.4",
-    "@directus/storage-driver-local": "9.23.4",
-    "@directus/storage-driver-s3": "9.23.4",
-    "@directus/utils": "9.23.4"
+    "@directus/app": "9.24.0",
+    "@directus/extensions-sdk": "9.24.0",
+    "@directus/schema": "9.24.0",
+    "@directus/shared": "9.24.0",
+    "@directus/specs": "9.24.0",
+    "@directus/storage": "9.24.0",
+    "@directus/storage-driver-azure": "9.24.0",
+    "@directus/storage-driver-cloudinary": "9.24.0",
+    "@directus/storage-driver-gcs": "9.24.0",
+    "@directus/storage-driver-local": "9.24.0",
+    "@directus/storage-driver-s3": "9.24.0",
+    "@directus/utils": "9.24.0"
   },
   "devDependencies": {
     "@ngneat/falso": "6.4.0",

package/dist/utils/track.d.ts

@@ -1 +0,0 @@
-export declare function track(event: string): Promise<void>;

package/dist/utils/track.js

@@ -1,81 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.track = void 0;
-const node_machine_id_1 = require("node-machine-id");
-const os_1 = __importDefault(require("os"));
-// @ts-ignore
-const utils_1 = require("@directus/shared/utils");
-const package_json_1 = require("../../package.json");
-const env_1 = __importDefault(require("../env"));
-const logger_1 = __importDefault(require("../logger"));
-const get_milliseconds_1 = require("./get-milliseconds");
-async function track(event) {
-    const axios = (await import('axios')).default;
-    if (env_1.default['TELEMETRY'] !== false) {
-        const info = await getEnvInfo(event);
-        try {
-            await axios.post('https://telemetry.directus.io/', info);
-        }
-        catch (err) {
-            if (env_1.default['NODE_ENV'] === 'development') {
-                logger_1.default.error(err);
-            }
-        }
-    }
-}
-exports.track = track;
-async function getEnvInfo(event) {
-    return {
-        version: package_json_1.version,
-        event: event,
-        project_id: env_1.default['KEY'],
-        machine_id: await (0, node_machine_id_1.machineId)(),
-        environment: env_1.default['NODE_ENV'],
-        stack: 'node',
-        os: {
-            arch: os_1.default.arch(),
-            platform: os_1.default.platform(),
-            release: os_1.default.release(),
-        },
-        rate_limiter: {
-            enabled: env_1.default['RATE_LIMITER_ENABLED'],
-            points: +env_1.default['RATE_LIMITER_POINTS'],
-            duration: +env_1.default['RATE_LIMITER_DURATION'],
-            store: env_1.default['RATE_LIMITER_STORE'],
-        },
-        cache: {
-            enabled: env_1.default['CACHE_ENABLED'],
-            ttl: (0, get_milliseconds_1.getMilliseconds)(env_1.default['CACHE_TTL']),
-            store: env_1.default['CACHE_STORE'],
-        },
-        storage: {
-            drivers: getStorageDrivers(),
-        },
-        cors: {
-            enabled: env_1.default['CORS_ENABLED'],
-        },
-        email: {
-            transport: env_1.default['EMAIL_TRANSPORT'],
-        },
-        auth: {
-            providers: (0, utils_1.toArray)(env_1.default['AUTH_PROVIDERS'])
-                .map((v) => v.trim())
-                .filter((v) => v),
-        },
-        db_client: env_1.default['DB_CLIENT'],
-    };
-}
-function getStorageDrivers() {
-    const drivers = [];
-    const locations = (0, utils_1.toArray)(env_1.default['STORAGE_LOCATIONS'])
-        .map((v) => v.trim())
-        .filter((v) => v);
-    for (const location of locations) {
-        const driver = env_1.default[`STORAGE_${location.toUpperCase()}_DRIVER`];
-        drivers.push(driver);
-    }
-    return drivers;
-}