@directus/api 11.0.1 → 12.0.0

package/dist/controllers/activity.js

@@ -1,7 +1,8 @@
 import { Action } from '@directus/constants';
+import { isDirectusError } from '@directus/errors';
 import express from 'express';
 import Joi from 'joi';
-import { ForbiddenException, InvalidPayloadException } from '../exceptions/index.js';
+import { ErrorCode, ForbiddenError, InvalidPayloadError } from '../errors/index.js';
 import { respond } from '../middleware/respond.js';
 import useCollection from '../middleware/use-collection.js';
 import { validateBatch } from '../middleware/validate-batch.js';
@@ -62,7 +63,7 @@ router.post('/comment', asyncHandler(async (req, res, next) => {
     });
     const { error } = createCommentSchema.validate(req.body);
     if (error) {
-        throw new InvalidPayloadException(error.message);
+        throw new InvalidPayloadError({ reason: error.message });
     }
     const primaryKey = await service.createOne({
         ...req.body,
@@ -79,7 +80,7 @@ router.post('/comment', asyncHandler(async (req, res, next) => {
         };
     }
     catch (error) {
-        if (error instanceof ForbiddenException) {
+        if (isDirectusError(error, ErrorCode.Forbidden)) {
             return next();
         }
         throw error;
@@ -96,7 +97,7 @@ router.patch('/comment/:pk', asyncHandler(async (req, res, next) => {
     });
     const { error } = updateCommentSchema.validate(req.body);
     if (error) {
-        throw new InvalidPayloadException(error.message);
+        throw new InvalidPayloadError({ reason: error.message });
     }
     const primaryKey = await service.updateOne(req.params['pk'], req.body);
     try {
@@ -106,7 +107,7 @@ router.patch('/comment/:pk', asyncHandler(async (req, res, next) => {
         };
     }
     catch (error) {
-        if (error instanceof ForbiddenException) {
+        if (isDirectusError(error, ErrorCode.Forbidden)) {
             return next();
         }
         throw error;
@@ -123,7 +124,7 @@ router.delete('/comment/:pk', asyncHandler(async (req, _res, next) => {
     });
     const item = await adminService.readOne(req.params['pk'], { fields: ['action'] });
     if (!item || item['action'] !== Action.COMMENT) {
-        throw new ForbiddenException();
+        throw new ForbiddenError();
     }
     await service.deleteOne(req.params['pk']);
     return next();

package/dist/controllers/assets.js

@@ -5,7 +5,7 @@ import { merge, pick } from 'lodash-es';
 import { ASSET_TRANSFORM_QUERY_KEYS, SYSTEM_ASSET_ALLOW_LIST } from '../constants.js';
 import getDatabase from '../database/index.js';
 import env from '../env.js';
-import { InvalidQueryException, RangeNotSatisfiableException } from '../exceptions/index.js';
+import { InvalidQueryError, RangeNotSatisfiableError } from '../errors/index.js';
 import logger from '../logger.js';
 import useCollection from '../middleware/use-collection.js';
 import { AssetsService } from '../services/assets.js';
@@ -33,7 +33,9 @@ asyncHandler(async (req, res, next) => {
     const assetSettings = savedAssetSettings || defaults;
     const transformation = pick(req.query, ASSET_TRANSFORM_QUERY_KEYS);
     if ('key' in transformation && Object.keys(transformation).length > 1) {
-        throw new InvalidQueryException(`You can't combine the "key" query parameter with any other transformation.`);
+        throw new InvalidQueryError({
+            reason: `You can't combine the "key" query parameter with any other transformation`,
+        });
     }
     if ('transforms' in transformation) {
         let transforms;
@@ -42,21 +44,29 @@ asyncHandler(async (req, res, next) => {
             transforms = parseJSON(transformation['transforms']);
         }
         catch {
-            throw new InvalidQueryException(`"transforms" Parameter needs to be a JSON array of allowed transformations.`);
+            throw new InvalidQueryError({
+                reason: `"transforms" Parameter needs to be a JSON array of allowed transformations`,
+            });
         }
         // Check if it is actually an array.
         if (!Array.isArray(transforms)) {
-            throw new InvalidQueryException(`"transforms" Parameter needs to be a JSON array of allowed transformations.`);
+            throw new InvalidQueryError({
+                reason: `"transforms" Parameter needs to be a JSON array of allowed transformations`,
+            });
         }
         // Check against ASSETS_TRANSFORM_MAX_OPERATIONS
         if (transforms.length > Number(env['ASSETS_TRANSFORM_MAX_OPERATIONS'])) {
-            throw new InvalidQueryException(`"transforms" Parameter is only allowed ${env['ASSETS_TRANSFORM_MAX_OPERATIONS']} transformations.`);
+            throw new InvalidQueryError({
+                reason: `"transforms" Parameter is only allowed ${env['ASSETS_TRANSFORM_MAX_OPERATIONS']} transformations`,
+            });
         }
         // Check the transformations are valid
         transforms.forEach((transform) => {
             const name = transform[0];
             if (!TransformationMethods.includes(name)) {
-                throw new InvalidQueryException(`"transforms" Parameter does not allow "${name}" as a transformation.`);
+                throw new InvalidQueryError({
+                    reason: `"transforms" Parameter does not allow "${name}" as a transformation`,
+                });
             }
         });
         transformation['transforms'] = transforms;
@@ -75,19 +85,19 @@ asyncHandler(async (req, res, next) => {
     }
     if (assetSettings.storage_asset_transform === 'all') {
         if (transformation['key'] && allKeys.includes(transformation['key']) === false) {
-            throw new InvalidQueryException(`Key "${transformation['key']}" isn't configured.`);
+            throw new InvalidQueryError({ reason: `Key "${transformation['key']}" isn't configured` });
         }
         return next();
     }
     else if (assetSettings.storage_asset_transform === 'presets') {
         if (allKeys.includes(transformation['key']))
             return next();
-        throw new InvalidQueryException(`Only configured presets can be used in asset generation.`);
+        throw new InvalidQueryError({ reason: `Only configured presets can be used in asset generation` });
     }
     else {
         if (transformation['key'] && systemKeys.includes(transformation['key']))
             return next();
-        throw new InvalidQueryException(`Dynamic asset generation has been disabled for this project.`);
+        throw new InvalidQueryError({ reason: `Dynamic asset generation has been disabled for this project` });
     }
 }), asyncHandler(async (req, res, next) => {
     const helmet = await import('helmet');
@@ -123,16 +133,19 @@ asyncHandler(async (req, res) => {
     if (req.headers.range) {
         const rangeParts = /bytes=([0-9]*)-([0-9]*)/.exec(req.headers.range);
         if (rangeParts && rangeParts.length > 1) {
-            range = {};
+            range = {
+                start: undefined,
+                end: undefined,
+            };
             if (rangeParts[1]) {
                 range.start = Number(rangeParts[1]);
                 if (Number.isNaN(range.start))
-                    throw new RangeNotSatisfiableException(range);
+                    throw new RangeNotSatisfiableError({ range });
             }
             if (rangeParts[2]) {
                 range.end = Number(rangeParts[2]);
                 if (Number.isNaN(range.end))
-                    throw new RangeNotSatisfiableException(range);
+                    throw new RangeNotSatisfiableError({ range });
             }
         }
     }

package/dist/controllers/auth.js

@@ -1,8 +1,9 @@
+import { isDirectusError } from '@directus/errors';
 import { Router } from 'express';
 import { createLDAPAuthRouter, createLocalAuthRouter, createOAuth2AuthRouter, createOpenIDAuthRouter, createSAMLAuthRouter, } from '../auth/drivers/index.js';
 import { COOKIE_OPTIONS, DEFAULT_AUTH_PROVIDER } from '../constants.js';
 import env from '../env.js';
-import { InvalidPayloadException } from '../exceptions/index.js';
+import { ErrorCode, InvalidPayloadError } from '../errors/index.js';
 import logger from '../logger.js';
 import { respond } from '../middleware/respond.js';
 import { AuthenticationService } from '../services/authentication.js';
@@ -57,7 +58,7 @@ router.post('/refresh', asyncHandler(async (req, res, next) => {
     });
     const currentRefreshToken = req.body.refresh_token || req.cookies[env['REFRESH_TOKEN_COOKIE_NAME']];
     if (!currentRefreshToken) {
-        throw new InvalidPayloadException(`"refresh_token" is required in either the JSON payload or Cookie`);
+        throw new InvalidPayloadError({ reason: `"refresh_token" is required in either the JSON payload or Cookie` });
     }
     const mode = req.body.mode || (req.body.refresh_token ? 'json' : 'cookie');
     const { accessToken, refreshToken, expires } = await authenticationService.refresh(currentRefreshToken);
@@ -90,7 +91,7 @@ router.post('/logout', asyncHandler(async (req, res, next) => {
     });
     const currentRefreshToken = req.body.refresh_token || req.cookies[env['REFRESH_TOKEN_COOKIE_NAME']];
     if (!currentRefreshToken) {
-        throw new InvalidPayloadException(`"refresh_token" is required in either the JSON payload or Cookie`);
+        throw new InvalidPayloadError({ reason: `"refresh_token" is required in either the JSON payload or Cookie` });
     }
     await authenticationService.logout(currentRefreshToken);
     if (req.cookies[env['REFRESH_TOKEN_COOKIE_NAME']]) {
@@ -105,7 +106,7 @@ router.post('/logout', asyncHandler(async (req, res, next) => {
 }), respond);
 router.post('/password/request', asyncHandler(async (req, _res, next) => {
     if (typeof req.body.email !== 'string') {
-        throw new InvalidPayloadException(`"email" field is required.`);
+        throw new InvalidPayloadError({ reason: `"email" field is required` });
     }
     const accountability = {
         ip: getIPFromReq(req),
@@ -123,7 +124,7 @@ router.post('/password/request', asyncHandler(async (req, _res, next) => {
         return next();
     }
     catch (err) {
-        if (err instanceof InvalidPayloadException) {
+        if (isDirectusError(err, ErrorCode.InvalidPayload)) {
             throw err;
         }
         else {
@@ -134,10 +135,10 @@ router.post('/password/request', asyncHandler(async (req, _res, next) => {
 }), respond);
 router.post('/password/reset', asyncHandler(async (req, _res, next) => {
     if (typeof req.body.token !== 'string') {
-        throw new InvalidPayloadException(`"token" field is required.`);
+        throw new InvalidPayloadError({ reason: `"token" field is required` });
     }
     if (typeof req.body.password !== 'string') {
-        throw new InvalidPayloadException(`"password" field is required.`);
+        throw new InvalidPayloadError({ reason: `"password" field is required` });
     }
     const accountability = {
         ip: getIPFromReq(req),

package/dist/controllers/collections.js

@@ -1,5 +1,6 @@
+import { isDirectusError } from '@directus/errors';
 import { Router } from 'express';
-import { ForbiddenException } from '../exceptions/index.js';
+import { ErrorCode } from '../errors/index.js';
 import { respond } from '../middleware/respond.js';
 import { validateBatch } from '../middleware/validate-batch.js';
 import { CollectionsService } from '../services/collections.js';
@@ -65,7 +66,7 @@ router.patch('/', asyncHandler(async (req, res, next) => {
         res.locals['payload'] = { data: collections || null };
     }
     catch (error) {
-        if (error instanceof ForbiddenException) {
+        if (isDirectusError(error, ErrorCode.Forbidden)) {
             return next();
         }
         throw error;
@@ -83,7 +84,7 @@ router.patch('/:collection', asyncHandler(async (req, res, next) => {
         res.locals['payload'] = { data: collection || null };
     }
     catch (error) {
-        if (error instanceof ForbiddenException) {
+        if (isDirectusError(error, ErrorCode.Forbidden)) {
             return next();
         }
         throw error;

package/dist/controllers/dashboards.js

@@ -1,5 +1,6 @@
+import { isDirectusError } from '@directus/errors';
 import express from 'express';
-import { ForbiddenException } from '../exceptions/index.js';
+import { ErrorCode } from '../errors/index.js';
 import { respond } from '../middleware/respond.js';
 import useCollection from '../middleware/use-collection.js';
 import { validateBatch } from '../middleware/validate-batch.js';
@@ -34,7 +35,7 @@ router.post('/', asyncHandler(async (req, res, next) => {
         }
     }
     catch (error) {
-        if (error instanceof ForbiddenException) {
+        if (isDirectusError(error, ErrorCode.Forbidden)) {
             return next();
         }
         throw error;
@@ -87,7 +88,7 @@ router.patch('/', validateBatch('update'), asyncHandler(async (req, res, next) =
         res.locals['payload'] = { data: result };
     }
     catch (error) {
-        if (error instanceof ForbiddenException) {
+        if (isDirectusError(error, ErrorCode.Forbidden)) {
             return next();
         }
         throw error;
@@ -105,7 +106,7 @@ router.patch('/:pk', asyncHandler(async (req, res, next) => {
         res.locals['payload'] = { data: item || null };
     }
     catch (error) {
-        if (error instanceof ForbiddenException) {
+        if (isDirectusError(error, ErrorCode.Forbidden)) {
             return next();
         }
         throw error;

package/dist/controllers/extensions.js

@@ -2,7 +2,7 @@ import { EXTENSION_TYPES } from '@directus/constants';
 import { depluralize, isIn } from '@directus/utils';
 import { Router } from 'express';
 import env from '../env.js';
-import { RouteNotFoundException } from '../exceptions/index.js';
+import { RouteNotFoundError } from '../errors/index.js';
 import { getExtensionManager } from '../extensions.js';
 import { respond } from '../middleware/respond.js';
 import asyncHandler from '../utils/async-handler.js';
@@ -12,7 +12,7 @@ const router = Router();
 router.get('/:type', asyncHandler(async (req, res, next) => {
     const type = depluralize(req.params['type']);
     if (!isIn(type, EXTENSION_TYPES)) {
-        throw new RouteNotFoundException(req.path);
+        throw new RouteNotFoundError({ path: req.path });
     }
     const extensionManager = getExtensionManager();
     const extensions = extensionManager.getExtensionsList(type);
@@ -32,7 +32,7 @@ router.get('/sources/:chunk', asyncHandler(async (req, res) => {
         source = extensionManager.getAppExtensionChunk(chunk);
     }
     if (source === null) {
-        throw new RouteNotFoundException(req.path);
+        throw new RouteNotFoundError({ path: req.path });
     }
     res.setHeader('Content-Type', 'application/javascript; charset=UTF-8');
     res.setHeader('Cache-Control', getCacheControlHeader(req, getMilliseconds(env['EXTENSIONS_CACHE_TTL']), false, false));

package/dist/controllers/fields.js

@@ -1,8 +1,9 @@
 import { TYPES } from '@directus/constants';
+import { isDirectusError } from '@directus/errors';
 import { Router } from 'express';
 import Joi from 'joi';
 import { ALIAS_TYPES } from '../constants.js';
-import { ForbiddenException, InvalidPayloadException } from '../exceptions/index.js';
+import { ErrorCode, InvalidPayloadError } from '../errors/index.js';
 import validateCollection from '../middleware/collection-exists.js';
 import { respond } from '../middleware/respond.js';
 import useCollection from '../middleware/use-collection.js';
@@ -60,7 +61,7 @@ router.post('/:collection', validateCollection, asyncHandler(async (req, res, ne
     });
     const { error } = newFieldSchema.validate(req.body);
     if (error) {
-        throw new InvalidPayloadException(error.message);
+        throw new InvalidPayloadError({ reason: error.message });
     }
     const field = req.body;
     await service.createField(req.params['collection'], field);
@@ -69,7 +70,7 @@ router.post('/:collection', validateCollection, asyncHandler(async (req, res, ne
         res.locals['payload'] = { data: createdField || null };
     }
     catch (error) {
-        if (error instanceof ForbiddenException) {
+        if (isDirectusError(error, ErrorCode.Forbidden)) {
             return next();
         }
         throw error;
@@ -82,7 +83,7 @@ router.patch('/:collection', validateCollection, asyncHandler(async (req, res, n
         schema: req.schema,
     });
     if (Array.isArray(req.body) === false) {
-        throw new InvalidPayloadException('Submitted body has to be an array.');
+        throw new InvalidPayloadError({ reason: 'Submitted body has to be an array' });
     }
     for (const field of req.body) {
         await service.updateField(req.params['collection'], field);
@@ -96,7 +97,7 @@ router.patch('/:collection', validateCollection, asyncHandler(async (req, res, n
         }
     }
     catch (error) {
-        if (error instanceof ForbiddenException) {
+        if (isDirectusError(error, ErrorCode.Forbidden)) {
             return next();
         }
         throw error;
@@ -123,10 +124,10 @@ router.patch('/:collection/:field', validateCollection, asyncHandler(async (req,
     });
     const { error } = updateSchema.validate(req.body);
     if (error) {
-        throw new InvalidPayloadException(error.message);
+        throw new InvalidPayloadError({ reason: error.message });
     }
     if (req.body.schema && !req.body.type) {
-        throw new InvalidPayloadException(`You need to provide "type" when providing "schema".`);
+        throw new InvalidPayloadError({ reason: `You need to provide "type" when providing "schema"` });
     }
     const fieldData = req.body;
     if (!fieldData.field)
@@ -137,7 +138,7 @@ router.patch('/:collection/:field', validateCollection, asyncHandler(async (req,
         res.locals['payload'] = { data: updatedField || null };
     }
     catch (error) {
-        if (error instanceof ForbiddenException) {
+        if (isDirectusError(error, ErrorCode.Forbidden)) {
             return next();
         }
         throw error;

package/dist/controllers/files.js

@@ -1,3 +1,4 @@
+import { isDirectusError } from '@directus/errors';
 import formatTitle from '@directus/format-title';
 import { toArray } from '@directus/utils';
 import Busboy from 'busboy';
@@ -7,8 +8,7 @@ import Joi from 'joi';
 import { minimatch } from 'minimatch';
 import path from 'path';
 import env from '../env.js';
-import { ContentTooLargeException } from '../exceptions/content-too-large.js';
-import { ForbiddenException, InvalidPayloadException } from '../exceptions/index.js';
+import { ContentTooLargeError, ErrorCode, InvalidPayloadError } from '../errors/index.js';
 import { respond } from '../middleware/respond.js';
 import useCollection from '../middleware/use-collection.js';
 import { validateBatch } from '../middleware/validate-batch.js';
@@ -64,12 +64,12 @@ export const multipartHandler = (req, res, next) => {
     });
     busboy.on('file', async (_fieldname, fileStream, { filename, mimeType }) => {
         if (!filename) {
-            return busboy.emit('error', new InvalidPayloadException(`File is missing filename`));
+            return busboy.emit('error', new InvalidPayloadError({ reason: `File is missing filename` }));
         }
         const allowedPatterns = toArray(env['FILES_MIME_TYPE_ALLOW_LIST']);
         const mimeTypeAllowed = allowedPatterns.some((pattern) => minimatch(mimeType, pattern));
         if (mimeTypeAllowed === false) {
-            return busboy.emit('error', new InvalidPayloadException(`File is of invalid content type`));
+            return busboy.emit('error', new InvalidPayloadError({ reason: `File is of invalid content type` }));
         }
         fileCount++;
         if (!existingPrimaryKey) {
@@ -86,7 +86,7 @@ export const multipartHandler = (req, res, next) => {
         // Clear the payload for the next to-be-uploaded file
         payload = {};
         fileStream.on('limit', () => {
-            const error = new ContentTooLargeException(`Uploaded file is too large`);
+            const error = new ContentTooLargeError();
             next(error);
         });
         try {
@@ -109,7 +109,7 @@ export const multipartHandler = (req, res, next) => {
     function tryDone() {
         if (savedFiles.length === fileCount) {
             if (fileCount === 0) {
-                return next(new InvalidPayloadException(`No files were included in the body`));
+                return next(new InvalidPayloadError({ reason: `No files were included in the body` }));
             }
             res.locals['savedFiles'] = savedFiles;
             return next();
@@ -144,7 +144,7 @@ router.post('/', asyncHandler(multipartHandler), asyncHandler(async (req, res, n
         }
     }
     catch (error) {
-        if (error instanceof ForbiddenException) {
+        if (isDirectusError(error, ErrorCode.Forbidden)) {
             return next();
         }
         throw error;
@@ -158,7 +158,7 @@ const importSchema = Joi.object({
 router.post('/import', asyncHandler(async (req, res, next) => {
     const { error } = importSchema.validate(req.body);
     if (error) {
-        throw new InvalidPayloadException(error.message);
+        throw new InvalidPayloadError({ reason: error.message });
     }
     const service = new FilesService({
         accountability: req.accountability,
@@ -170,7 +170,7 @@ router.post('/import', asyncHandler(async (req, res, next) => {
         res.locals['payload'] = { data: record || null };
     }
     catch (error) {
-        if (error instanceof ForbiddenException) {
+        if (isDirectusError(error, ErrorCode.Forbidden)) {
             return next();
         }
         throw error;
@@ -232,7 +232,7 @@ router.patch('/', validateBatch('update'), asyncHandler(async (req, res, next) =
         res.locals['payload'] = { data: result || null };
     }
     catch (error) {
-        if (error instanceof ForbiddenException) {
+        if (isDirectusError(error, ErrorCode.Forbidden)) {
             return next();
         }
         throw error;
@@ -250,7 +250,7 @@ router.patch('/:pk', asyncHandler(multipartHandler), asyncHandler(async (req, re
         res.locals['payload'] = { data: record || null };
     }
     catch (error) {
-        if (error instanceof ForbiddenException) {
+        if (isDirectusError(error, ErrorCode.Forbidden)) {
             return next();
         }
         throw error;

package/dist/controllers/flows.js

@@ -1,6 +1,7 @@
+import { isDirectusError } from '@directus/errors';
 import express from 'express';
 import { UUID_REGEX } from '../constants.js';
-import { ForbiddenException } from '../exceptions/index.js';
+import { ErrorCode } from '../errors/index.js';
 import { getFlowManager } from '../flows.js';
 import { respond } from '../middleware/respond.js';
 import useCollection from '../middleware/use-collection.js';
@@ -56,7 +57,7 @@ router.post('/', asyncHandler(async (req, res, next) => {
         }
     }
     catch (error) {
-        if (error instanceof ForbiddenException) {
+        if (isDirectusError(error, ErrorCode.Forbidden)) {
             return next();
         }
         throw error;
@@ -109,7 +110,7 @@ router.patch('/', validateBatch('update'), asyncHandler(async (req, res, next) =
         res.locals['payload'] = { data: result };
     }
     catch (error) {
-        if (error instanceof ForbiddenException) {
+        if (isDirectusError(error, ErrorCode.Forbidden)) {
             return next();
         }
         throw error;
@@ -127,7 +128,7 @@ router.patch('/:pk', asyncHandler(async (req, res, next) => {
         res.locals['payload'] = { data: item || null };
     }
     catch (error) {
-        if (error instanceof ForbiddenException) {
+        if (isDirectusError(error, ErrorCode.Forbidden)) {
             return next();
         }
         throw error;

package/dist/controllers/folders.js

@@ -1,5 +1,6 @@
+import { isDirectusError } from '@directus/errors';
 import express from 'express';
-import { ForbiddenException } from '../exceptions/index.js';
+import { ErrorCode } from '../errors/index.js';
 import { respond } from '../middleware/respond.js';
 import useCollection from '../middleware/use-collection.js';
 import { validateBatch } from '../middleware/validate-batch.js';
@@ -34,7 +35,7 @@ router.post('/', asyncHandler(async (req, res, next) => {
         }
     }
     catch (error) {
-        if (error instanceof ForbiddenException) {
+        if (isDirectusError(error, ErrorCode.Forbidden)) {
             return next();
         }
         throw error;
@@ -96,7 +97,7 @@ router.patch('/', validateBatch('update'), asyncHandler(async (req, res, next) =
         res.locals['payload'] = { data: result || null };
     }
     catch (error) {
-        if (error instanceof ForbiddenException) {
+        if (isDirectusError(error, ErrorCode.Forbidden)) {
             return next();
         }
         throw error;
@@ -114,7 +115,7 @@ router.patch('/:pk', asyncHandler(async (req, res, next) => {
         res.locals['payload'] = { data: record || null };
     }
     catch (error) {
-        if (error instanceof ForbiddenException) {
+        if (isDirectusError(error, ErrorCode.Forbidden)) {
             return next();
         }
         throw error;

package/dist/controllers/items.js

@@ -1,5 +1,6 @@
+import { isDirectusError } from '@directus/errors';
 import express from 'express';
-import { ForbiddenException, RouteNotFoundException } from '../exceptions/index.js';
+import { ErrorCode, ForbiddenError, RouteNotFoundError } from '../errors/index.js';
 import collectionExists from '../middleware/collection-exists.js';
 import { respond } from '../middleware/respond.js';
 import { validateBatch } from '../middleware/validate-batch.js';
@@ -10,9 +11,9 @@ import { sanitizeQuery } from '../utils/sanitize-query.js';
 const router = express.Router();
 router.post('/:collection', collectionExists, asyncHandler(async (req, res, next) => {
     if (req.params['collection'].startsWith('directus_'))
-        throw new ForbiddenException();
+        throw new ForbiddenError();
     if (req.singleton) {
-        throw new RouteNotFoundException(req.path);
+        throw new RouteNotFoundError({ path: req.path });
     }
     const service = new ItemsService(req.collection, {
         accountability: req.accountability,
@@ -38,7 +39,7 @@ router.post('/:collection', collectionExists, asyncHandler(async (req, res, next
         }
     }
     catch (error) {
-        if (error instanceof ForbiddenException) {
+        if (isDirectusError(error, ErrorCode.Forbidden)) {
             return next();
         }
         throw error;
@@ -47,7 +48,7 @@ router.post('/:collection', collectionExists, asyncHandler(async (req, res, next
 }), respond);
 const readHandler = asyncHandler(async (req, res, next) => {
     if (req.params['collection'].startsWith('directus_'))
-        throw new ForbiddenException();
+        throw new ForbiddenError();
     const service = new ItemsService(req.collection, {
         accountability: req.accountability,
         schema: req.schema,
@@ -77,7 +78,7 @@ router.search('/:collection', collectionExists, validateBatch('read'), readHandl
 router.get('/:collection', collectionExists, readHandler, respond);
 router.get('/:collection/:pk', collectionExists, asyncHandler(async (req, res, next) => {
     if (req.params['collection'].startsWith('directus_'))
-        throw new ForbiddenException();
+        throw new ForbiddenError();
     const service = new ItemsService(req.collection, {
         accountability: req.accountability,
         schema: req.schema,
@@ -90,7 +91,7 @@ router.get('/:collection/:pk', collectionExists, asyncHandler(async (req, res, n
 }), respond);
 router.patch('/:collection', collectionExists, validateBatch('update'), asyncHandler(async (req, res, next) => {
     if (req.params['collection'].startsWith('directus_'))
-        throw new ForbiddenException();
+        throw new ForbiddenError();
     const service = new ItemsService(req.collection, {
         accountability: req.accountability,
         schema: req.schema,
@@ -117,7 +118,7 @@ router.patch('/:collection', collectionExists, validateBatch('update'), asyncHan
         res.locals['payload'] = { data: result };
     }
     catch (error) {
-        if (error instanceof ForbiddenException) {
+        if (isDirectusError(error, ErrorCode.Forbidden)) {
             return next();
         }
         throw error;
@@ -126,9 +127,9 @@ router.patch('/:collection', collectionExists, validateBatch('update'), asyncHan
 }), respond);
 router.patch('/:collection/:pk', collectionExists, asyncHandler(async (req, res, next) => {
     if (req.params['collection'].startsWith('directus_'))
-        throw new ForbiddenException();
+        throw new ForbiddenError();
     if (req.singleton) {
-        throw new RouteNotFoundException(req.path);
+        throw new RouteNotFoundError({ path: req.path });
     }
     const service = new ItemsService(req.collection, {
         accountability: req.accountability,
@@ -140,7 +141,7 @@ router.patch('/:collection/:pk', collectionExists, asyncHandler(async (req, res,
         res.locals['payload'] = { data: result || null };
     }
     catch (error) {
-        if (error instanceof ForbiddenException) {
+        if (isDirectusError(error, ErrorCode.Forbidden)) {
             return next();
         }
         throw error;
@@ -149,7 +150,7 @@ router.patch('/:collection/:pk', collectionExists, asyncHandler(async (req, res,
 }), respond);
 router.delete('/:collection', collectionExists, validateBatch('delete'), asyncHandler(async (req, _res, next) => {
     if (req.params['collection'].startsWith('directus_'))
-        throw new ForbiddenException();
+        throw new ForbiddenError();
     const service = new ItemsService(req.collection, {
         accountability: req.accountability,
         schema: req.schema,
@@ -168,7 +169,7 @@ router.delete('/:collection', collectionExists, validateBatch('delete'), asyncHa
 }), respond);
 router.delete('/:collection/:pk', collectionExists, asyncHandler(async (req, _res, next) => {
     if (req.params['collection'].startsWith('directus_'))
-        throw new ForbiddenException();
+        throw new ForbiddenError();
     const service = new ItemsService(req.collection, {
         accountability: req.accountability,
         schema: req.schema,

package/dist/controllers/not-found.js

@@ -1,6 +1,6 @@
 import getDatabase from '../database/index.js';
 import emitter from '../emitter.js';
-import { RouteNotFoundException } from '../exceptions/index.js';
+import { RouteNotFoundError } from '../errors/index.js';
 /**
  * Handles not found routes.
  *
@@ -22,7 +22,7 @@ const notFound = async (req, res, next) => {
         if (hooksResult) {
             return next();
         }
-        next(new RouteNotFoundException(req.path));
+        next(new RouteNotFoundError({ path: req.path }));
     }
     catch (err) {
         next(err);