directus 9.23.3 → 9.23.4

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

@@ -181,7 +181,7 @@ async function getASTFromQuery(collection, query, schema, options) {
                     continue;
                 }
                 // update query alias for children parseFields
-                const deepAlias = getDeepQuery(deep?.[fieldKey] || {})?.alias;
+                const deepAlias = getDeepQuery(deep?.[fieldKey] || {})?.['alias'];
                 if (!(0, lodash_1.isEmpty)(deepAlias))
                     query.alias = deepAlias;
                 child = {

package/dist/utils/get-auth-providers.js

@@ -7,7 +7,7 @@ exports.getAuthProviders = void 0;
 const utils_1 = require("@directus/shared/utils");
 const env_1 = __importDefault(require("../env"));
 function getAuthProviders() {
-    return (0, utils_1.toArray)(env_1.default.AUTH_PROVIDERS)
+    return (0, utils_1.toArray)(env_1.default['AUTH_PROVIDERS'])
         .filter((provider) => provider && env_1.default[`AUTH_${provider.toUpperCase()}_DRIVER`])
         .map((provider) => ({
         name: provider,

package/dist/utils/get-cache-headers.js

@@ -22,7 +22,7 @@ function getCacheControlHeader(req, ttl, globalCacheSettings, personalized) {
     if (ttl === undefined || ttl < 0)
         return 'no-cache';
     // When the API cache can invalidate at any moment
-    if (globalCacheSettings && env_1.default.CACHE_AUTO_PURGE === true)
+    if (globalCacheSettings && env_1.default['CACHE_AUTO_PURGE'] === true)
         return 'no-cache';
     const headerValues = [];
     // When caching depends on the authentication status of the users
@@ -35,8 +35,8 @@ function getCacheControlHeader(req, ttl, globalCacheSettings, personalized) {
     const ttlSeconds = Math.round(ttl / 1000);
     headerValues.push(`max-age=${ttlSeconds}`);
     // When the s-maxage flag should be included
-    if (globalCacheSettings && Number.isInteger(env_1.default.CACHE_CONTROL_S_MAXAGE) && env_1.default.CACHE_CONTROL_S_MAXAGE >= 0) {
-        headerValues.push(`s-maxage=${env_1.default.CACHE_CONTROL_S_MAXAGE}`);
+    if (globalCacheSettings && Number.isInteger(env_1.default['CACHE_CONTROL_S_MAXAGE']) && env_1.default['CACHE_CONTROL_S_MAXAGE'] >= 0) {
+        headerValues.push(`s-maxage=${env_1.default['CACHE_CONTROL_S_MAXAGE']}`);
     }
     return headerValues.join(', ');
 }

package/dist/utils/get-collection-from-alias.js

@@ -11,5 +11,6 @@ function getCollectionFromAlias(alias, aliasMap) {
             return aliasValue.collection;
         }
     }
+    return undefined;
 }
 exports.getCollectionFromAlias = getCollectionFromAlias;

package/dist/utils/get-default-value.js

@@ -52,7 +52,7 @@ function castToObject(value) {
             return (0, utils_1.parseJSON)(value);
         }
         catch (err) {
-            if (env_1.default.NODE_ENV === 'development') {
+            if (env_1.default['NODE_ENV'] === 'development') {
                 logger_1.default.error(err);
             }
             return value;

package/dist/utils/get-ip-from-req.js

@@ -9,8 +9,8 @@ const env_1 = __importDefault(require("../env"));
 const logger_1 = __importDefault(require("../logger"));
 function getIPFromReq(req) {
     let ip = req.ip;
-    if (env_1.default.IP_CUSTOM_HEADER) {
-        const customIPHeaderValue = req.get(env_1.default.IP_CUSTOM_HEADER);
+    if (env_1.default['IP_CUSTOM_HEADER']) {
+        const customIPHeaderValue = req.get(env_1.default['IP_CUSTOM_HEADER']);
         if (typeof customIPHeaderValue === 'string' && (0, net_1.isIP)(customIPHeaderValue) !== 0) {
             ip = customIPHeaderValue;
         }

package/dist/utils/get-permissions.js

@@ -22,7 +22,7 @@ async function getPermissions(accountability, schema) {
     let permissions = [];
     const { user, role, app, admin, share_scope } = accountability;
     const cacheKey = `permissions-${(0, object_hash_1.default)({ user, role, app, admin, share_scope })}`;
-    if (cache && env_1.default.CACHE_PERMISSIONS !== false) {
+    if (cache && env_1.default['CACHE_PERMISSIONS'] !== false) {
         let cachedPermissions;
         try {
             cachedPermissions = await (0, cache_1.getSystemCache)(cacheKey);
@@ -31,20 +31,20 @@ async function getPermissions(accountability, schema) {
             logger_1.default.warn(err, `[cache] Couldn't read key ${cacheKey}. ${err.message}`);
         }
         if (cachedPermissions) {
-            if (!cachedPermissions.containDynamicData) {
-                return processPermissions(accountability, cachedPermissions.permissions, {});
+            if (!cachedPermissions['containDynamicData']) {
+                return processPermissions(accountability, cachedPermissions['permissions'], {});
             }
-            const cachedFilterContext = await (0, cache_1.getCacheValue)(cache, `filterContext-${(0, object_hash_1.default)({ user, role, permissions: cachedPermissions.permissions })}`);
+            const cachedFilterContext = await (0, cache_1.getCacheValue)(cache, `filterContext-${(0, object_hash_1.default)({ user, role, permissions: cachedPermissions['permissions'] })}`);
             if (cachedFilterContext) {
-                return processPermissions(accountability, cachedPermissions.permissions, cachedFilterContext);
+                return processPermissions(accountability, cachedPermissions['permissions'], cachedFilterContext);
             }
             else {
-                const { permissions: parsedPermissions, requiredPermissionData, containDynamicData, } = parsePermissions(cachedPermissions.permissions);
+                const { permissions: parsedPermissions, requiredPermissionData, containDynamicData, } = parsePermissions(cachedPermissions['permissions']);
                 permissions = parsedPermissions;
                 const filterContext = containDynamicData
                     ? await getFilterContext(schema, accountability, requiredPermissionData)
                     : {};
-                if (containDynamicData && env_1.default.CACHE_ENABLED !== false) {
+                if (containDynamicData && env_1.default['CACHE_ENABLED'] !== false) {
                     await (0, cache_1.setCacheValue)(cache, `filterContext-${(0, object_hash_1.default)({ user, role, permissions })}`, filterContext);
                 }
                 return processPermissions(accountability, permissions, filterContext);
@@ -71,9 +71,9 @@ async function getPermissions(accountability, schema) {
         const filterContext = containDynamicData
             ? await getFilterContext(schema, accountability, requiredPermissionData)
             : {};
-        if (cache && env_1.default.CACHE_PERMISSIONS !== false) {
+        if (cache && env_1.default['CACHE_PERMISSIONS'] !== false) {
             await (0, cache_1.setSystemCache)(cacheKey, { permissions, containDynamicData });
-            if (containDynamicData && env_1.default.CACHE_ENABLED !== false) {
+            if (containDynamicData && env_1.default['CACHE_ENABLED'] !== false) {
                 await (0, cache_1.setCacheValue)(cache, `filterContext-${(0, object_hash_1.default)({ user, role, permissions })}`, filterContext);
             }
         }
@@ -137,12 +137,12 @@ async function getFilterContext(schema, accountability, requiredPermissionData)
     const rolesService = new roles_1.RolesService({ schema });
     const filterContext = {};
     if (accountability.user && requiredPermissionData.$CURRENT_USER.length > 0) {
-        filterContext.$CURRENT_USER = await usersService.readOne(accountability.user, {
+        filterContext['$CURRENT_USER'] = await usersService.readOne(accountability.user, {
             fields: requiredPermissionData.$CURRENT_USER,
         });
     }
     if (accountability.role && requiredPermissionData.$CURRENT_ROLE.length > 0) {
-        filterContext.$CURRENT_ROLE = await rolesService.readOne(accountability.role, {
+        filterContext['$CURRENT_ROLE'] = await rolesService.readOne(accountability.role, {
             fields: requiredPermissionData.$CURRENT_ROLE,
         });
     }

package/dist/utils/get-schema.js

@@ -21,7 +21,7 @@ async function getSchema(options) {
     const database = options?.database || (0, database_1.default)();
     const schemaInspector = (0, schema_1.default)(database);
     let result;
-    if (!options?.bypassCache && env_1.default.CACHE_SCHEMA !== false) {
+    if (!options?.bypassCache && env_1.default['CACHE_SCHEMA'] !== false) {
         let cachedSchema;
         try {
             cachedSchema = await (0, cache_1.getSchemaCache)();
@@ -61,7 +61,7 @@ async function getDatabaseSchema(database, schemaInspector) {
         ...collections_1.systemCollectionRows,
     ];
     for (const [collection, info] of Object.entries(schemaOverview)) {
-        if ((0, utils_1.toArray)(env_1.default.DB_EXCLUDE_TABLES).includes(collection)) {
+        if ((0, utils_1.toArray)(env_1.default['DB_EXCLUDE_TABLES']).includes(collection)) {
             logger_1.default.trace(`Collection "${collection}" is configured to be excluded and will be ignored`);
             continue;
         }

package/dist/utils/is-url-allowed.js

@@ -13,7 +13,8 @@ function isUrlAllowed(url, allowList) {
     const urlAllowList = (0, utils_1.toArray)(allowList);
     if (urlAllowList.includes(url))
         return true;
-    const parsedWhitelist = urlAllowList.map((allowedURL) => {
+    const parsedWhitelist = urlAllowList
+        .map((allowedURL) => {
         try {
             const { hostname, pathname } = new url_1.URL(allowedURL);
             return hostname + pathname;
@@ -21,7 +22,9 @@ function isUrlAllowed(url, allowList) {
         catch {
             logger_1.default.warn(`Invalid URL used "${url}"`);
         }
-    });
+        return null;
+    })
+        .filter((f) => f);
     try {
         const { hostname, pathname } = new url_1.URL(url);
         return parsedWhitelist.includes(hostname + pathname);

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,10 @@ 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();
+    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'))
+    if (env['CACHE_SKIP_ALLOWED'] && req.get('cache-control')?.includes('no-store'))
         return true;
     return false;
 }

package/dist/utils/track.js

@@ -14,13 +14,13 @@ 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) {
+    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') {
+            if (env_1.default['NODE_ENV'] === 'development') {
                 logger_1.default.error(err);
             }
         }
@@ -31,9 +31,9 @@ async function getEnvInfo(event) {
     return {
         version: package_json_1.version,
         event: event,
-        project_id: env_1.default.KEY,
+        project_id: env_1.default['KEY'],
         machine_id: await (0, node_machine_id_1.machineId)(),
-        environment: env_1.default.NODE_ENV,
+        environment: env_1.default['NODE_ENV'],
         stack: 'node',
         os: {
             arch: os_1.default.arch(),
@@ -41,36 +41,36 @@ async function getEnvInfo(event) {
             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,
+            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,
+            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,
+            enabled: env_1.default['CORS_ENABLED'],
         },
         email: {
-            transport: env_1.default.EMAIL_TRANSPORT,
+            transport: env_1.default['EMAIL_TRANSPORT'],
         },
         auth: {
-            providers: (0, utils_1.toArray)(env_1.default.AUTH_PROVIDERS)
+            providers: (0, utils_1.toArray)(env_1.default['AUTH_PROVIDERS'])
                 .map((v) => v.trim())
                 .filter((v) => v),
         },
-        db_client: env_1.default.DB_CLIENT,
+        db_client: env_1.default['DB_CLIENT'],
     };
 }
 function getStorageDrivers() {
     const drivers = [];
-    const locations = (0, utils_1.toArray)(env_1.default.STORAGE_LOCATIONS)
+    const locations = (0, utils_1.toArray)(env_1.default['STORAGE_LOCATIONS'])
         .map((v) => v.trim())
         .filter((v) => v);
     for (const location of locations) {

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.23.4",
   "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.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"
   },
   "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;