directus 9.23.1 → 9.23.4

package/dist/flows.js

@@ -67,16 +67,17 @@ const ACCOUNTABILITY_KEY = '$accountability';
 const LAST_KEY = '$last';
 const ENV_KEY = '$env';
 class FlowManager {
+    isLoaded = false;
+    operations = {};
+    triggerHandlers = [];
+    operationFlowHandlers = {};
+    webhookFlowHandlers = {};
+    reloadQueue;
     constructor() {
-        this.isLoaded = false;
-        this.operations = {};
-        this.triggerHandlers = [];
-        this.operationFlowHandlers = {};
-        this.webhookFlowHandlers = {};
         this.reloadQueue = new job_queue_1.JobQueue();
         const messenger = (0, messenger_1.getMessenger)();
         messenger.subscribe('flows', (event) => {
-            if (event.type === 'reload') {
+            if (event['type'] === 'reload') {
                 this.reloadQueue.enqueue(async () => {
                     if (this.isLoaded) {
                         await this.unload();
@@ -121,7 +122,6 @@ class FlowManager {
         return handler(data, context);
     }
     async load() {
-        var _a, _b, _c, _d;
         const flowsService = new services_1.FlowsService({ knex: (0, database_1.default)(), schema: await (0, get_schema_1.getSchema)() });
         const flows = await flowsService.readByQuery({
             filter: { status: { _eq: 'active' } },
@@ -132,14 +132,13 @@ class FlowManager {
         for (const flow of flowTrees) {
             if (flow.trigger === 'event') {
                 let events = [];
-                if ((_a = flow.options) === null || _a === void 0 ? void 0 : _a.scope) {
-                    events = (0, utils_1.toArray)(flow.options.scope)
+                if (flow.options?.['scope']) {
+                    events = (0, utils_1.toArray)(flow.options['scope'])
                         .map((scope) => {
-                        var _a;
                         if (['items.create', 'items.update', 'items.delete'].includes(scope)) {
-                            if (!((_a = flow.options) === null || _a === void 0 ? void 0 : _a.collections))
+                            if (!flow.options?.['collections'])
                                 return [];
-                            return (0, utils_1.toArray)(flow.options.collections).map((collection) => {
+                            return (0, utils_1.toArray)(flow.options['collections']).map((collection) => {
                                 if (collection.startsWith('directus_')) {
                                     const action = scope.split('.')[1];
                                     return collection.substring(9) + '.' + action;
@@ -151,11 +150,11 @@ class FlowManager {
                     })
                         .flat();
                 }
-                if (flow.options.type === 'filter') {
+                if (flow.options['type'] === 'filter') {
                     const handler = (payload, meta, context) => this.executeFlow(flow, { payload, ...meta }, {
-                        accountability: context.accountability,
-                        database: context.database,
-                        getSchema: context.schema ? () => context.schema : get_schema_1.getSchema,
+                        accountability: context['accountability'],
+                        database: context['database'],
+                        getSchema: context['schema'] ? () => context['schema'] : get_schema_1.getSchema,
                     });
                     events.forEach((event) => emitter_1.default.onFilter(event, handler));
                     this.triggerHandlers.push({
@@ -163,11 +162,11 @@ class FlowManager {
                         events: events.map((event) => ({ type: 'filter', name: event, handler })),
                     });
                 }
-                else if (flow.options.type === 'action') {
+                else if (flow.options['type'] === 'action') {
                     const handler = (meta, context) => this.executeFlow(flow, meta, {
-                        accountability: context.accountability,
+                        accountability: context['accountability'],
                         database: (0, database_1.default)(),
-                        getSchema: context.schema ? () => context.schema : get_schema_1.getSchema,
+                        getSchema: context['schema'] ? () => context['schema'] : get_schema_1.getSchema,
                     });
                     events.forEach((event) => emitter_1.default.onAction(event, handler));
                     this.triggerHandlers.push({
@@ -177,8 +176,8 @@ class FlowManager {
                 }
             }
             else if (flow.trigger === 'schedule') {
-                if ((0, node_cron_1.validate)(flow.options.cron)) {
-                    const task = (0, node_cron_1.schedule)(flow.options.cron, async () => {
+                if ((0, node_cron_1.validate)(flow.options['cron'])) {
+                    const task = (0, node_cron_1.schedule)(flow.options['cron'], async () => {
                         try {
                             await this.executeFlow(flow);
                         }
@@ -189,7 +188,7 @@ class FlowManager {
                     this.triggerHandlers.push({ id: flow.id, events: [{ type: flow.trigger, task }] });
                 }
                 else {
-                    logger_1.default.warn(`Couldn't register cron trigger. Provided cron is invalid: ${flow.options.cron}`);
+                    logger_1.default.warn(`Couldn't register cron trigger. Provided cron is invalid: ${flow.options['cron']}`);
                 }
             }
             else if (flow.trigger === 'operation') {
@@ -198,23 +197,23 @@ class FlowManager {
             }
             else if (flow.trigger === 'webhook') {
                 const handler = (data, context) => {
-                    if (flow.options.async) {
+                    if (flow.options['async']) {
                         this.executeFlow(flow, data, context);
+                        return undefined;
                     }
                     else {
                         return this.executeFlow(flow, data, context);
                     }
                 };
-                const method = (_c = (_b = flow.options) === null || _b === void 0 ? void 0 : _b.method) !== null && _c !== void 0 ? _c : 'GET';
+                const method = flow.options?.['method'] ?? 'GET';
                 // Default return to $last for webhooks
-                flow.options.return = (_d = flow.options.return) !== null && _d !== void 0 ? _d : '$last';
+                flow.options['return'] = flow.options['return'] ?? '$last';
                 this.webhookFlowHandlers[`${method}-${flow.id}`] = handler;
             }
             else if (flow.trigger === 'manual') {
                 const handler = (data, context) => {
-                    var _a, _b;
-                    const enabledCollections = (_b = (_a = flow.options) === null || _a === void 0 ? void 0 : _a.collections) !== null && _b !== void 0 ? _b : [];
-                    const targetCollection = data === null || data === void 0 ? void 0 : data.body.collection;
+                    const enabledCollections = flow.options?.['collections'] ?? [];
+                    const targetCollection = data?.['body'].collection;
                     if (!targetCollection) {
                         logger_1.default.warn(`Manual trigger requires "collection" to be specified in the payload`);
                         throw new exceptions.ForbiddenException();
@@ -227,15 +226,16 @@ class FlowManager {
                         logger_1.default.warn(`Specified collection must be one of: ${enabledCollections.join(', ')}.`);
                         throw new exceptions.ForbiddenException();
                     }
-                    if (flow.options.async) {
+                    if (flow.options['async']) {
                         this.executeFlow(flow, data, context);
+                        return undefined;
                     }
                     else {
                         return this.executeFlow(flow, data, context);
                     }
                 };
                 // Default return to $last for manual
-                flow.options.return = '$last';
+                flow.options['return'] = '$last';
                 this.webhookFlowHandlers[`POST-${flow.id}`] = handler;
             }
         }
@@ -263,14 +263,13 @@ class FlowManager {
         this.isLoaded = false;
     }
     async executeFlow(flow, data = null, context = {}) {
-        var _a, _b, _c, _d, _e, _f, _g;
-        const database = (_a = context.database) !== null && _a !== void 0 ? _a : (0, database_1.default)();
-        const schema = (_b = context.schema) !== null && _b !== void 0 ? _b : (await (0, get_schema_1.getSchema)({ database }));
+        const database = context['database'] ?? (0, database_1.default)();
+        const schema = context['schema'] ?? (await (0, get_schema_1.getSchema)({ database }));
         const keyedData = {
             [TRIGGER_KEY]: data,
             [LAST_KEY]: data,
-            [ACCOUNTABILITY_KEY]: (_c = context === null || context === void 0 ? void 0 : context.accountability) !== null && _c !== void 0 ? _c : null,
-            [ENV_KEY]: (0, lodash_1.pick)(env_1.default, env_1.default.FLOWS_ENV_ALLOW_LIST ? (0, utils_1.toArray)(env_1.default.FLOWS_ENV_ALLOW_LIST) : []),
+            [ACCOUNTABILITY_KEY]: context?.['accountability'] ?? null,
+            [ENV_KEY]: (0, lodash_1.pick)(env_1.default, env_1.default['FLOWS_ENV_ALLOW_LIST'] ? (0, utils_1.toArray)(env_1.default['FLOWS_ENV_ALLOW_LIST']) : []),
         };
         let nextOperation = flow.operation;
         let lastOperationStatus = 'unknown';
@@ -288,14 +287,14 @@ class FlowManager {
                 knex: database,
                 schema: schema,
             });
-            const accountability = context === null || context === void 0 ? void 0 : context.accountability;
+            const accountability = context?.['accountability'];
             const activity = await activityService.createOne({
                 action: types_1.Action.RUN,
-                user: (_d = accountability === null || accountability === void 0 ? void 0 : accountability.user) !== null && _d !== void 0 ? _d : null,
+                user: accountability?.user ?? null,
                 collection: 'directus_flows',
-                ip: (_e = accountability === null || accountability === void 0 ? void 0 : accountability.ip) !== null && _e !== void 0 ? _e : null,
-                user_agent: (_f = accountability === null || accountability === void 0 ? void 0 : accountability.userAgent) !== null && _f !== void 0 ? _f : null,
-                origin: (_g = accountability === null || accountability === void 0 ? void 0 : accountability.origin) !== null && _g !== void 0 ? _g : null,
+                ip: accountability?.ip ?? null,
+                user_agent: accountability?.userAgent ?? null,
+                origin: accountability?.origin ?? null,
                 item: flow.id,
             });
             if (flow.accountability === 'all') {
@@ -314,14 +313,14 @@ class FlowManager {
                 });
             }
         }
-        if (flow.trigger === 'event' && flow.options.type === 'filter' && lastOperationStatus === 'reject') {
+        if (flow.trigger === 'event' && flow.options['type'] === 'filter' && lastOperationStatus === 'reject') {
             throw keyedData[LAST_KEY];
         }
-        if (flow.options.return === '$all') {
+        if (flow.options['return'] === '$all') {
             return keyedData;
         }
-        else if (flow.options.return) {
-            return (0, micromustache_1.get)(keyedData, flow.options.return);
+        else if (flow.options['return']) {
+            return (0, micromustache_1.get)(keyedData, flow.options['return']);
         }
         return undefined;
     }
@@ -344,15 +343,35 @@ class FlowManager {
                 accountability: null,
                 ...context,
             });
+            // Validate that the operations result is serializable and thus catching the error inside the flow execution
+            JSON.stringify(result ?? null);
             // JSON structures don't allow for undefined values, so we need to replace them with null
             // Otherwise the applyOptionsData function will not work correctly on the next operation
             if (typeof result === 'object' && result !== null) {
                 result = (0, map_values_deep_1.mapValuesDeep)(result, (_, value) => (value === undefined ? null : value));
             }
-            return { successor: operation.resolve, status: 'resolve', data: result !== null && result !== void 0 ? result : null, options };
+            return { successor: operation.resolve, status: 'resolve', data: result ?? null, options };
         }
         catch (error) {
-            return { successor: operation.reject, status: 'reject', data: error !== null && error !== void 0 ? error : null, options };
+            let data;
+            if (error instanceof Error) {
+                // If the error is instance of Error, use the message of it as the error data
+                data = { message: error.message };
+            }
+            else if (typeof error === 'string') {
+                // If the error is a JSON string, parse it and use that as the error data
+                data = (0, utils_1.isValidJSON)(error) ? (0, utils_1.parseJSON)(error) : error;
+            }
+            else {
+                // If error is plain object, use this as the error data and otherwise fallback to null
+                data = error ?? null;
+            }
+            return {
+                successor: operation.reject,
+                status: 'reject',
+                data,
+                options,
+            };
         }
     }
 }

package/dist/logger.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="qs" />
-import { RequestHandler } from 'express';
 import { LoggerOptions } from 'pino';
+import type { RequestHandler } from 'express';
+export declare const httpLoggerOptions: LoggerOptions;
 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

@@ -26,29 +26,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.expressLogger = void 0;
+exports.expressLogger = exports.httpLoggerOptions = void 0;
+const utils_1 = require("@directus/shared/utils");
+const lodash_1 = require("lodash");
 const pino_1 = __importDefault(require("pino"));
 const pino_http_1 = __importStar(require("pino-http"));
-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 constants_1 = require("./constants");
+const get_config_from_env_1 = require("./utils/get-config-from-env");
 const pinoOptions = {
-    level: env_1.default.LOG_LEVEL || 'info',
+    level: env_1.default['LOG_LEVEL'] || 'info',
     redact: {
-        paths: ['req.headers.authorization', `req.cookies.${env_1.default.REFRESH_TOKEN_COOKIE_NAME}`],
-        censor: '--redact--',
+        paths: ['req.headers.authorization', 'req.headers.cookie'],
+        censor: constants_1.REDACT_TEXT,
     },
 };
-const httpLoggerOptions = {
-    level: env_1.default.LOG_LEVEL || 'info',
+exports.httpLoggerOptions = {
+    level: env_1.default['LOG_LEVEL'] || 'info',
     redact: {
-        paths: ['req.headers.authorization', `req.cookies.${env_1.default.REFRESH_TOKEN_COOKIE_NAME}`],
-        censor: '--redact--',
+        paths: ['req.headers.authorization', 'req.headers.cookie'],
+        censor: constants_1.REDACT_TEXT,
     },
 };
-if (env_1.default.LOG_STYLE !== 'raw') {
+if (env_1.default['LOG_STYLE'] !== 'raw') {
     pinoOptions.transport = {
         target: 'pino-pretty',
         options: {
@@ -56,7 +57,7 @@ if (env_1.default.LOG_STYLE !== 'raw') {
             sync: true,
         },
     };
-    httpLoggerOptions.transport = {
+    exports.httpLoggerOptions.transport = {
         target: 'pino-http-print',
         options: {
             all: true,
@@ -69,11 +70,26 @@ if (env_1.default.LOG_STYLE !== 'raw') {
         },
     };
 }
+if (env_1.default['LOG_STYLE'] === 'raw') {
+    exports.httpLoggerOptions.redact = {
+        paths: ['req.headers.authorization', 'req.headers.cookie', 'res.headers'],
+        censor: (value, pathParts) => {
+            const path = pathParts.join('.');
+            if (path === 'res.headers') {
+                if ('set-cookie' in value) {
+                    value['set-cookie'] = constants_1.REDACT_TEXT;
+                }
+                return value;
+            }
+            return constants_1.REDACT_TEXT;
+        },
+    };
+}
 const loggerEnvConfig = (0, get_config_from_env_1.getConfigFromEnv)('LOGGER_', 'LOGGER_HTTP');
 // Expose custom log levels into formatter function
-if (loggerEnvConfig.levels) {
+if (loggerEnvConfig['levels']) {
     const customLogLevels = {};
-    for (const el of (0, utils_1.toArray)(loggerEnvConfig.levels)) {
+    for (const el of (0, utils_1.toArray)(loggerEnvConfig['levels'])) {
         const key_val = el.split(':');
         customLogLevels[key_val[0].trim()] = key_val[1].trim();
     }
@@ -85,7 +101,7 @@ if (loggerEnvConfig.levels) {
             };
         },
     };
-    httpLoggerOptions.formatters = {
+    exports.httpLoggerOptions.formatters = {
         level(label, number) {
             return {
                 severity: customLogLevels[label] || 'info',
@@ -93,12 +109,12 @@ if (loggerEnvConfig.levels) {
             };
         },
     };
-    delete loggerEnvConfig.levels;
+    delete loggerEnvConfig['levels'];
 }
 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: (0, pino_1.default)((0, lodash_1.merge)(httpLoggerOptions, loggerEnvConfig)),
+    logger: (0, pino_1.default)((0, lodash_1.merge)(exports.httpLoggerOptions, loggerEnvConfig)),
     ...httpLoggerEnvConfig,
     serializers: {
         req(request) {
@@ -112,7 +128,7 @@ exports.default = logger;
 function redactQuery(originalPath) {
     const url = new url_1.URL(originalPath, 'http://example.com/');
     if (url.searchParams.has('access_token')) {
-        url.searchParams.set('access_token', '--redacted--');
+        url.searchParams.set('access_token', constants_1.REDACT_TEXT);
     }
     return url.pathname + url.search;
 }

package/dist/logger.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/mailer.js

@@ -11,12 +11,12 @@ let transporter;
 function getMailer() {
     if (transporter)
         return transporter;
-    const transportName = env_1.default.EMAIL_TRANSPORT.toLowerCase();
+    const transportName = env_1.default['EMAIL_TRANSPORT'].toLowerCase();
     if (transportName === 'sendmail') {
         transporter = nodemailer_1.default.createTransport({
             sendmail: true,
-            newline: env_1.default.EMAIL_SENDMAIL_NEW_LINE || 'unix',
-            path: env_1.default.EMAIL_SENDMAIL_PATH || '/usr/sbin/sendmail',
+            newline: env_1.default['EMAIL_SENDMAIL_NEW_LINE'] || 'unix',
+            path: env_1.default['EMAIL_SENDMAIL_PATH'] || '/usr/sbin/sendmail',
         });
     }
     else if (transportName === 'ses') {
@@ -29,20 +29,20 @@ function getMailer() {
     }
     else if (transportName === 'smtp') {
         let auth = false;
-        if (env_1.default.EMAIL_SMTP_USER || env_1.default.EMAIL_SMTP_PASSWORD) {
+        if (env_1.default['EMAIL_SMTP_USER'] || env_1.default['EMAIL_SMTP_PASSWORD']) {
             auth = {
-                user: env_1.default.EMAIL_SMTP_USER,
-                pass: env_1.default.EMAIL_SMTP_PASSWORD,
+                user: env_1.default['EMAIL_SMTP_USER'],
+                pass: env_1.default['EMAIL_SMTP_PASSWORD'],
             };
         }
         const tls = (0, get_config_from_env_1.getConfigFromEnv)('EMAIL_SMTP_TLS_');
         transporter = nodemailer_1.default.createTransport({
-            name: env_1.default.EMAIL_SMTP_NAME,
-            pool: env_1.default.EMAIL_SMTP_POOL,
-            host: env_1.default.EMAIL_SMTP_HOST,
-            port: env_1.default.EMAIL_SMTP_PORT,
-            secure: env_1.default.EMAIL_SMTP_SECURE,
-            ignoreTLS: env_1.default.EMAIL_SMTP_IGNORE_TLS,
+            name: env_1.default['EMAIL_SMTP_NAME'],
+            pool: env_1.default['EMAIL_SMTP_POOL'],
+            host: env_1.default['EMAIL_SMTP_HOST'],
+            port: env_1.default['EMAIL_SMTP_PORT'],
+            secure: env_1.default['EMAIL_SMTP_SECURE'],
+            ignoreTLS: env_1.default['EMAIL_SMTP_IGNORE_TLS'],
             auth,
             tls,
         });
@@ -51,16 +51,16 @@ function getMailer() {
         const mg = require('nodemailer-mailgun-transport');
         transporter = nodemailer_1.default.createTransport(mg({
             auth: {
-                api_key: env_1.default.EMAIL_MAILGUN_API_KEY,
-                domain: env_1.default.EMAIL_MAILGUN_DOMAIN,
+                api_key: env_1.default['EMAIL_MAILGUN_API_KEY'],
+                domain: env_1.default['EMAIL_MAILGUN_DOMAIN'],
             },
-            host: env_1.default.EMAIL_MAILGUN_HOST || 'api.mailgun.net',
+            host: env_1.default['EMAIL_MAILGUN_HOST'] || 'api.mailgun.net',
         }));
     }
     else if (transportName === 'sendgrid') {
         const sg = require('nodemailer-sendgrid');
         transporter = nodemailer_1.default.createTransport(sg({
-            apiKey: env_1.default.EMAIL_SENDGRID_API_KEY,
+            apiKey: env_1.default['EMAIL_SENDGRID_API_KEY'],
         }));
     }
     else {

package/dist/messenger.js

@@ -9,12 +9,12 @@ const ioredis_1 = __importDefault(require("ioredis"));
 const env_1 = __importDefault(require("./env"));
 const get_config_from_env_1 = require("./utils/get-config-from-env");
 class MessengerMemory {
+    handlers;
     constructor() {
         this.handlers = {};
     }
     publish(channel, payload) {
-        var _a, _b;
-        (_b = (_a = this.handlers)[channel]) === null || _b === void 0 ? void 0 : _b.call(_a, payload);
+        this.handlers[channel]?.(payload);
     }
     subscribe(channel, callback) {
         this.handlers[channel] = callback;
@@ -25,12 +25,14 @@ class MessengerMemory {
 }
 exports.MessengerMemory = MessengerMemory;
 class MessengerRedis {
+    namespace;
+    pub;
+    sub;
     constructor() {
-        var _a, _b, _c;
         const config = (0, get_config_from_env_1.getConfigFromEnv)('MESSENGER_REDIS');
-        this.pub = new ioredis_1.default((_a = env_1.default.MESSENGER_REDIS) !== null && _a !== void 0 ? _a : config);
-        this.sub = new ioredis_1.default((_b = env_1.default.MESSENGER_REDIS) !== null && _b !== void 0 ? _b : config);
-        this.namespace = (_c = env_1.default.MESSENGER_NAMESPACE) !== null && _c !== void 0 ? _c : 'directus';
+        this.pub = new ioredis_1.default(env_1.default['MESSENGER_REDIS'] ?? config);
+        this.sub = new ioredis_1.default(env_1.default['MESSENGER_REDIS'] ?? config);
+        this.namespace = env_1.default['MESSENGER_NAMESPACE'] ?? 'directus';
     }
     publish(channel, payload) {
         this.pub.publish(`${this.namespace}:${channel}`, JSON.stringify(payload));
@@ -53,7 +55,7 @@ let messenger;
 function getMessenger() {
     if (messenger)
         return messenger;
-    if (env_1.default.MESSENGER_STORE === 'redis') {
+    if (env_1.default['MESSENGER_STORE'] === 'redis') {
         messenger = new MessengerRedis();
     }
     else {

package/dist/middleware/authenticate.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="qs" />
-import { NextFunction, Request, Response } from 'express';
+import type { NextFunction, Request, Response } from 'express';
 /**
  * Verify the passed JWT and assign the user ID and role to `req`
  */

package/dist/middleware/authenticate.js

@@ -23,9 +23,13 @@ const handler = async (req, res, next) => {
         admin: false,
         app: false,
         ip: (0, get_ip_from_req_1.getIPFromReq)(req),
-        userAgent: req.get('user-agent'),
-        origin: req.get('origin'),
     };
+    const userAgent = req.get('user-agent');
+    if (userAgent)
+        defaultAccountability.userAgent = userAgent;
+    const origin = req.get('origin');
+    if (origin)
+        defaultAccountability.origin = origin;
     const database = (0, database_1.default)();
     const customAccountability = await emitter_1.default.emitFilter('authenticate', defaultAccountability, {
         req,
@@ -41,13 +45,16 @@ const handler = async (req, res, next) => {
     req.accountability = defaultAccountability;
     if (req.token) {
         if ((0, is_directus_jwt_1.default)(req.token)) {
-            const payload = (0, jwt_1.verifyAccessJWT)(req.token, env_1.default.SECRET);
-            req.accountability.share = payload.share;
-            req.accountability.share_scope = payload.share_scope;
-            req.accountability.user = payload.id;
+            const payload = (0, jwt_1.verifyAccessJWT)(req.token, env_1.default['SECRET']);
             req.accountability.role = payload.role;
             req.accountability.admin = payload.admin_access === true || payload.admin_access == 1;
             req.accountability.app = payload.app_access === true || payload.app_access == 1;
+            if (payload.share)
+                req.accountability.share = payload.share;
+            if (payload.share_scope)
+                req.accountability.share_scope = payload.share_scope;
+            if (payload.id)
+                req.accountability.user = payload.id;
         }
         else {
             // Try finding the user with the provided token

package/dist/middleware/cache.d.ts

@@ -1,3 +1,3 @@
-import { RequestHandler } from 'express';
+import type { RequestHandler } from 'express';
 declare const checkCacheMiddleware: RequestHandler;
 export default checkCacheMiddleware;

package/dist/middleware/cache.js

@@ -5,22 +5,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const cache_1 = require("../cache");
 const env_1 = __importDefault(require("../env"));
+const logger_1 = __importDefault(require("../logger"));
 const async_handler_1 = __importDefault(require("../utils/async-handler"));
 const get_cache_headers_1 = require("../utils/get-cache-headers");
 const get_cache_key_1 = require("../utils/get-cache-key");
-const logger_1 = __importDefault(require("../logger"));
+const should_skip_cache_1 = require("../utils/should-skip-cache");
 const checkCacheMiddleware = (0, async_handler_1.default)(async (req, res, next) => {
-    var _a, _b, _c, _d;
     const { cache } = (0, cache_1.getCache)();
-    if (req.method.toLowerCase() !== 'get' && ((_a = req.originalUrl) === null || _a === void 0 ? void 0 : _a.startsWith('/graphql')) === false)
+    if (req.method.toLowerCase() !== 'get' && req.originalUrl?.startsWith('/graphql') === false)
         return next();
-    if (env_1.default.CACHE_ENABLED !== true)
+    if (env_1.default['CACHE_ENABLED'] !== true)
         return next();
     if (!cache)
         return next();
-    if (((_b = req.headers['cache-control']) === null || _b === void 0 ? void 0 : _b.includes('no-store')) || ((_c = req.headers['Cache-Control']) === null || _c === void 0 ? void 0 : _c.includes('no-store'))) {
-        if (env_1.default.CACHE_STATUS_HEADER)
-            res.setHeader(`${env_1.default.CACHE_STATUS_HEADER}`, 'MISS');
+    if ((0, should_skip_cache_1.shouldSkipCache)(req)) {
+        if (env_1.default['CACHE_STATUS_HEADER'])
+            res.setHeader(`${env_1.default['CACHE_STATUS_HEADER']}`, 'MISS');
         return next();
     }
     const key = (0, get_cache_key_1.getCacheKey)(req);
@@ -30,31 +30,31 @@ const checkCacheMiddleware = (0, async_handler_1.default)(async (req, res, next)
     }
     catch (err) {
         logger_1.default.warn(err, `[cache] Couldn't read key ${key}. ${err.message}`);
-        if (env_1.default.CACHE_STATUS_HEADER)
-            res.setHeader(`${env_1.default.CACHE_STATUS_HEADER}`, 'MISS');
+        if (env_1.default['CACHE_STATUS_HEADER'])
+            res.setHeader(`${env_1.default['CACHE_STATUS_HEADER']}`, 'MISS');
         return next();
     }
     if (cachedData) {
         let cacheExpiryDate;
         try {
-            cacheExpiryDate = (_d = (await (0, cache_1.getCacheValue)(cache, `${key}__expires_at`))) === null || _d === void 0 ? void 0 : _d.exp;
+            cacheExpiryDate = (await (0, cache_1.getCacheValue)(cache, `${key}__expires_at`))?.exp;
         }
         catch (err) {
             logger_1.default.warn(err, `[cache] Couldn't read key ${`${key}__expires_at`}. ${err.message}`);
-            if (env_1.default.CACHE_STATUS_HEADER)
-                res.setHeader(`${env_1.default.CACHE_STATUS_HEADER}`, 'MISS');
+            if (env_1.default['CACHE_STATUS_HEADER'])
+                res.setHeader(`${env_1.default['CACHE_STATUS_HEADER']}`, 'MISS');
             return next();
         }
         const cacheTTL = cacheExpiryDate ? cacheExpiryDate - Date.now() : undefined;
         res.setHeader('Cache-Control', (0, get_cache_headers_1.getCacheControlHeader)(req, cacheTTL, true, true));
         res.setHeader('Vary', 'Origin, Cache-Control');
-        if (env_1.default.CACHE_STATUS_HEADER)
-            res.setHeader(`${env_1.default.CACHE_STATUS_HEADER}`, 'HIT');
+        if (env_1.default['CACHE_STATUS_HEADER'])
+            res.setHeader(`${env_1.default['CACHE_STATUS_HEADER']}`, 'HIT');
         return res.json(cachedData);
     }
     else {
-        if (env_1.default.CACHE_STATUS_HEADER)
-            res.setHeader(`${env_1.default.CACHE_STATUS_HEADER}`, 'MISS');
+        if (env_1.default['CACHE_STATUS_HEADER'])
+            res.setHeader(`${env_1.default['CACHE_STATUS_HEADER']}`, 'MISS');
         return next();
     }
 });

package/dist/middleware/check-ip.d.ts

@@ -1,2 +1,2 @@
-import { RequestHandler } from 'express';
+import type { RequestHandler } from 'express';
 export declare const checkIP: RequestHandler;

package/dist/middleware/check-ip.js

@@ -17,7 +17,7 @@ exports.checkIP = (0, async_handler_1.default)(async (req, _res, next) => {
         query.whereNull('id');
     }
     const role = await query.first();
-    const ipAllowlist = ((role === null || role === void 0 ? void 0 : role.ip_access) || '').split(',').filter((ip) => ip);
+    const ipAllowlist = (role?.ip_access || '').split(',').filter((ip) => ip);
     if (ipAllowlist.length > 0 && ipAllowlist.includes(req.accountability.ip) === false)
         throw new exceptions_1.InvalidIPException();
     return next();

package/dist/middleware/collection-exists.d.ts

@@ -1,6 +1,6 @@
 /**
  * Check if requested collection exists, and save it to req.collection
  */
-import { RequestHandler } from 'express';
+import type { RequestHandler } from 'express';
 declare const collectionExists: RequestHandler;
 export default collectionExists;