directus 9.23.3 → 9.24.0

package/dist/utils/sanitize-query.js

@@ -10,49 +10,49 @@ const logger_1 = __importDefault(require("../logger"));
 const types_1 = require("../types");
 function sanitizeQuery(rawQuery, accountability) {
     const query = {};
-    if (rawQuery.limit !== undefined) {
-        const limit = sanitizeLimit(rawQuery.limit);
+    if (rawQuery['limit'] !== undefined) {
+        const limit = sanitizeLimit(rawQuery['limit']);
         if (typeof limit === 'number') {
             query.limit = limit;
         }
     }
-    if (rawQuery.fields) {
-        query.fields = sanitizeFields(rawQuery.fields);
+    if (rawQuery['fields']) {
+        query.fields = sanitizeFields(rawQuery['fields']);
     }
-    if (rawQuery.groupBy) {
-        query.group = sanitizeFields(rawQuery.groupBy);
+    if (rawQuery['groupBy']) {
+        query.group = sanitizeFields(rawQuery['groupBy']);
     }
-    if (rawQuery.aggregate) {
-        query.aggregate = sanitizeAggregate(rawQuery.aggregate);
+    if (rawQuery['aggregate']) {
+        query.aggregate = sanitizeAggregate(rawQuery['aggregate']);
     }
-    if (rawQuery.sort) {
-        query.sort = sanitizeSort(rawQuery.sort);
+    if (rawQuery['sort']) {
+        query.sort = sanitizeSort(rawQuery['sort']);
     }
-    if (rawQuery.filter) {
-        query.filter = sanitizeFilter(rawQuery.filter, accountability || null);
+    if (rawQuery['filter']) {
+        query.filter = sanitizeFilter(rawQuery['filter'], accountability || null);
     }
-    if (rawQuery.offset) {
-        query.offset = sanitizeOffset(rawQuery.offset);
+    if (rawQuery['offset']) {
+        query.offset = sanitizeOffset(rawQuery['offset']);
     }
-    if (rawQuery.page) {
-        query.page = sanitizePage(rawQuery.page);
+    if (rawQuery['page']) {
+        query.page = sanitizePage(rawQuery['page']);
     }
-    if (rawQuery.meta) {
-        query.meta = sanitizeMeta(rawQuery.meta);
+    if (rawQuery['meta']) {
+        query.meta = sanitizeMeta(rawQuery['meta']);
     }
-    if (rawQuery.search && typeof rawQuery.search === 'string') {
-        query.search = rawQuery.search;
+    if (rawQuery['search'] && typeof rawQuery['search'] === 'string') {
+        query.search = rawQuery['search'];
     }
-    if (rawQuery.export) {
-        query.export = rawQuery.export;
+    if (rawQuery['export']) {
+        query.export = rawQuery['export'];
     }
-    if (rawQuery.deep) {
+    if (rawQuery['deep']) {
         if (!query.deep)
             query.deep = {};
-        query.deep = sanitizeDeep(rawQuery.deep, accountability);
+        query.deep = sanitizeDeep(rawQuery['deep'], accountability);
     }
-    if (rawQuery.alias) {
-        query.alias = sanitizeAlias(rawQuery.alias);
+    if (rawQuery['alias']) {
+        query.alias = sanitizeAlias(rawQuery['alias']);
     }
     return query;
 }

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

@@ -11,10 +11,19 @@ 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;
-    if (env.CACHE_SKIP_ALLOWED && req.get('cache-control')?.includes('no-store'))
+    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/dist/utils/validate-query.js

@@ -157,7 +157,7 @@ function validateAlias(alias) {
     }
 }
 function validateRelationalDepth(query) {
-    const maxRelationalDepth = Number(env_1.default.MAX_RELATIONAL_DEPTH) > 2 ? Number(env_1.default.MAX_RELATIONAL_DEPTH) : 2;
+    const maxRelationalDepth = Number(env_1.default['MAX_RELATIONAL_DEPTH']) > 2 ? Number(env_1.default['MAX_RELATIONAL_DEPTH']) : 2;
     // Process the fields in the same way as api/src/utils/get-ast-from-query.ts
     let fields = ['*'];
     if (query.fields) {

package/dist/utils/validate-storage.js

@@ -11,28 +11,28 @@ const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
 const utils_1 = require("@directus/shared/utils");
 async function validateStorage() {
-    if (env_1.default.DB_CLIENT === 'sqlite3') {
+    if (env_1.default['DB_CLIENT'] === 'sqlite3') {
         try {
-            await (0, fs_extra_1.access)(path_1.default.dirname(env_1.default.DB_FILENAME), fs_1.constants.R_OK | fs_1.constants.W_OK);
+            await (0, fs_extra_1.access)(path_1.default.dirname(env_1.default['DB_FILENAME']), fs_1.constants.R_OK | fs_1.constants.W_OK);
         }
         catch {
-            logger_1.default.warn(`Directory for SQLite database file (${path_1.default.resolve(path_1.default.dirname(env_1.default.DB_FILENAME))}) is not read/writeable!`);
+            logger_1.default.warn(`Directory for SQLite database file (${path_1.default.resolve(path_1.default.dirname(env_1.default['DB_FILENAME']))}) is not read/writeable!`);
         }
     }
-    const usedStorageDrivers = (0, utils_1.toArray)(env_1.default.STORAGE_LOCATIONS).map((location) => env_1.default[`STORAGE_${location.toUpperCase()}_DRIVER`]);
+    const usedStorageDrivers = (0, utils_1.toArray)(env_1.default['STORAGE_LOCATIONS']).map((location) => env_1.default[`STORAGE_${location.toUpperCase()}_DRIVER`]);
     if (usedStorageDrivers.includes('local')) {
         try {
-            await (0, fs_extra_1.access)(env_1.default.STORAGE_LOCAL_ROOT, fs_1.constants.R_OK | fs_1.constants.W_OK);
+            await (0, fs_extra_1.access)(env_1.default['STORAGE_LOCAL_ROOT'], fs_1.constants.R_OK | fs_1.constants.W_OK);
         }
         catch {
-            logger_1.default.warn(`Upload directory (${path_1.default.resolve(env_1.default.STORAGE_LOCAL_ROOT)}) is not read/writeable!`);
+            logger_1.default.warn(`Upload directory (${path_1.default.resolve(env_1.default['STORAGE_LOCAL_ROOT'])}) is not read/writeable!`);
         }
     }
     try {
-        await (0, fs_extra_1.access)(env_1.default.EXTENSIONS_PATH, fs_1.constants.R_OK);
+        await (0, fs_extra_1.access)(env_1.default['EXTENSIONS_PATH'], fs_1.constants.R_OK);
     }
     catch {
-        logger_1.default.warn(`Extensions directory (${path_1.default.resolve(env_1.default.EXTENSIONS_PATH)}) is not readable!`);
+        logger_1.default.warn(`Extensions directory (${path_1.default.resolve(env_1.default['EXTENSIONS_PATH'])}) is not readable!`);
     }
 }
 exports.validateStorage = validateStorage;

package/dist/webhooks.js

@@ -18,7 +18,7 @@ async function init() {
     await register();
     const messenger = (0, messenger_1.getMessenger)();
     messenger.subscribe('webhooks', (event) => {
-        if (event.type === 'reload') {
+        if (event['type'] === 'reload') {
             reloadQueue.enqueue(async () => {
                 await reload();
             });
@@ -53,7 +53,7 @@ function unregister() {
 exports.unregister = unregister;
 function createHandler(webhook, event) {
     return async (meta, context) => {
-        if (webhook.collections.includes(meta.collection) === false)
+        if (webhook.collections.includes(meta['collection']) === false)
             return;
         const axios = await (0, index_1.getAxios)();
         const webhookPayload = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "directus",
-  "version": "9.23.3",
+  "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.3",
-    "@directus/extensions-sdk": "9.23.3",
-    "@directus/schema": "9.23.3",
-    "@directus/shared": "9.23.3",
-    "@directus/specs": "9.23.3",
-    "@directus/storage": "9.23.3",
-    "@directus/storage-driver-azure": "9.23.3",
-    "@directus/storage-driver-cloudinary": "9.23.3",
-    "@directus/storage-driver-gcs": "9.23.3",
-    "@directus/storage-driver-local": "9.23.3",
-    "@directus/storage-driver-s3": "9.23.3",
-    "@directus/utils": "9.23.3"
+    "@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/redact-header-cookies.d.ts

@@ -1 +0,0 @@
-export declare function redactHeaderCookie(cookieHeader: string, cookieNames: string[]): string;

package/dist/utils/redact-header-cookies.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.redactHeaderCookie = void 0;
-function redactHeaderCookie(cookieHeader, cookieNames) {
-    for (const cookieName of cookieNames) {
-        const re = new RegExp(`(${cookieName}=)([^;]+)`);
-        cookieHeader = cookieHeader.replace(re, `$1--redacted--`);
-    }
-    return cookieHeader;
-}
-exports.redactHeaderCookie = redactHeaderCookie;

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;
-}