directus 9.16.1 → 9.17.2

package/dist/app.js

@@ -135,6 +135,13 @@ async function createApp() {
     await emitter_1.default.emitInit('app.before', { app });
     await emitter_1.default.emitInit('middlewares.before', { app });
     app.use(logger_1.expressLogger);
+    app.use((_req, res, next) => {
+        res.setHeader('X-Powered-By', 'Directus');
+        next();
+    });
+    if (env_1.default.CORS_ENABLED === true) {
+        app.use(cors_1.default);
+    }
     app.use((req, res, next) => {
         express_1.default.json({
             limit: env_1.default.MAX_PAYLOAD_SIZE,
@@ -147,13 +154,6 @@ async function createApp() {
     });
     app.use((0, cookie_parser_1.default)());
     app.use(extract_token_1.default);
-    app.use((_req, res, next) => {
-        res.setHeader('X-Powered-By', 'Directus');
-        next();
-    });
-    if (env_1.default.CORS_ENABLED === true) {
-        app.use(cors_1.default);
-    }
     app.get('/', (_req, res, next) => {
         if (env_1.default.ROOT_REDIRECT) {
             res.redirect(env_1.default.ROOT_REDIRECT);

package/dist/auth/drivers/ldap.js

@@ -302,6 +302,7 @@ function createLDAPAuthRouter(provider) {
         const accountability = {
             ip: (0, get_ip_from_req_1.getIPFromReq)(req),
             userAgent: req.get('user-agent'),
+            origin: req.get('origin'),
             role: null,
         };
         const authenticationService = new services_1.AuthenticationService({

package/dist/auth/drivers/local.js

@@ -15,6 +15,8 @@ const env_1 = __importDefault(require("../../env"));
 const respond_1 = require("../../middleware/respond");
 const constants_1 = require("../../constants");
 const get_ip_from_req_1 = require("../../utils/get-ip-from-req");
+const perf_hooks_1 = require("perf_hooks");
+const stall_1 = require("../../utils/stall");
 class LocalAuthDriver extends auth_1.AuthDriver {
     async getUserID(payload) {
         if (!payload.email) {
@@ -50,9 +52,12 @@ function createLocalAuthRouter(provider) {
     }).unknown();
     router.post('/', (0, async_handler_1.default)(async (req, res, next) => {
         var _a;
+        const STALL_TIME = env_1.default.LOGIN_STALL_TIME;
+        const timeStart = perf_hooks_1.performance.now();
         const accountability = {
             ip: (0, get_ip_from_req_1.getIPFromReq)(req),
             userAgent: req.get('user-agent'),
+            origin: req.get('origin'),
             role: null,
         };
         const authenticationService = new services_1.AuthenticationService({
@@ -61,6 +66,7 @@ function createLocalAuthRouter(provider) {
         });
         const { error } = userLoginSchema.validate(req.body);
         if (error) {
+            await (0, stall_1.stall)(STALL_TIME, timeStart);
             throw new exceptions_1.InvalidPayloadException(error.message);
         }
         const mode = req.body.mode || 'json';

package/dist/auth/drivers/oauth2.js

@@ -222,6 +222,7 @@ function createOAuth2AuthRouter(providerName) {
             accountability: {
                 ip: (0, get_ip_from_req_1.getIPFromReq)(req),
                 userAgent: req.get('user-agent'),
+                origin: req.get('origin'),
                 role: null,
             },
             schema: req.schema,

package/dist/auth/drivers/openid.js

@@ -241,6 +241,7 @@ function createOpenIDAuthRouter(providerName) {
             accountability: {
                 ip: (0, get_ip_from_req_1.getIPFromReq)(req),
                 userAgent: req.get('user-agent'),
+                origin: req.get('origin'),
                 role: null,
             },
             schema: req.schema,

package/dist/cli/utils/create-env/env-stub.liquid

@@ -211,6 +211,10 @@ REFRESH_TOKEN_COOKIE_NAME="directus_refresh_token"
 # Which domain to use for the refresh cookie. Useful for development mode.
 # REFRESH_TOKEN_COOKIE_DOMAIN
 
+# The duration in milliseconds that a login request will be stalled for,
+# and it should be greater than the time taken for a login request with an invalid password [500]
+# LOGIN_STALL_TIME=500
+
 # Whether or not to enable the CORS headers [false]
 CORS_ENABLED=true
 
@@ -288,7 +292,7 @@ EXTENSIONS_AUTO_RELOAD=false
 EMAIL_FROM="no-reply@directus.io"
 
 # What to use to send emails. One of
-# sendmail, smtp, mailgun, ses.
+# sendmail, smtp, mailgun, sendgrid, ses.
 EMAIL_TRANSPORT="sendmail"
 EMAIL_SENDMAIL_NEW_LINE="unix"
 EMAIL_SENDMAIL_PATH="/usr/sbin/sendmail"
@@ -315,3 +319,6 @@ EMAIL_SENDMAIL_PATH="/usr/sbin/sendmail"
 ## Email (Mailgun Transport)
 # EMAIL_MAILGUN_API_KEY="key-1234123412341234"
 # EMAIL_MAILGUN_DOMAIN="a domain name from https://app.mailgun.com/app/sending/domains"
+
+## Email (SendGrid Transport)
+# EMAIL_SENDGRID_API_KEY="key-1234123412341234"

package/dist/controllers/activity.js

@@ -75,6 +75,7 @@ router.post('/comment', (0, async_handler_1.default)(async (req, res, next) => {
         user: (_a = req.accountability) === null || _a === void 0 ? void 0 : _a.user,
         ip: (0, get_ip_from_req_1.getIPFromReq)(req),
         user_agent: req.get('user-agent'),
+        origin: req.get('origin'),
     });
     try {
         const record = await service.readOne(primaryKey, req.sanitizedQuery);

package/dist/controllers/auth.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const express_1 = require("express");
-const ms_1 = __importDefault(require("ms"));
 const env_1 = __importDefault(require("../env"));
 const exceptions_1 = require("../exceptions");
 const respond_1 = require("../middleware/respond");
@@ -15,6 +14,7 @@ const logger_1 = __importDefault(require("../logger"));
 const drivers_1 = require("../auth/drivers");
 const constants_1 = require("../constants");
 const get_ip_from_req_1 = require("../utils/get-ip-from-req");
+const constants_2 = require("../constants");
 const router = (0, express_1.Router)();
 const authProviders = (0, get_auth_providers_1.getAuthProviders)();
 for (const authProvider of authProviders) {
@@ -43,10 +43,10 @@ if (!env_1.default.AUTH_DISABLE_DEFAULT) {
     router.use('/login', (0, drivers_1.createLocalAuthRouter)(constants_1.DEFAULT_AUTH_PROVIDER));
 }
 router.post('/refresh', (0, async_handler_1.default)(async (req, res, next) => {
-    var _a;
     const accountability = {
         ip: (0, get_ip_from_req_1.getIPFromReq)(req),
         userAgent: req.get('user-agent'),
+        origin: req.get('origin'),
         role: null,
     };
     const authenticationService = new services_1.AuthenticationService({
@@ -66,13 +66,7 @@ router.post('/refresh', (0, async_handler_1.default)(async (req, res, next) => {
         payload.data.refresh_token = refreshToken;
     }
     if (mode === 'cookie') {
-        res.cookie(env_1.default.REFRESH_TOKEN_COOKIE_NAME, refreshToken, {
-            httpOnly: true,
-            domain: env_1.default.REFRESH_TOKEN_COOKIE_DOMAIN,
-            maxAge: (0, ms_1.default)(env_1.default.REFRESH_TOKEN_TTL),
-            secure: (_a = env_1.default.REFRESH_TOKEN_COOKIE_SECURE) !== null && _a !== void 0 ? _a : false,
-            sameSite: env_1.default.REFRESH_TOKEN_COOKIE_SAME_SITE || 'strict',
-        });
+        res.cookie(env_1.default.REFRESH_TOKEN_COOKIE_NAME, refreshToken, constants_2.COOKIE_OPTIONS);
     }
     res.locals.payload = payload;
     return next();
@@ -82,6 +76,7 @@ router.post('/logout', (0, async_handler_1.default)(async (req, res, next) => {
     const accountability = {
         ip: (0, get_ip_from_req_1.getIPFromReq)(req),
         userAgent: req.get('user-agent'),
+        origin: req.get('origin'),
         role: null,
     };
     const authenticationService = new services_1.AuthenticationService({
@@ -110,6 +105,7 @@ router.post('/password/request', (0, async_handler_1.default)(async (req, res, n
     const accountability = {
         ip: (0, get_ip_from_req_1.getIPFromReq)(req),
         userAgent: req.get('user-agent'),
+        origin: req.get('origin'),
         role: null,
     };
     const service = new services_1.UsersService({ accountability, schema: req.schema });
@@ -137,6 +133,7 @@ router.post('/password/reset', (0, async_handler_1.default)(async (req, res, nex
     const accountability = {
         ip: (0, get_ip_from_req_1.getIPFromReq)(req),
         userAgent: req.get('user-agent'),
+        origin: req.get('origin'),
         role: null,
     };
     const service = new services_1.UsersService({ accountability, schema: req.schema });

package/dist/database/helpers/schema/dialects/sqlite.d.ts

@@ -1,5 +1,5 @@
 import { SchemaHelper } from '../types';
 export declare class SchemaHelperSQLite extends SchemaHelper {
-    preColumnDelete(): Promise<boolean>;
-    postColumnDelete(): Promise<void>;
+    preColumnChange(): Promise<boolean>;
+    postColumnChange(): Promise<void>;
 }

package/dist/database/helpers/schema/dialects/sqlite.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SchemaHelperSQLite = void 0;
 const types_1 = require("../types");
 class SchemaHelperSQLite extends types_1.SchemaHelper {
-    async preColumnDelete() {
+    async preColumnChange() {
         const foreignCheckStatus = (await this.knex.raw('PRAGMA foreign_keys'))[0].foreign_keys === 1;
         if (foreignCheckStatus) {
             await this.knex.raw('PRAGMA foreign_keys = OFF');
         }
         return foreignCheckStatus;
     }
-    async postColumnDelete() {
+    async postColumnChange() {
         await this.knex.raw('PRAGMA foreign_keys = ON');
     }
 }

package/dist/database/helpers/schema/types.d.ts

@@ -11,7 +11,7 @@ export declare abstract class SchemaHelper extends DatabaseHelper {
     changeNullable(table: string, column: string, nullable: boolean): Promise<void>;
     changeToType(table: string, column: string, type: typeof KNEX_TYPES[number], options?: Options): Promise<void>;
     protected changeToTypeByCopy(table: string, column: string, type: typeof KNEX_TYPES[number], options: Options): Promise<void>;
-    preColumnDelete(): Promise<boolean>;
-    postColumnDelete(): Promise<void>;
+    preColumnChange(): Promise<boolean>;
+    postColumnChange(): Promise<void>;
 }
 export {};

package/dist/database/helpers/schema/types.js

@@ -56,10 +56,10 @@ class SchemaHelper extends types_1.DatabaseHelper {
             await this.changeNullable(table, column, options.nullable);
         }
     }
-    async preColumnDelete() {
+    async preColumnChange() {
         return false;
     }
-    async postColumnDelete() {
+    async postColumnChange() {
         return;
     }
 }

package/dist/database/migrations/20220826A-add-origin-to-accountability.d.ts

@@ -0,0 +1,3 @@
+import { Knex } from 'knex';
+export declare function up(knex: Knex): Promise<void>;
+export declare function down(knex: Knex): Promise<void>;

package/dist/database/migrations/20220826A-add-origin-to-accountability.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+async function up(knex) {
+    await knex.schema.alterTable('directus_activity', (table) => {
+        table.string('origin').nullable();
+    });
+    await knex.schema.alterTable('directus_sessions', (table) => {
+        table.string('origin').nullable();
+    });
+}
+exports.up = up;
+async function down(knex) {
+    await knex.schema.alterTable('directus_activity', (table) => {
+        table.dropColumn('origin');
+    });
+    await knex.schema.alterTable('directus_sessions', (table) => {
+        table.dropColumn('origin');
+    });
+}
+exports.down = down;

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

@@ -60,6 +60,12 @@ fields:
       font: monospace
     width: half
 
+  - field: origin
+    display: formatted-value
+    display_options:
+      font: monospace
+    width: half
+
   - field: ip
     display: formatted-value
     display_options:

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

@@ -11,4 +11,6 @@ fields:
     width: half
   - field: user_agent
     width: half
+  - field: origin
+    width: half
   - field: share

package/dist/env.js

@@ -42,6 +42,7 @@ const allowedEnvironmentVars = [
     'REFRESH_TOKEN_COOKIE_SECURE',
     'REFRESH_TOKEN_COOKIE_SAME_SITE',
     'REFRESH_TOKEN_COOKIE_NAME',
+    'LOGIN_STALL_TIME',
     'PASSWORD_RESET_URL_ALLOW_LIST',
     'USER_INVITE_URL_ALLOW_LIST',
     'IP_TRUST_PROXY',
@@ -79,6 +80,7 @@ const allowedEnvironmentVars = [
     'CACHE_REDIS_PASSWORD',
     'CACHE_MEMCACHE',
     'CACHE_VALUE_MAX_SIZE',
+    'CACHE_HEALTHCHECK_THRESHOLD',
     // storage
     'STORAGE_LOCATIONS',
     'STORAGE_.+_DRIVER',
@@ -95,6 +97,7 @@ const allowedEnvironmentVars = [
     'STORAGE_.+_ENDPOINT',
     'STORAGE_.+_KEY_FILENAME',
     'STORAGE_.+_BUCKET',
+    'STORAGE_.+_HEALTHCHECK_THRESHOLD',
     // metadata
     'FILE_METADATA_ALLOW_LIST',
     // assets
@@ -151,6 +154,7 @@ const allowedEnvironmentVars = [
     'EMAIL_VERIFY_SETUP',
     'EMAIL_SENDMAIL_NEW_LINE',
     'EMAIL_SENDMAIL_PATH',
+    'EMAIL_SMTP_NAME',
     'EMAIL_SMTP_HOST',
     'EMAIL_SMTP_PORT',
     'EMAIL_SMTP_USER',
@@ -161,6 +165,7 @@ const allowedEnvironmentVars = [
     'EMAIL_MAILGUN_API_KEY',
     'EMAIL_MAILGUN_DOMAIN',
     'EMAIL_MAILGUN_HOST',
+    'EMAIL_SENDGRID_API_KEY',
     'EMAIL_SES_CREDENTIALS__ACCESS_KEY_ID',
     'EMAIL_SES_CREDENTIALS__SECRET_ACCESS_KEY',
     'EMAIL_SES_REGION',
@@ -172,6 +177,8 @@ const allowedEnvironmentVars = [
     // limits & optimization
     'RELATIONAL_BATCH_SIZE',
     'EXPORT_BATCH_SIZE',
+    // flows
+    'FLOWS_EXEC_ALLOWED_MODULES',
 ].map((name) => new RegExp(`^${name}$`));
 const acceptedEnvTypes = ['string', 'number', 'regex', 'array', 'json'];
 const defaults = {
@@ -194,6 +201,7 @@ const defaults = {
     REFRESH_TOKEN_COOKIE_SECURE: false,
     REFRESH_TOKEN_COOKIE_SAME_SITE: 'lax',
     REFRESH_TOKEN_COOKIE_NAME: 'directus_refresh_token',
+    LOGIN_STALL_TIME: 500,
     ROOT_REDIRECT: './admin',
     CORS_ENABLED: false,
     CORS_ORIGIN: false,

package/dist/extensions.d.ts

@@ -24,6 +24,7 @@ declare class ExtensionManager {
     private load;
     private unload;
     private initializeWatcher;
+    private closeWatcher;
     private updateWatchedExtensions;
     private getExtensions;
     private generateExtensionBundles;

package/dist/extensions.js

@@ -78,19 +78,27 @@ class ExtensionManager {
         this.reloadQueue = new job_queue_1.JobQueue();
     }
     async initialize(options = {}) {
+        const prevOptions = this.options;
         this.options = {
             ...defaultOptions,
             ...options,
         };
-        this.initializeWatcher();
+        if (!prevOptions.watch && this.options.watch) {
+            this.initializeWatcher();
+        }
+        else if (prevOptions.watch && !this.options.watch) {
+            await this.closeWatcher();
+        }
         if (!this.isLoaded) {
             await this.load();
-            this.updateWatchedExtensions(this.extensions);
             const loadedExtensions = this.getExtensionsList();
             if (loadedExtensions.length > 0) {
                 logger_1.default.info(`Loaded extensions: ${loadedExtensions.join(', ')}`);
             }
         }
+        if (!prevOptions.watch && this.options.watch) {
+            this.updateWatchedExtensions(this.extensions);
+        }
     }
     reload() {
         this.reloadQueue.enqueue(async () => {
@@ -158,7 +166,7 @@ class ExtensionManager {
         this.isLoaded = false;
     }
     initializeWatcher() {
-        if (this.options.watch && !this.watcher) {
+        if (!this.watcher) {
             logger_1.default.info('Watching extensions for changes...');
             const localExtensionPaths = (env_1.default.SERVE_APP ? constants_1.EXTENSION_TYPES : constants_1.API_OR_HYBRID_EXTENSION_TYPES).flatMap((type) => {
                 const typeDir = path_1.default.posix.join(path_1.default.relative('.', env_1.default.EXTENSIONS_PATH).split(path_1.default.sep).join(path_1.default.posix.sep), (0, utils_1.pluralize)(type));
@@ -175,6 +183,11 @@ class ExtensionManager {
                 .on('unlink', () => this.reload());
         }
     }
+    async closeWatcher() {
+        if (this.watcher) {
+            await this.watcher.close();
+        }
+    }
     updateWatchedExtensions(added, removed = []) {
         if (this.watcher) {
             const toPackageExtensionPaths = (extensions) => extensions

package/dist/flows.js

@@ -119,7 +119,7 @@ class FlowManager {
         return handler(data, context);
     }
     async load() {
-        var _a, _b, _c, _d, _e, _f, _g;
+        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' } },
@@ -129,19 +129,23 @@ class FlowManager {
         const flowTrees = flows.map((flow) => (0, construct_flow_tree_1.constructFlowTree)(flow));
         for (const flow of flowTrees) {
             if (flow.trigger === 'event') {
-                const events = (_d = (_c = (_b = (0, utils_1.toArray)((_a = flow.options) === null || _a === void 0 ? void 0 : _a.scope)) === null || _b === void 0 ? void 0 : _b.map((scope) => {
-                    var _a, _b, _c;
-                    if (['items.create', 'items.update', 'items.delete'].includes(scope)) {
-                        return ((_c = (_b = (_a = flow.options) === null || _a === void 0 ? void 0 : _a.collections) === null || _b === void 0 ? void 0 : _b.map((collection) => {
-                            if (collection.startsWith('directus_')) {
-                                const action = scope.split('.')[1];
-                                return collection.substring(9) + '.' + action;
-                            }
-                            return `${collection}.${scope}`;
-                        })) !== null && _c !== void 0 ? _c : []);
-                    }
-                    return scope;
-                })) === null || _c === void 0 ? void 0 : _c.flat()) !== null && _d !== void 0 ? _d : [];
+                const events = ((_a = flow.options) === null || _a === void 0 ? void 0 : _a.scope)
+                    ? (0, utils_1.toArray)(flow.options.scope)
+                        .map((scope) => {
+                        var _a, _b, _c;
+                        if (['items.create', 'items.update', 'items.delete'].includes(scope)) {
+                            return ((_c = (_b = (_a = flow.options) === null || _a === void 0 ? void 0 : _a.collections) === null || _b === void 0 ? void 0 : _b.map((collection) => {
+                                if (collection.startsWith('directus_')) {
+                                    const action = scope.split('.')[1];
+                                    return collection.substring(9) + '.' + action;
+                                }
+                                return `${collection}.${scope}`;
+                            })) !== null && _c !== void 0 ? _c : []);
+                        }
+                        return scope;
+                    })
+                        .flat()
+                    : [];
                 if (flow.options.type === 'filter') {
                     const handler = (payload, meta, context) => this.executeFlow(flow, { payload, ...meta }, {
                         accountability: context.accountability,
@@ -196,9 +200,9 @@ class FlowManager {
                         return this.executeFlow(flow, data, context);
                     }
                 };
-                const method = (_f = (_e = flow.options) === null || _e === void 0 ? void 0 : _e.method) !== null && _f !== void 0 ? _f : 'GET';
+                const method = (_c = (_b = flow.options) === null || _b === void 0 ? void 0 : _b.method) !== null && _c !== void 0 ? _c : 'GET';
                 // Default return to $last for webhooks
-                flow.options.return = (_g = flow.options.return) !== null && _g !== void 0 ? _g : '$last';
+                flow.options.return = (_d = flow.options.return) !== null && _d !== void 0 ? _d : '$last';
                 this.webhookFlowHandlers[`${method}-${flow.id}`] = handler;
             }
             else if (flow.trigger === 'manual') {
@@ -254,7 +258,7 @@ class FlowManager {
         this.isLoaded = false;
     }
     async executeFlow(flow, data = null, context = {}) {
-        var _a, _b, _c, _d, _e, _f;
+        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 keyedData = {
@@ -263,11 +267,13 @@ class FlowManager {
             [ACCOUNTABILITY_KEY]: (_c = context === null || context === void 0 ? void 0 : context.accountability) !== null && _c !== void 0 ? _c : null,
         };
         let nextOperation = flow.operation;
+        let lastOperationStatus = 'unknown';
         const steps = [];
         while (nextOperation !== null) {
             const { successor, data, status, options } = await this.executeOperation(nextOperation, keyedData, context);
             keyedData[nextOperation.key] = data;
             keyedData[LAST_KEY] = data;
+            lastOperationStatus = status;
             steps.push({ operation: nextOperation.id, key: nextOperation.key, status, options });
             nextOperation = successor;
         }
@@ -283,6 +289,7 @@ class FlowManager {
                 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,
                 item: flow.id,
             });
             if (flow.accountability === 'all') {
@@ -301,6 +308,9 @@ class FlowManager {
                 });
             }
         }
+        if (flow.trigger === 'event' && flow.options.type === 'filter' && lastOperationStatus === 'reject') {
+            throw keyedData[LAST_KEY];
+        }
         if (flow.options.return === '$all') {
             return keyedData;
         }

package/dist/mailer.js

@@ -37,6 +37,7 @@ function getMailer() {
         }
         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,
@@ -56,6 +57,12 @@ function getMailer() {
             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,
+        }));
+    }
     else {
         logger_1.default.warn('Illegal transport given for email. Check the EMAIL_TRANSPORT env var.');
     }

package/dist/middleware/authenticate.d.ts

@@ -3,5 +3,5 @@ import { 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>;
-declare const _default: import("express").RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
+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

@@ -24,6 +24,7 @@ const handler = async (req, res, next) => {
         app: false,
         ip: (0, get_ip_from_req_1.getIPFromReq)(req),
         userAgent: req.get('user-agent'),
+        origin: req.get('origin'),
     };
     const database = (0, database_1.default)();
     const customAccountability = await emitter_1.default.emitFilter('authenticate', defaultAccountability, {

package/dist/middleware/authenticate.test.js

@@ -34,7 +34,16 @@ test('Short-circuits when authenticate filter is used', async () => {
 test('Uses default public accountability when no token is given', async () => {
     const req = {
         ip: '127.0.0.1',
-        get: jest.fn((string) => (string === 'user-agent' ? 'fake-user-agent' : null)),
+        get: jest.fn((string) => {
+            switch (string) {
+                case 'user-agent':
+                    return 'fake-user-agent';
+                case 'origin':
+                    return 'fake-origin';
+                default:
+                    return null;
+            }
+        }),
     };
     const res = {};
     const next = jest.fn();
@@ -47,6 +56,7 @@ test('Uses default public accountability when no token is given', async () => {
         app: false,
         ip: '127.0.0.1',
         userAgent: 'fake-user-agent',
+        origin: 'fake-origin',
     });
     expect(next).toHaveBeenCalledTimes(1);
 });
@@ -70,7 +80,16 @@ test('Sets accountability to payload contents if valid token is passed', async (
     }, env_1.default.SECRET, { issuer: 'directus' });
     const req = {
         ip: '127.0.0.1',
-        get: jest.fn((string) => (string === 'user-agent' ? 'fake-user-agent' : null)),
+        get: jest.fn((string) => {
+            switch (string) {
+                case 'user-agent':
+                    return 'fake-user-agent';
+                case 'origin':
+                    return 'fake-origin';
+                default:
+                    return null;
+            }
+        }),
         token,
     };
     const res = {};
@@ -85,6 +104,7 @@ test('Sets accountability to payload contents if valid token is passed', async (
         share_scope: shareScope,
         ip: '127.0.0.1',
         userAgent: 'fake-user-agent',
+        origin: 'fake-origin',
     });
     expect(next).toHaveBeenCalledTimes(1);
     // Test with 1/0 instead or true/false
@@ -107,6 +127,7 @@ test('Sets accountability to payload contents if valid token is passed', async (
         share_scope: shareScope,
         ip: '127.0.0.1',
         userAgent: 'fake-user-agent',
+        origin: 'fake-origin',
     });
     expect(next).toHaveBeenCalledTimes(1);
 });
@@ -120,7 +141,16 @@ test('Throws InvalidCredentialsException when static token is used, but user doe
     });
     const req = {
         ip: '127.0.0.1',
-        get: jest.fn((string) => (string === 'user-agent' ? 'fake-user-agent' : null)),
+        get: jest.fn((string) => {
+            switch (string) {
+                case 'user-agent':
+                    return 'fake-user-agent';
+                case 'origin':
+                    return 'fake-origin';
+                default:
+                    return null;
+            }
+        }),
         token: 'static-token',
     };
     const res = {};
@@ -131,7 +161,16 @@ test('Throws InvalidCredentialsException when static token is used, but user doe
 test('Sets accountability to user information when static token is used', async () => {
     const req = {
         ip: '127.0.0.1',
-        get: jest.fn((string) => (string === 'user-agent' ? 'fake-user-agent' : null)),
+        get: jest.fn((string) => {
+            switch (string) {
+                case 'user-agent':
+                    return 'fake-user-agent';
+                case 'origin':
+                    return 'fake-origin';
+                default:
+                    return null;
+            }
+        }),
         token: 'static-token',
     };
     const res = {};
@@ -144,6 +183,7 @@ test('Sets accountability to user information when static token is used', async
         admin: testUser.admin_access,
         ip: '127.0.0.1',
         userAgent: 'fake-user-agent',
+        origin: 'fake-origin',
     };
     jest.mocked(database_1.default).mockReturnValue({
         select: jest.fn().mockReturnThis(),

package/dist/middleware/validate-batch.d.ts

@@ -1,2 +1 @@
-import { RequestHandler } from 'express';
-export declare const validateBatch: (scope: 'read' | 'update' | 'delete') => RequestHandler;
+export declare const validateBatch: (scope: 'read' | 'update' | 'delete') => (req: import("express").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: import("express").Response<any, Record<string, any>>, next: import("express").NextFunction) => Promise<void>;