From e7bfafede95254b7b1cf86e443ed75ee9159d74b Mon Sep 17 00:00:00 2001 From: Rijk van Zanten Date: Fri, 3 Dec 2021 11:57:36 -0500 Subject: [PATCH] Add shared exceptions to extension context (#10281) Ref #10276 --- api/src/extensions.ts | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/api/src/extensions.ts b/api/src/extensions.ts index e8f3e407e2..4638aa6b46 100644 --- a/api/src/extensions.ts +++ b/api/src/extensions.ts @@ -20,6 +20,7 @@ import getDatabase from './database'; import emitter from './emitter'; import env from './env'; import * as exceptions from './exceptions'; +import * as sharedExceptions from '@directus/shared/exceptions'; import logger from './logger'; import { HookConfig, EndpointConfig, FilterHandler, ActionHandler, InitHandler, ScheduleHandler } from './types'; import fse from 'fs-extra'; @@ -277,7 +278,14 @@ class ExtensionManager { }, }; - register(registerFunctions, { services, exceptions, env, database: getDatabase(), logger, getSchema }); + register(registerFunctions, { + services, + exceptions: { ...exceptions, ...sharedExceptions }, + env, + database: getDatabase(), + logger, + getSchema, + }); } private registerEndpoint(endpoint: Extension, router: Router) { @@ -292,7 +300,14 @@ class ExtensionManager { const scopedRouter = express.Router(); router.use(`/${routeName}`, scopedRouter); - register(scopedRouter, { services, exceptions, env, database: getDatabase(), logger, getSchema }); + register(scopedRouter, { + services, + exceptions: { ...exceptions, ...sharedExceptions }, + env, + database: getDatabase(), + logger, + getSchema, + }); this.apiEndpoints.push({ path: endpointPath,