@directus/api 35.0.2 → 35.2.0

package/dist/controllers/policies.js

@@ -35,9 +35,7 @@ router.post("/", async_handler_default(async (req, res, next) => {
 			res.locals["payload"] = { data: item };
 		}
 	} catch (error) {
-		if (isDirectusError(error, ErrorCode.Forbidden)) {
-			return next();
-		}
+		if (isDirectusError(error, ErrorCode.Forbidden)) return next();
 		throw error;
 	}
 	return next();
@@ -52,11 +50,8 @@ const readHandler = async_handler_default(async (req, res, next) => {
 		schema: req.schema
 	});
 	let result;
-	if (req.body.keys) {
-		result = await service.readMany(req.body.keys, req.sanitizedQuery);
-	} else {
-		result = await service.readByQuery(req.sanitizedQuery);
-	}
+	if (req.body.keys) result = await service.readMany(req.body.keys, req.sanitizedQuery);
+	else result = await service.readByQuery(req.sanitizedQuery);
 	const meta = await metaService.getMetaForQuery("directus_policies", req.sanitizedQuery);
 	res.locals["payload"] = {
 		data: result,
@@ -85,11 +80,10 @@ router.get("/me/globals", async_handler_default(async (req, res, next) => {
 }), respond);
 router.get("/:pk", async_handler_default(async (req, res, next) => {
 	if (req.path.endsWith("me")) return next();
-	const service = new PoliciesService({
+	const record = await new PoliciesService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	const record = await service.readOne(req.params["pk"], req.sanitizedQuery);
+	}).readOne(req.params["pk"], req.sanitizedQuery);
 	res.locals["payload"] = { data: record };
 	return next();
 }), respond);
@@ -99,11 +93,9 @@ router.patch("/", validateBatch("update"), async_handler_default(async (req, res
 		schema: req.schema
 	});
 	let keys = [];
-	if (Array.isArray(req.body)) {
-		keys = await service.updateBatch(req.body);
-	} else if (req.body.keys) {
-		keys = await service.updateMany(req.body.keys, req.body.data);
-	} else {
+	if (Array.isArray(req.body)) keys = await service.updateBatch(req.body);
+	else if (req.body.keys) keys = await service.updateMany(req.body.keys, req.body.data);
+	else {
 		const sanitizedQuery = await sanitizeQuery(req.body.query, req.schema, req.accountability);
 		keys = await service.updateByQuery(sanitizedQuery, req.body.data);
 	}
@@ -111,9 +103,7 @@ router.patch("/", validateBatch("update"), async_handler_default(async (req, res
 		const result = await service.readMany(keys, req.sanitizedQuery);
 		res.locals["payload"] = { data: result };
 	} catch (error) {
-		if (isDirectusError(error, ErrorCode.Forbidden)) {
-			return next();
-		}
+		if (isDirectusError(error, ErrorCode.Forbidden)) return next();
 		throw error;
 	}
 	return next();
@@ -128,9 +118,7 @@ router.patch("/:pk", async_handler_default(async (req, res, next) => {
 		const item = await service.readOne(primaryKey, req.sanitizedQuery);
 		res.locals["payload"] = { data: item || null };
 	} catch (error) {
-		if (isDirectusError(error, ErrorCode.Forbidden)) {
-			return next();
-		}
+		if (isDirectusError(error, ErrorCode.Forbidden)) return next();
 		throw error;
 	}
 	return next();
@@ -140,22 +128,19 @@ router.delete("/", validateBatch("delete"), async_handler_default(async (req, _r
 		accountability: req.accountability,
 		schema: req.schema
 	});
-	if (Array.isArray(req.body)) {
-		await service.deleteMany(req.body);
-	} else if (req.body.keys) {
-		await service.deleteMany(req.body.keys);
-	} else {
+	if (Array.isArray(req.body)) await service.deleteMany(req.body);
+	else if (req.body.keys) await service.deleteMany(req.body.keys);
+	else {
 		const sanitizedQuery = await sanitizeQuery(req.body.query, req.schema, req.accountability);
 		await service.deleteByQuery(sanitizedQuery);
 	}
 	return next();
 }), respond);
 router.delete("/:pk", async_handler_default(async (req, _res, next) => {
-	const service = new PoliciesService({
+	await new PoliciesService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	await service.deleteOne(req.params["pk"]);
+	}).deleteOne(req.params["pk"]);
 	return next();
 }), respond);
 var policies_default = router;

package/dist/controllers/presets.js

@@ -33,9 +33,7 @@ router.post("/", async_handler_default(async (req, res, next) => {
 			res.locals["payload"] = { data: record };
 		}
 	} catch (error) {
-		if (isDirectusError(error, ErrorCode.Forbidden)) {
-			return next();
-		}
+		if (isDirectusError(error, ErrorCode.Forbidden)) return next();
 		throw error;
 	}
 	return next();
@@ -50,13 +48,9 @@ const readHandler = async_handler_default(async (req, res, next) => {
 		schema: req.schema
 	});
 	let result;
-	if (req.singleton) {
-		result = await service.readSingleton(req.sanitizedQuery);
-	} else if (req.body.keys) {
-		result = await service.readMany(req.body.keys, req.sanitizedQuery);
-	} else {
-		result = await service.readByQuery(req.sanitizedQuery);
-	}
+	if (req.singleton) result = await service.readSingleton(req.sanitizedQuery);
+	else if (req.body.keys) result = await service.readMany(req.body.keys, req.sanitizedQuery);
+	else result = await service.readByQuery(req.sanitizedQuery);
 	const meta = await metaService.getMetaForQuery("directus_presets", req.sanitizedQuery);
 	res.locals["payload"] = {
 		data: result,
@@ -67,11 +61,10 @@ const readHandler = async_handler_default(async (req, res, next) => {
 router.get("/", validateBatch("read"), readHandler, respond);
 router.search("/", validateBatch("read"), readHandler, respond);
 router.get("/:pk", async_handler_default(async (req, res, next) => {
-	const service = new PresetsService({
+	const record = await new PresetsService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	const record = await service.readOne(req.params["pk"], req.sanitizedQuery);
+	}).readOne(req.params["pk"], req.sanitizedQuery);
 	res.locals["payload"] = { data: record || null };
 	return next();
 }), respond);
@@ -81,11 +74,9 @@ router.patch("/", validateBatch("update"), async_handler_default(async (req, res
 		schema: req.schema
 	});
 	let keys = [];
-	if (Array.isArray(req.body)) {
-		keys = await service.updateBatch(req.body);
-	} else if (req.body.keys) {
-		keys = await service.updateMany(req.body.keys, req.body.data);
-	} else {
+	if (Array.isArray(req.body)) keys = await service.updateBatch(req.body);
+	else if (req.body.keys) keys = await service.updateMany(req.body.keys, req.body.data);
+	else {
 		const sanitizedQuery = await sanitizeQuery(req.body.query, req.schema, req.accountability);
 		keys = await service.updateByQuery(sanitizedQuery, req.body.data);
 	}
@@ -93,9 +84,7 @@ router.patch("/", validateBatch("update"), async_handler_default(async (req, res
 		const result = await service.readMany(keys, req.sanitizedQuery);
 		res.locals["payload"] = { data: result };
 	} catch (error) {
-		if (isDirectusError(error, ErrorCode.Forbidden)) {
-			return next();
-		}
+		if (isDirectusError(error, ErrorCode.Forbidden)) return next();
 		throw error;
 	}
 	return next();
@@ -110,9 +99,7 @@ router.patch("/:pk", async_handler_default(async (req, res, next) => {
 		const record = await service.readOne(primaryKey, req.sanitizedQuery);
 		res.locals["payload"] = { data: record };
 	} catch (error) {
-		if (isDirectusError(error, ErrorCode.Forbidden)) {
-			return next();
-		}
+		if (isDirectusError(error, ErrorCode.Forbidden)) return next();
 		throw error;
 	}
 	return next();
@@ -122,22 +109,19 @@ router.delete("/", validateBatch("delete"), async_handler_default(async (req, _r
 		accountability: req.accountability,
 		schema: req.schema
 	});
-	if (Array.isArray(req.body)) {
-		await service.deleteMany(req.body);
-	} else if (req.body.keys) {
-		await service.deleteMany(req.body.keys);
-	} else {
+	if (Array.isArray(req.body)) await service.deleteMany(req.body);
+	else if (req.body.keys) await service.deleteMany(req.body.keys);
+	else {
 		const sanitizedQuery = await sanitizeQuery(req.body.query, req.schema, req.accountability);
 		await service.deleteByQuery(sanitizedQuery);
 	}
 	return next();
 }), respond);
 router.delete("/:pk", async_handler_default(async (req, _res, next) => {
-	const service = new PresetsService({
+	await new PresetsService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	await service.deleteOne(req.params["pk"]);
+	}).deleteOne(req.params["pk"]);
 	return next();
 }), respond);
 var presets_default = router;

package/dist/controllers/relations.js

@@ -11,29 +11,26 @@ import Joi from "joi";
 const router = express.Router();
 router.use(use_collection_default("directus_relations"));
 router.get("/", async_handler_default(async (req, res, next) => {
-	const service = new RelationsService({
+	const relations = await new RelationsService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	const relations = await service.readAll();
+	}).readAll();
 	res.locals["payload"] = { data: relations || null };
 	return next();
 }), respond);
 router.get("/:collection", collection_exists_default, async_handler_default(async (req, res, next) => {
-	const service = new RelationsService({
+	const relations = await new RelationsService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	const relations = await service.readAll(req.params["collection"]);
+	}).readAll(req.params["collection"]);
 	res.locals["payload"] = { data: relations || null };
 	return next();
 }), respond);
 router.get("/:collection/:field", collection_exists_default, async_handler_default(async (req, res, next) => {
-	const service = new RelationsService({
+	const relation = await new RelationsService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	const relation = await service.readOne(req.params["collection"], req.params["field"]);
+	}).readOne(req.params["collection"], req.params["field"]);
 	res.locals["payload"] = { data: relation || null };
 	return next();
 }), respond);
@@ -50,17 +47,13 @@ router.post("/", async_handler_default(async (req, res, next) => {
 		schema: req.schema
 	});
 	const { error } = newRelationSchema.validate(req.body);
-	if (error) {
-		throw new InvalidPayloadError({ reason: error.message });
-	}
+	if (error) throw new InvalidPayloadError({ reason: error.message });
 	await service.createOne(req.body);
 	try {
 		const createdRelation = await service.readOne(req.body.collection, req.body.field);
 		res.locals["payload"] = { data: createdRelation || null };
 	} catch (error$1) {
-		if (isDirectusError(error$1, ErrorCode.Forbidden)) {
-			return next();
-		}
+		if (isDirectusError(error$1, ErrorCode.Forbidden)) return next();
 		throw error$1;
 	}
 	return next();
@@ -78,27 +71,22 @@ router.patch("/:collection/:field", collection_exists_default, async_handler_def
 		schema: req.schema
 	});
 	const { error } = updateRelationSchema.validate(req.body);
-	if (error) {
-		throw new InvalidPayloadError({ reason: error.message });
-	}
+	if (error) throw new InvalidPayloadError({ reason: error.message });
 	await service.updateOne(req.params["collection"], req.params["field"], req.body);
 	try {
 		const updatedField = await service.readOne(req.params["collection"], req.params["field"]);
 		res.locals["payload"] = { data: updatedField || null };
 	} catch (error$1) {
-		if (isDirectusError(error$1, ErrorCode.Forbidden)) {
-			return next();
-		}
+		if (isDirectusError(error$1, ErrorCode.Forbidden)) return next();
 		throw error$1;
 	}
 	return next();
 }), respond);
 router.delete("/:collection/:field", collection_exists_default, async_handler_default(async (req, _res, next) => {
-	const service = new RelationsService({
+	await new RelationsService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	await service.deleteOne(req.params["collection"], req.params["field"]);
+	}).deleteOne(req.params["collection"], req.params["field"]);
 	return next();
 }), respond);
 var relations_default = router;

package/dist/controllers/revisions.js

@@ -29,11 +29,10 @@ const readHandler = async_handler_default(async (req, res, next) => {
 router.get("/", validateBatch("read"), readHandler, respond);
 router.search("/", validateBatch("read"), readHandler, respond);
 router.get("/:pk", async_handler_default(async (req, res, next) => {
-	const service = new RevisionsService({
+	const record = await new RevisionsService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	const record = await service.readOne(req.params["pk"], req.sanitizedQuery);
+	}).readOne(req.params["pk"], req.sanitizedQuery);
 	res.locals["payload"] = { data: record || null };
 	return next();
 }), respond);

package/dist/controllers/roles.js

@@ -33,9 +33,7 @@ router.post("/", async_handler_default(async (req, res, next) => {
 			res.locals["payload"] = { data: item };
 		}
 	} catch (error) {
-		if (isDirectusError(error, ErrorCode.Forbidden)) {
-			return next();
-		}
+		if (isDirectusError(error, ErrorCode.Forbidden)) return next();
 		throw error;
 	}
 	return next();
@@ -82,11 +80,10 @@ router.get("/me", async_handler_default(async (req, res, next) => {
 	return next();
 }), respond);
 router.get("/:pk", async_handler_default(async (req, res, next) => {
-	const service = new RolesService({
+	const record = await new RolesService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	const record = await service.readOne(req.params["pk"], req.sanitizedQuery);
+	}).readOne(req.params["pk"], req.sanitizedQuery);
 	res.locals["payload"] = { data: record || null };
 	return next();
 }), respond);
@@ -96,11 +93,9 @@ router.patch("/", validateBatch("update"), async_handler_default(async (req, res
 		schema: req.schema
 	});
 	let keys = [];
-	if (Array.isArray(req.body)) {
-		keys = await service.updateBatch(req.body);
-	} else if (req.body.keys) {
-		keys = await service.updateMany(req.body.keys, req.body.data);
-	} else {
+	if (Array.isArray(req.body)) keys = await service.updateBatch(req.body);
+	else if (req.body.keys) keys = await service.updateMany(req.body.keys, req.body.data);
+	else {
 		const sanitizedQuery = await sanitizeQuery(req.body.query, req.schema, req.accountability);
 		keys = await service.updateByQuery(sanitizedQuery, req.body.data);
 	}
@@ -108,9 +103,7 @@ router.patch("/", validateBatch("update"), async_handler_default(async (req, res
 		const result = await service.readMany(keys, req.sanitizedQuery);
 		res.locals["payload"] = { data: result };
 	} catch (error) {
-		if (isDirectusError(error, ErrorCode.Forbidden)) {
-			return next();
-		}
+		if (isDirectusError(error, ErrorCode.Forbidden)) return next();
 		throw error;
 	}
 	return next();
@@ -125,9 +118,7 @@ router.patch("/:pk", async_handler_default(async (req, res, next) => {
 		const item = await service.readOne(primaryKey, req.sanitizedQuery);
 		res.locals["payload"] = { data: item || null };
 	} catch (error) {
-		if (isDirectusError(error, ErrorCode.Forbidden)) {
-			return next();
-		}
+		if (isDirectusError(error, ErrorCode.Forbidden)) return next();
 		throw error;
 	}
 	return next();
@@ -137,22 +128,19 @@ router.delete("/", validateBatch("delete"), async_handler_default(async (req, _r
 		accountability: req.accountability,
 		schema: req.schema
 	});
-	if (Array.isArray(req.body)) {
-		await service.deleteMany(req.body);
-	} else if (req.body.keys) {
-		await service.deleteMany(req.body.keys);
-	} else {
+	if (Array.isArray(req.body)) await service.deleteMany(req.body);
+	else if (req.body.keys) await service.deleteMany(req.body.keys);
+	else {
 		const sanitizedQuery = await sanitizeQuery(req.body.query, req.schema, req.accountability);
 		await service.deleteByQuery(sanitizedQuery);
 	}
 	return next();
 }), respond);
 router.delete("/:pk", async_handler_default(async (req, _res, next) => {
-	const service = new RolesService({
+	await new RolesService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	await service.deleteOne(req.params["pk"]);
+	}).deleteOne(req.params["pk"]);
 	return next();
 }), respond);
 var roles_default = router;

package/dist/controllers/schema.js

@@ -4,7 +4,7 @@ import { respond } from "../middleware/respond.js";
 import { getVersionedHash } from "../utils/get-versioned-hash.js";
 import { SchemaService } from "../services/schema.js";
 import { InvalidPayloadError, UnsupportedMediaTypeError } from "@directus/errors";
-import { parseJSON } from "@directus/utils";
+import { parseJSON, toBoolean } from "@directus/utils";
 import express from "express";
 import { load } from "js-yaml";
 import Busboy from "busboy";
@@ -12,30 +12,24 @@ import Busboy from "busboy";
 //#region src/controllers/schema.ts
 const router = express.Router();
 router.get("/snapshot", async_handler_default(async (req, res, next) => {
-	const service = new SchemaService({ accountability: req.accountability });
-	const currentSnapshot = await service.snapshot();
+	const currentSnapshot = await new SchemaService({ accountability: req.accountability }).snapshot();
 	res.locals["payload"] = { data: currentSnapshot };
 	return next();
 }), respond);
 const schemaMultipartHandler = (req, res, next) => {
 	if (req.is("application/json")) {
-		if (Object.keys(req.body).length === 0) {
-			throw new InvalidPayloadError({ reason: `No data was included in the body` });
-		}
+		if (Object.keys(req.body).length === 0) throw new InvalidPayloadError({ reason: `No data was included in the body` });
 		res.locals["upload"] = req.body;
 		return next();
 	}
-	if (!req.is("multipart/form-data")) {
-		throw new UnsupportedMediaTypeError({
-			mediaType: req.headers["content-type"],
-			where: "Content-Type header"
-		});
-	}
-	const headers = req.headers["content-type"] ? req.headers : {
+	if (!req.is("multipart/form-data")) throw new UnsupportedMediaTypeError({
+		mediaType: req.headers["content-type"],
+		where: "Content-Type header"
+	});
+	const busboy = Busboy({ headers: req.headers["content-type"] ? req.headers : {
 		...req.headers,
 		"content-type": "application/octet-stream"
-	};
-	const busboy = Busboy({ headers });
+	} });
 	let isFileIncluded = false;
 	let upload = null;
 	busboy.on("file", async (_, fileStream, { mimeType }) => {
@@ -45,24 +39,19 @@ const schemaMultipartHandler = (req, res, next) => {
 		const { readableStreamToString } = await import("@directus/utils/node");
 		try {
 			const uploadedString = await readableStreamToString(fileStream);
-			if (mimeType === "application/json") {
-				try {
-					upload = parseJSON(uploadedString);
-				} catch (err) {
-					logger.warn(err);
-					throw new InvalidPayloadError({ reason: "The provided JSON is invalid" });
-				}
-			} else {
-				try {
-					upload = await load(uploadedString);
-				} catch (err) {
-					logger.warn(err);
-					throw new InvalidPayloadError({ reason: "The provided YAML is invalid" });
-				}
+			if (mimeType === "application/json") try {
+				upload = parseJSON(uploadedString);
+			} catch (err) {
+				logger.warn(err);
+				throw new InvalidPayloadError({ reason: "The provided JSON is invalid" });
 			}
-			if (!upload) {
-				throw new InvalidPayloadError({ reason: `No file was included in the body` });
+			else try {
+				upload = await load(uploadedString);
+			} catch (err) {
+				logger.warn(err);
+				throw new InvalidPayloadError({ reason: "The provided YAML is invalid" });
 			}
+			if (!upload) throw new InvalidPayloadError({ reason: `No file was included in the body` });
 			res.locals["upload"] = upload;
 			return next();
 		} catch (error) {
@@ -94,7 +83,7 @@ router.post("/diff", async_handler_default(schemaMultipartHandler), async_handle
 router.post("/apply", async_handler_default(schemaMultipartHandler), async_handler_default(async (req, res, next) => {
 	const service = new SchemaService({ accountability: req.accountability });
 	const diff = res.locals["upload"];
-	await service.apply(diff);
+	await service.apply(diff, { force: toBoolean(req.query["force"]) });
 	return next();
 }), respond);
 var schema_default = router;

package/dist/controllers/server.js

@@ -13,50 +13,44 @@ import { format } from "date-fns";
 //#region src/controllers/server.ts
 const router = Router();
 const env = useEnv();
-if (env["OPENAPI_ENABLED"] !== false) {
-	router.get("/specs/oas", async_handler_default(async (req, res, next) => {
-		const service = new SpecificationService({
-			accountability: req.accountability,
-			schema: req.schema
-		});
-		res.locals["payload"] = await service.oas.generate(req.headers.host);
-		return next();
-	}), respond);
-}
-if (env["GRAPHQL_INTROSPECTION"] !== false) {
-	router.get("/specs/graphql/:scope?", async_handler_default(async (req, res) => {
-		const service = new SpecificationService({
-			accountability: req.accountability,
-			schema: req.schema
-		});
-		const serverService = new ServerService({
-			accountability: req.accountability,
-			schema: req.schema
-		});
-		const scope = req.params["scope"] || "items";
-		if (["items", "system"].includes(scope) === false) throw new RouteNotFoundError({ path: req.path });
-		const info = await serverService.serverInfo();
-		const result = await service.graphql.generate(scope);
-		const filename = info["project"].project_name + "_" + format(new Date(), "yyyy-MM-dd") + ".graphql";
-		res.attachment(filename);
-		res.send(result);
-	}));
-}
-router.get("/info", async_handler_default(async (req, res, next) => {
-	const service = new ServerService({
+if (env["OPENAPI_ENABLED"] !== false) router.get("/specs/oas", async_handler_default(async (req, res, next) => {
+	const service = new SpecificationService({
+		accountability: req.accountability,
+		schema: req.schema
+	});
+	res.locals["payload"] = await service.oas.generate(req.headers.host);
+	return next();
+}), respond);
+if (env["GRAPHQL_INTROSPECTION"] !== false) router.get("/specs/graphql/:scope?", async_handler_default(async (req, res) => {
+	const service = new SpecificationService({
 		accountability: req.accountability,
 		schema: req.schema
 	});
-	const data = await service.serverInfo();
+	const serverService = new ServerService({
+		accountability: req.accountability,
+		schema: req.schema
+	});
+	const scope = req.params["scope"] || "items";
+	if (["items", "system"].includes(scope) === false) throw new RouteNotFoundError({ path: req.path });
+	const info = await serverService.serverInfo();
+	const result = await service.graphql.generate(scope);
+	const filename = info["project"].project_name + "_" + format(/* @__PURE__ */ new Date(), "yyyy-MM-dd") + ".graphql";
+	res.attachment(filename);
+	res.send(result);
+}));
+router.get("/info", async_handler_default(async (req, res, next) => {
+	const data = await new ServerService({
+		accountability: req.accountability,
+		schema: req.schema
+	}).serverInfo();
 	res.locals["payload"] = { data };
 	return next();
 }), respond);
 router.get("/health", async_handler_default(async (req, res, next) => {
-	const service = new ServerService({
+	const data = await new ServerService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	const data = await service.health();
+	}).health();
 	res.setHeader("Content-Type", "application/health+json");
 	if (data["status"] === "error") res.status(503);
 	res.locals["payload"] = data;
@@ -64,10 +58,7 @@ router.get("/health", async_handler_default(async (req, res, next) => {
 	return next();
 }), respond);
 router.post("/setup", async_handler_default(async (req, _res, next) => {
-	const serverService = new ServerService({ schema: req.schema });
-	if (await serverService.isSetupCompleted()) {
-		throw new ForbiddenError();
-	}
+	if (await new ServerService({ schema: req.schema }).isSetupCompleted()) throw new ForbiddenError();
 	try {
 		await createAdmin(req.schema, {
 			email: req.body.project_owner,
@@ -75,12 +66,9 @@ router.post("/setup", async_handler_default(async (req, _res, next) => {
 			first_name: req.body.first_name,
 			last_name: req.body.last_name
 		});
-		const settingsService = new SettingsService({ schema: req.schema });
-		settingsService.setOwner(req.body);
+		new SettingsService({ schema: req.schema }).setOwner(req.body);
 	} catch (error) {
-		if (isDirectusError(error, ErrorCode.Forbidden)) {
-			return next();
-		}
+		if (isDirectusError(error, ErrorCode.Forbidden)) return next();
 		throw error;
 	}
 	return next();

package/dist/controllers/settings.js

@@ -9,20 +9,18 @@ import express from "express";
 const router = express.Router();
 router.use(use_collection_default("directus_settings"));
 router.get("/", async_handler_default(async (req, res, next) => {
-	const service = new SettingsService({
+	const records = await new SettingsService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	const records = await service.readSingleton(req.sanitizedQuery);
+	}).readSingleton(req.sanitizedQuery);
 	res.locals["payload"] = { data: records || null };
 	return next();
 }), respond);
 router.post("/owner", async_handler_default(async (req, _res, next) => {
-	const service = new SettingsService({
+	await new SettingsService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	await service.setOwner(req.body);
+	}).setOwner(req.body);
 	return next();
 }), respond);
 router.patch("/", async_handler_default(async (req, res, next) => {
@@ -35,9 +33,7 @@ router.patch("/", async_handler_default(async (req, res, next) => {
 		const record = await service.readSingleton(req.sanitizedQuery);
 		res.locals["payload"] = { data: record || null };
 	} catch (error) {
-		if (isDirectusError(error, ErrorCode.Forbidden)) {
-			return next();
-		}
+		if (isDirectusError(error, ErrorCode.Forbidden)) return next();
 		throw error;
 	}
 	return next();