directus 9.18.1 → 9.19.1

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

@@ -20,7 +20,9 @@ fields:
     width: half
 
   - field: password
-    special: hash,conceal
+    special:
+      - hash
+      - conceal
     interface: input-hash
     options:
       iconRight: lock
@@ -50,7 +52,8 @@ fields:
 
   - field: tags
     interface: tags
-    special: cast-json
+    special:
+      - cast-json
     width: full
     options:
       iconRight: local_offer
@@ -89,13 +92,15 @@ fields:
 
   - field: tfa_secret
     interface: system-mfa-setup
-    special: conceal
+    special:
+      - conceal
     width: half
 
   - field: email_notifications
     interface: boolean
     width: half
-    special: cast-boolean
+    special:
+      - cast-boolean
 
   - field: admin_divider
     interface: presentation-divider
@@ -128,7 +133,8 @@ fields:
     interface: select-dropdown-m2o
     options:
       template: '{{ name }}'
-    special: m2o
+    special:
+      - m2o
     width: half
     display: related-values
     display_options:
@@ -136,11 +142,13 @@ fields:
 
   - field: token
     interface: system-token
-    special: conceal
+    special:
+      - conceal
     width: full
 
   - field: id
-    special: uuid
+    special:
+      - uuid
     interface: input
     options:
       iconRight: vpn_key

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

@@ -60,12 +60,14 @@ fields:
     interface: boolean
     options:
       label: $t:fields.directus_webhooks.data_label
-    special: cast-boolean
+    special:
+      - cast-boolean
     width: half
     display: boolean
 
   - field: headers
-    special: cast-json
+    special:
+      - cast-json
     interface: list
     options:
       template: '{{ header }}: {{ value }}'
@@ -105,7 +107,8 @@ fields:
           value: update
         - text: $t:delete_label
           value: delete
-    special: cast-csv
+    special:
+      - cast-csv
     width: full
     display: labels
     display_options:
@@ -129,7 +132,8 @@ fields:
 
   - field: collections
     interface: system-collections
-    special: cast-csv
+    special:
+      - cast-csv
     width: full
     display: labels
     display_options:

package/dist/env.js

@@ -92,6 +92,7 @@ const allowedEnvironmentVars = [
     'STORAGE_.+_ENDPOINT',
     'STORAGE_.+_ACL',
     'STORAGE_.+_CONTAINER_NAME',
+    'STORAGE_.+_SERVER_SIDE_ENCRYPTION',
     'STORAGE_.+_ACCOUNT_NAME',
     'STORAGE_.+_ACCOUNT_KEY',
     'STORAGE_.+_ENDPOINT',
@@ -123,6 +124,7 @@ const allowedEnvironmentVars = [
     'AUTH_.+_ALLOW_PUBLIC_REGISTRATION',
     'AUTH_.+_DEFAULT_ROLE_ID',
     'AUTH_.+_ICON',
+    'AUTH_.+_LABEL',
     'AUTH_.+_PARAMS',
     'AUTH_.+_ISSUER_URL',
     'AUTH_.+_AUTH_REQUIRE_VERIFIED_EMAIL',
@@ -186,7 +188,7 @@ const defaults = {
     HOST: '0.0.0.0',
     PORT: 8055,
     PUBLIC_URL: '/',
-    MAX_PAYLOAD_SIZE: '100kb',
+    MAX_PAYLOAD_SIZE: '1mb',
     MAX_RELATIONAL_DEPTH: 10,
     DB_EXCLUDE_TABLES: 'spatial_ref_sys,sysdiagrams',
     STORAGE_LOCATIONS: 'local',
@@ -351,7 +353,7 @@ function processValues(env) {
         if (key.length > 5 && key.endsWith('_FILE')) {
             newKey = key.slice(0, -5);
             if (allowedEnvironmentVars.some((pattern) => pattern.test(newKey))) {
-                if (newKey in env) {
+                if (newKey in env && !(newKey in defaults && env[newKey] === defaults[newKey])) {
                     throw new Error(`Duplicate environment variable encountered: you can't use "${newKey}" and "${key}" simultaneously.`);
                 }
                 try {

package/dist/env.test.js

@@ -17,6 +17,7 @@ describe('env processed values', () => {
     });
     afterEach(() => {
         process.env = originalEnv;
+        jest.resetAllMocks();
     });
     test('Number value should be a number', () => {
         expect(env.NUMBER).toStrictEqual(1234);

package/dist/logger.d.ts

@@ -1,5 +1,5 @@
 import { RequestHandler } from 'express';
-import pino from 'pino';
-declare const logger: pino.Logger;
+import { LoggerOptions } from 'pino';
+declare const logger: import("pino").Logger<LoggerOptions & Record<string, any>>;
 export declare const expressLogger: RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
 export default logger;

package/dist/logger.js

@@ -33,6 +33,7 @@ const get_config_from_env_1 = require("./utils/get-config-from-env");
 const url_1 = require("url");
 const env_1 = __importDefault(require("./env"));
 const utils_1 = require("@directus/shared/utils");
+const lodash_1 = require("lodash");
 const pinoOptions = {
     level: env_1.default.LOG_LEVEL || 'info',
     redact: {
@@ -41,8 +42,14 @@ const pinoOptions = {
     },
 };
 if (env_1.default.LOG_STYLE !== 'raw') {
-    pinoOptions.prettyPrint = true;
-    pinoOptions.prettifier = require('pino-colada');
+    pinoOptions.transport = {
+        target: 'pino-http-print',
+        options: {
+            all: true,
+            translateTime: 'SYS:HH:MM:ss',
+            relativeUrl: true,
+        },
+    };
 }
 const loggerEnvConfig = (0, get_config_from_env_1.getConfigFromEnv)('LOGGER_', 'LOGGER_HTTP');
 // Expose custom log levels into formatter function
@@ -62,7 +69,7 @@ if (loggerEnvConfig.levels) {
     };
     delete loggerEnvConfig.levels;
 }
-const logger = (0, pino_1.default)(Object.assign(pinoOptions, loggerEnvConfig));
+const logger = (0, pino_1.default)((0, lodash_1.merge)(pinoOptions, loggerEnvConfig));
 const httpLoggerEnvConfig = (0, get_config_from_env_1.getConfigFromEnv)('LOGGER_HTTP', ['LOGGER_HTTP_LOGGER']);
 exports.expressLogger = (0, pino_http_1.default)({
     logger,

package/dist/messenger.d.ts

@@ -1,4 +1,4 @@
-import IORedis from 'ioredis';
+import type { Redis } from 'ioredis';
 export declare type MessengerSubscriptionCallback = (payload: Record<string, any>) => void;
 export interface Messenger {
     publish: (channel: string, payload: Record<string, any>) => void;
@@ -14,8 +14,8 @@ export declare class MessengerMemory implements Messenger {
 }
 export declare class MessengerRedis implements Messenger {
     namespace: string;
-    pub: IORedis.Redis;
-    sub: IORedis.Redis;
+    pub: Redis;
+    sub: Redis;
     constructor();
     publish(channel: string, payload: Record<string, any>): void;
     subscribe(channel: string, callback: MessengerSubscriptionCallback): void;

package/dist/services/collections.d.ts

@@ -44,6 +44,10 @@ export declare class CollectionsService {
      * Update a single collection by name
      */
     updateOne(collectionKey: string, data: Partial<Collection>, opts?: MutationOptions): Promise<string>;
+    /**
+     * Update multiple collections in a single transaction
+     */
+    updateBatch(data: Partial<Collection>[], opts?: MutationOptions): Promise<string[]>;
     /**
      * Update multiple collections by name
      */

package/dist/services/collections.js

@@ -38,6 +38,7 @@ const fields_1 = require("../services/fields");
 const items_1 = require("../services/items");
 const utils_1 = require("@directus/shared/utils");
 const helpers_1 = require("../database/helpers");
+const lodash_1 = require("lodash");
 class CollectionsService {
     constructor(options) {
         this.knex = options.knex || (0, database_1.default)();
@@ -145,7 +146,9 @@ class CollectionsService {
             if (this.cache && env_1.default.CACHE_AUTO_PURGE && (opts === null || opts === void 0 ? void 0 : opts.autoPurgeCache) !== false) {
                 await this.cache.clear();
             }
-            await (0, cache_1.clearSystemCache)();
+            if ((opts === null || opts === void 0 ? void 0 : opts.autoPurgeSystemCache) !== false) {
+                await (0, cache_1.clearSystemCache)();
+            }
         }
     }
     /**
@@ -161,7 +164,7 @@ class CollectionsService {
                 });
                 const collectionNames = [];
                 for (const payload of payloads) {
-                    const name = await service.createOne(payload, { autoPurgeCache: false });
+                    const name = await service.createOne(payload, { autoPurgeCache: false, autoPurgeSystemCache: false });
                     collectionNames.push(name);
                 }
                 return collectionNames;
@@ -297,12 +300,52 @@ class CollectionsService {
             }
             return collectionKey;
         }
+        finally {
+            if (this.cache && env_1.default.CACHE_AUTO_PURGE && (opts === null || opts === void 0 ? void 0 : opts.autoPurgeCache) !== false) {
+                await this.cache.clear();
+            }
+            if ((opts === null || opts === void 0 ? void 0 : opts.autoPurgeSystemCache) !== false) {
+                await (0, cache_1.clearSystemCache)();
+            }
+        }
+    }
+    /**
+     * Update multiple collections in a single transaction
+     */
+    async updateBatch(data, opts) {
+        if (this.accountability && this.accountability.admin !== true) {
+            throw new exceptions_1.ForbiddenException();
+        }
+        if (!Array.isArray(data)) {
+            throw new exceptions_1.InvalidPayloadException('Input should be an array of collection changes.');
+        }
+        const collectionKey = 'collection';
+        const collectionKeys = [];
+        try {
+            await this.knex.transaction(async (trx) => {
+                const collectionItemsService = new CollectionsService({
+                    knex: trx,
+                    accountability: this.accountability,
+                    schema: this.schema,
+                });
+                for (const payload of data) {
+                    if (!payload[collectionKey])
+                        throw new exceptions_1.InvalidPayloadException(`Collection in update misses collection key.`);
+                    await collectionItemsService.updateOne(payload[collectionKey], (0, lodash_1.omit)(payload, collectionKey), {
+                        autoPurgeCache: false,
+                        autoPurgeSystemCache: false,
+                    });
+                    collectionKeys.push(payload[collectionKey]);
+                }
+            });
+        }
         finally {
             if (this.cache && env_1.default.CACHE_AUTO_PURGE && (opts === null || opts === void 0 ? void 0 : opts.autoPurgeCache) !== false) {
                 await this.cache.clear();
             }
             await (0, cache_1.clearSystemCache)();
         }
+        return collectionKeys;
     }
     /**
      * Update multiple collections by name
@@ -319,7 +362,7 @@ class CollectionsService {
                     knex: trx,
                 });
                 for (const collectionKey of collectionKeys) {
-                    await service.updateOne(collectionKey, data, { autoPurgeCache: false });
+                    await service.updateOne(collectionKey, data, { autoPurgeCache: false, autoPurgeSystemCache: false });
                 }
             });
             return collectionKeys;
@@ -413,7 +456,9 @@ class CollectionsService {
             if (this.cache && env_1.default.CACHE_AUTO_PURGE && (opts === null || opts === void 0 ? void 0 : opts.autoPurgeCache) !== false) {
                 await this.cache.clear();
             }
-            await (0, cache_1.clearSystemCache)();
+            if ((opts === null || opts === void 0 ? void 0 : opts.autoPurgeSystemCache) !== false) {
+                await (0, cache_1.clearSystemCache)();
+            }
         }
     }
     /**
@@ -431,7 +476,7 @@ class CollectionsService {
                     knex: trx,
                 });
                 for (const collectionKey of collectionKeys) {
-                    await service.deleteOne(collectionKey, { autoPurgeCache: false });
+                    await service.deleteOne(collectionKey, { autoPurgeCache: false, autoPurgeSystemCache: false });
                 }
             });
             return collectionKeys;