@directus/api 35.0.2 → 35.1.0

package/dist/controllers/assets.js

@@ -25,11 +25,10 @@ const env = useEnv();
 router.use(use_collection_default("directus_files"));
 router.post("/folder/:pk", async_handler_default(async (req, res) => {
 	const logger = useLogger();
-	const service = new AssetsService({
+	const { archive, complete, metadata } = await new AssetsService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	const { archive, complete, metadata } = await service.zipFolder(req.params["pk"]);
+	}).zipFolder(req.params["pk"]);
 	res.setHeader("Content-Type", "application/zip");
 	const folderName = `folder-${metadata["name"] ? metadata["name"] : "unknown"}-${getDateTimeFormatted()}.zip`;
 	res.setHeader("Content-Disposition", contentDisposition(folderName, { type: "attachment" }));
@@ -53,9 +52,7 @@ router.post("/folder/:pk", async_handler_default(async (req, res) => {
 				message: "An unexpected error occurred.",
 				extensions: { code: "INTERNAL_SERVER_ERROR" }
 			}] });
-		} else {
-			res.end();
-		}
+		} else res.end();
 	}
 }));
 router.post("/files/", async_handler_default(async (req, res) => {
@@ -65,9 +62,7 @@ router.post("/files/", async_handler_default(async (req, res) => {
 		schema: req.schema
 	});
 	const { error, data } = z$2.object({ ids: z$2.array(z$2.string().refine((v) => isValidUuid(v), { error: "\"id\" must be a uuid" })).min(1) }).safeParse(req.body);
-	if (error) {
-		throw new InvalidPayloadError({ reason: fromZodError(error).message });
-	}
+	if (error) throw new InvalidPayloadError({ reason: fromZodError(error).message });
 	const { archive, complete } = await service.zipFiles(data.ids);
 	res.setHeader("Content-Type", "application/zip");
 	res.setHeader("Content-Disposition", `attachment; filename="files-${getDateTimeFormatted()}.zip"`);
@@ -91,9 +86,7 @@ router.post("/files/", async_handler_default(async (req, res) => {
 				message: "An unexpected error occurred.",
 				extensions: { code: "INTERNAL_SERVER_ERROR" }
 			}] });
-		} else {
-			res.end();
-		}
+		} else res.end();
 	}
 }));
 router.get("/:pk/:filename?", async_handler_default(async (req, res, next) => {
@@ -102,11 +95,8 @@ router.get("/:pk/:filename?", async_handler_default(async (req, res, next) => {
 		storage_asset_presets: [],
 		storage_asset_transform: "all"
 	};
-	const database = database_default();
-	const savedAssetSettings = await database.select("storage_asset_presets", "storage_asset_transform").from("directus_settings").first();
-	if (savedAssetSettings) {
-		await payloadService.processValues("read", savedAssetSettings);
-	}
+	const savedAssetSettings = await database_default().select("storage_asset_presets", "storage_asset_transform").from("directus_settings").first();
+	if (savedAssetSettings) await payloadService.processValues("read", savedAssetSettings);
 	const assetSettings = savedAssetSettings || defaults;
 	const transformation = pick(req.query, ASSET_TRANSFORM_QUERY_KEYS);
 	if ("transforms" in transformation) {
@@ -116,17 +106,11 @@ router.get("/:pk/:filename?", async_handler_default(async (req, res, next) => {
 		} catch {
 			throw new InvalidQueryError({ reason: `"transforms" Parameter needs to be a JSON array of allowed transformations` });
 		}
-		if (!Array.isArray(transforms)) {
-			throw new InvalidQueryError({ reason: `"transforms" Parameter needs to be a JSON array of allowed transformations` });
-		}
-		if (transforms.length > Number(env["ASSETS_TRANSFORM_MAX_OPERATIONS"])) {
-			throw new InvalidQueryError({ reason: `"transforms" Parameter is only allowed ${env["ASSETS_TRANSFORM_MAX_OPERATIONS"]} transformations` });
-		}
+		if (!Array.isArray(transforms)) throw new InvalidQueryError({ reason: `"transforms" Parameter needs to be a JSON array of allowed transformations` });
+		if (transforms.length > Number(env["ASSETS_TRANSFORM_MAX_OPERATIONS"])) throw new InvalidQueryError({ reason: `"transforms" Parameter is only allowed ${env["ASSETS_TRANSFORM_MAX_OPERATIONS"]} transformations` });
 		transforms.forEach((transform$1) => {
 			const name = transform$1[0];
-			if (!TransformationMethods.includes(name)) {
-				throw new InvalidQueryError({ reason: `"transforms" Parameter does not allow "${name}" as a transformation` });
-			}
+			if (!TransformationMethods.includes(name)) throw new InvalidQueryError({ reason: `"transforms" Parameter does not allow "${name}" as a transformation` });
 		});
 		transformation["transforms"] = transforms;
 	}
@@ -134,28 +118,19 @@ router.get("/:pk/:filename?", async_handler_default(async (req, res, next) => {
 	const allKeys = [...systemKeys, ...(assetSettings.storage_asset_presets || []).map((transformation$1) => transformation$1["key"])];
 	res.locals["shortcuts"] = [...SYSTEM_ASSET_ALLOW_LIST, ...assetSettings.storage_asset_presets || []];
 	res.locals["transformation"] = transformation;
-	if (Object.keys(transformation).length === 0 || "transforms" in transformation && transformation["transforms"].length === 0) {
-		return next();
-	}
+	if (Object.keys(transformation).length === 0 || "transforms" in transformation && transformation["transforms"].length === 0) return next();
 	if (assetSettings.storage_asset_transform === "all") {
-		if (transformation["key"] && allKeys.includes(transformation["key"]) === false) {
-			throw new InvalidQueryError({ reason: `Key "${transformation["key"]}" isn't configured` });
-		}
+		if (transformation["key"] && allKeys.includes(transformation["key"]) === false) throw new InvalidQueryError({ reason: `Key "${transformation["key"]}" isn't configured` });
 		return next();
 	} else if (assetSettings.storage_asset_transform === "presets") {
-		if (allKeys.includes(transformation["key"]) && Object.keys(transformation).length === 1) {
-			return next();
-		}
+		if (allKeys.includes(transformation["key"]) && Object.keys(transformation).length === 1) return next();
 		throw new InvalidQueryError({ reason: `Only configured presets can be used in asset generation` });
 	} else {
-		if (transformation["key"] && systemKeys.includes(transformation["key"]) && Object.keys(transformation).length === 1) {
-			return next();
-		}
+		if (transformation["key"] && systemKeys.includes(transformation["key"]) && Object.keys(transformation).length === 1) return next();
 		throw new InvalidQueryError({ reason: `Dynamic asset generation has been disabled for this project` });
 	}
 }), async_handler_default(async (req, res, next) => {
-	const helmet = await import("helmet");
-	return helmet.contentSecurityPolicy(merge({
+	return (await import("helmet")).contentSecurityPolicy(merge({
 		useDefaults: false,
 		directives: { defaultSrc: [`'none'`] }
 	}, getConfigFromEnv("ASSETS_CONTENT_SECURITY_POLICY")))(req, res, next);
@@ -173,20 +148,17 @@ router.get("/:pk/:filename?", async_handler_default(async (req, res, next) => {
 	};
 	let acceptFormat;
 	if (transformationParams.format === "auto") {
-		if (req.headers.accept?.includes("image/avif")) {
-			acceptFormat = "avif";
-		} else if (req.headers.accept?.includes("image/webp")) {
-			acceptFormat = "webp";
-		}
+		if (req.headers.accept?.includes("image/avif")) acceptFormat = "avif";
+		else if (req.headers.accept?.includes("image/webp")) acceptFormat = "webp";
 		vary.push("Accept");
 	}
-	let range = undefined;
+	let range = void 0;
 	if (req.headers.range && Object.keys(transformationParams).length === 0) {
 		const rangeParts = /bytes=([0-9]*)-([0-9]*)/.exec(req.headers.range);
 		if (rangeParts && rangeParts.length > 1) {
 			range = {
-				start: undefined,
-				end: undefined
+				start: void 0,
+				end: void 0
 			};
 			if (rangeParts[1]) {
 				range.start = Number(rangeParts[1]);
@@ -217,12 +189,8 @@ router.get("/:pk/:filename?", async_handler_default(async (req, res, next) => {
 		res.setHeader("Content-Range", `bytes ${range.start}-${range.end || stat.size - 1}/${stat.size}`);
 		res.status(206);
 		res.setHeader("Content-Length", (range.end ? range.end + 1 : stat.size) - (range.start || 0));
-	} else {
-		res.setHeader("Content-Length", stat.size);
-	}
-	if ("download" in req.query === false) {
-		res.setHeader("Content-Disposition", contentDisposition(filename, { type: "inline" }));
-	}
+	} else res.setHeader("Content-Length", stat.size);
+	if ("download" in req.query === false) res.setHeader("Content-Disposition", contentDisposition(filename, { type: "inline" }));
 	if (req.method.toLowerCase() === "head") {
 		res.status(200);
 		res.setHeader("Accept-Ranges", "bytes");
@@ -231,9 +199,7 @@ router.get("/:pk/:filename?", async_handler_default(async (req, res, next) => {
 	}
 	const sourceStream = await stream();
 	res.on("close", () => {
-		if (!res.writableEnded) {
-			sourceStream.destroy();
-		}
+		if (!res.writableEnded) sourceStream.destroy();
 	});
 	sourceStream.on("error", (error) => {
 		logger.error(error, `Couldn't stream file ${file.id} to the client`);
@@ -246,11 +212,8 @@ router.get("/:pk/:filename?", async_handler_default(async (req, res, next) => {
 				message: "An unexpected error occurred.",
 				extensions: { code: "INTERNAL_SERVER_ERROR" }
 			}] });
-		} else {
-			res.end();
-		}
+		} else res.end();
 	}).pipe(res);
-	return undefined;
 }));
 var assets_default = router;
 

package/dist/controllers/auth.js

@@ -50,33 +50,19 @@ for (const authProvider of authProviders) {
 	}
 	router.use(`/login/${authProvider.name}`, authRouter);
 }
-if (!env["AUTH_DISABLE_DEFAULT"]) {
-	router.use("/login", createLocalAuthRouter(DEFAULT_AUTH_PROVIDER));
-}
+if (!env["AUTH_DISABLE_DEFAULT"]) router.use("/login", createLocalAuthRouter(DEFAULT_AUTH_PROVIDER));
 function getCurrentMode(req) {
-	if (req.body.mode) {
-		return req.body.mode;
-	}
-	if (req.body.refresh_token) {
-		return "json";
-	}
+	if (req.body.mode) return req.body.mode;
+	if (req.body.refresh_token) return "json";
 	return "cookie";
 }
 function getCurrentRefreshToken(req, mode) {
-	if (mode === "json") {
-		return req.body.refresh_token;
-	}
-	if (mode === "cookie") {
-		return req.cookies[env["REFRESH_TOKEN_COOKIE_NAME"]];
-	}
+	if (mode === "json") return req.body.refresh_token;
+	if (mode === "cookie") return req.cookies[env["REFRESH_TOKEN_COOKIE_NAME"]];
 	if (mode === "session") {
 		const token = req.cookies[env["SESSION_COOKIE_NAME"]];
-		if (isDirectusJWT(token)) {
-			const payload = verifyAccessJWT(token, getSecret());
-			return payload.session;
-		}
+		if (isDirectusJWT(token)) return verifyAccessJWT(token, getSecret()).session;
 	}
-	return undefined;
 }
 router.post("/refresh", async_handler_default(async (req, res, next) => {
 	const accountability = createDefaultAccountability({ ip: getIPFromReq(req) });
@@ -90,9 +76,7 @@ router.post("/refresh", async_handler_default(async (req, res, next) => {
 	});
 	const mode = getCurrentMode(req);
 	const currentRefreshToken = getCurrentRefreshToken(req, mode);
-	if (!currentRefreshToken) {
-		throw new InvalidPayloadError({ reason: `The refresh token is required in either the payload or cookie` });
-	}
+	if (!currentRefreshToken) throw new InvalidPayloadError({ reason: `The refresh token is required in either the payload or cookie` });
 	const { accessToken, refreshToken, expires } = await authenticationService.refresh(currentRefreshToken, { session: mode === "session" });
 	const payload = { expires };
 	if (mode === "json") {
@@ -103,9 +87,7 @@ router.post("/refresh", async_handler_default(async (req, res, next) => {
 		res.cookie(env["REFRESH_TOKEN_COOKIE_NAME"], refreshToken, REFRESH_COOKIE_OPTIONS);
 		payload.access_token = accessToken;
 	}
-	if (mode === "session") {
-		res.cookie(env["SESSION_COOKIE_NAME"], accessToken, SESSION_COOKIE_OPTIONS);
-	}
+	if (mode === "session") res.cookie(env["SESSION_COOKIE_NAME"], accessToken, SESSION_COOKIE_OPTIONS);
 	res.locals["payload"] = { data: payload };
 	return next();
 }), respond);
@@ -119,24 +101,15 @@ router.post("/logout", async_handler_default(async (req, res, next) => {
 		accountability,
 		schema: req.schema
 	});
-	const mode = getCurrentMode(req);
-	const currentRefreshToken = getCurrentRefreshToken(req, mode);
-	if (!currentRefreshToken) {
-		throw new InvalidPayloadError({ reason: `The refresh token is required in either the payload or cookie` });
-	}
+	const currentRefreshToken = getCurrentRefreshToken(req, getCurrentMode(req));
+	if (!currentRefreshToken) throw new InvalidPayloadError({ reason: `The refresh token is required in either the payload or cookie` });
 	await authenticationService.logout(currentRefreshToken);
-	if (req.cookies[env["REFRESH_TOKEN_COOKIE_NAME"]]) {
-		res.clearCookie(env["REFRESH_TOKEN_COOKIE_NAME"], REFRESH_COOKIE_OPTIONS);
-	}
-	if (req.cookies[env["SESSION_COOKIE_NAME"]]) {
-		res.clearCookie(env["SESSION_COOKIE_NAME"], SESSION_COOKIE_OPTIONS);
-	}
+	if (req.cookies[env["REFRESH_TOKEN_COOKIE_NAME"]]) res.clearCookie(env["REFRESH_TOKEN_COOKIE_NAME"], REFRESH_COOKIE_OPTIONS);
+	if (req.cookies[env["SESSION_COOKIE_NAME"]]) res.clearCookie(env["SESSION_COOKIE_NAME"], SESSION_COOKIE_OPTIONS);
 	return next();
 }), respond);
 router.post("/password/request", async_handler_default(async (req, _res, next) => {
-	if (typeof req.body.email !== "string") {
-		throw new InvalidPayloadError({ reason: `"email" field is required` });
-	}
+	if (typeof req.body.email !== "string") throw new InvalidPayloadError({ reason: `"email" field is required` });
 	const accountability = createDefaultAccountability({ ip: getIPFromReq(req) });
 	const userAgent = req.get("user-agent")?.substring(0, 1024);
 	if (userAgent) accountability.userAgent = userAgent;
@@ -150,31 +123,25 @@ router.post("/password/request", async_handler_default(async (req, _res, next) =
 		await service.requestPasswordReset(req.body.email, req.body.reset_url || null);
 		return next();
 	} catch (err) {
-		if (isDirectusError(err, ErrorCode.InvalidPayload)) {
-			throw err;
-		} else {
+		if (isDirectusError(err, ErrorCode.InvalidPayload)) throw err;
+		else {
 			logger.warn(err, `[email] ${err}`);
 			return next();
 		}
 	}
 }), respond);
 router.post("/password/reset", async_handler_default(async (req, _res, next) => {
-	if (typeof req.body.token !== "string") {
-		throw new InvalidPayloadError({ reason: `"token" field is required` });
-	}
-	if (typeof req.body.password !== "string") {
-		throw new InvalidPayloadError({ reason: `"password" field is required` });
-	}
+	if (typeof req.body.token !== "string") throw new InvalidPayloadError({ reason: `"token" field is required` });
+	if (typeof req.body.password !== "string") throw new InvalidPayloadError({ reason: `"password" field is required` });
 	const accountability = createDefaultAccountability({ ip: getIPFromReq(req) });
 	const userAgent = req.get("user-agent")?.substring(0, 1024);
 	if (userAgent) accountability.userAgent = userAgent;
 	const origin = req.get("origin");
 	if (origin) accountability.origin = origin;
-	const service = new UsersService({
+	await new UsersService({
 		accountability,
 		schema: req.schema
-	});
-	await service.resetPassword(req.body.token, req.body.password);
+	}).resetPassword(req.body.token, req.body.password);
 	return next();
 }), respond);
 router.get("/", async_handler_default(async (req, res, next) => {

package/dist/controllers/collections.js

@@ -35,11 +35,8 @@ const readHandler = async_handler_default(async (req, res, next) => {
 		schema: req.schema
 	});
 	let result = [];
-	if (req.body.keys) {
-		result = await collectionsService.readMany(req.body.keys);
-	} else {
-		result = await collectionsService.readByQuery();
-	}
+	if (req.body.keys) result = await collectionsService.readMany(req.body.keys);
+	else result = await collectionsService.readByQuery();
 	const meta = await metaService.getMetaForQuery("directus_collections", {});
 	res.locals["payload"] = {
 		data: result,
@@ -50,11 +47,10 @@ const readHandler = async_handler_default(async (req, res, next) => {
 router.get("/", validateBatch("read"), readHandler, respond);
 router.search("/", validateBatch("read"), readHandler, respond);
 router.get("/:collection", async_handler_default(async (req, res, next) => {
-	const collectionsService = new CollectionsService({
+	const collection = await new CollectionsService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	const collection = await collectionsService.readOne(req.params["collection"]);
+	}).readOne(req.params["collection"]);
 	res.locals["payload"] = { data: collection || null };
 	return next();
 }), respond);
@@ -68,9 +64,7 @@ router.patch("/", async_handler_default(async (req, res, next) => {
 		const collections = await collectionsService.readMany(collectionKeys);
 		res.locals["payload"] = { data: collections || null };
 	} catch (error) {
-		if (isDirectusError(error, ErrorCode.Forbidden)) {
-			return next();
-		}
+		if (isDirectusError(error, ErrorCode.Forbidden)) return next();
 		throw error;
 	}
 	return next();
@@ -85,19 +79,16 @@ router.patch("/:collection", async_handler_default(async (req, res, next) => {
 		const collection = await collectionsService.readOne(req.params["collection"]);
 		res.locals["payload"] = { data: collection || null };
 	} catch (error) {
-		if (isDirectusError(error, ErrorCode.Forbidden)) {
-			return next();
-		}
+		if (isDirectusError(error, ErrorCode.Forbidden)) return next();
 		throw error;
 	}
 	return next();
 }), respond);
 router.delete("/:collection", async_handler_default(async (req, _res, next) => {
-	const collectionsService = new CollectionsService({
+	await new CollectionsService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	await collectionsService.deleteOne(req.params["collection"]);
+	}).deleteOne(req.params["collection"]);
 	return next();
 }), respond);
 var collections_default = router;

package/dist/controllers/comments.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,11 +48,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_comments", req.sanitizedQuery);
 	res.locals["payload"] = {
 		data: result,
@@ -65,11 +60,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 CommentsService({
+	const record = await new CommentsService({
 		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);
@@ -79,11 +73,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);
 	}
@@ -91,9 +83,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();
@@ -108,9 +98,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();
@@ -120,22 +108,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 CommentsService({
+	await new CommentsService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	await service.deleteOne(req.params["pk"]);
+	}).deleteOne(req.params["pk"]);
 	return next();
 }), respond);
 var comments_default = router;

package/dist/controllers/dashboards.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();
@@ -60,11 +58,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 DashboardsService({
+	const record = await new DashboardsService({
 		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);
@@ -74,11 +71,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);
 	}
@@ -86,9 +81,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();
@@ -103,9 +96,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();
@@ -115,22 +106,19 @@ router.delete("/", async_handler_default(async (req, _res, next) => {
 		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 DashboardsService({
+	await new DashboardsService({
 		accountability: req.accountability,
 		schema: req.schema
-	});
-	await service.deleteOne(req.params["pk"]);
+	}).deleteOne(req.params["pk"]);
 	return next();
 }), respond);
 var dashboards_default = router;

package/dist/controllers/deployment-webhooks.js

@@ -15,9 +15,7 @@ const router = express.Router();
 router.post("/:provider", async_handler_default(async (req, res) => {
 	const logger = useLogger();
 	const provider = req.params["provider"];
-	if (!DEPLOYMENT_PROVIDER_TYPES.includes(provider)) {
-		return res.sendStatus(404);
-	}
+	if (!DEPLOYMENT_PROVIDER_TYPES.includes(provider)) return res.sendStatus(404);
 	const rawBody = req.rawBody;
 	if (!rawBody) {
 		logger.debug(`[webhook:${provider}] No raw body`);
@@ -44,9 +42,7 @@ router.post("/:provider", async_handler_default(async (req, res) => {
 	const driver = getDeploymentDriver(provider, webhookConfig.credentials, webhookConfig.options);
 	const headers = { ...req.headers };
 	const queryToken = req.query["token"];
-	if (typeof queryToken === "string") {
-		headers["x-webhook-token"] = queryToken;
-	}
+	if (typeof queryToken === "string") headers["x-webhook-token"] = queryToken;
 	const event = driver.verifyAndParseWebhook(rawBody, headers, webhookConfig.webhook_secret);
 	if (!event) {
 		logger.warn(`[webhook:${provider}] Verification failed or unknown event`);
@@ -58,22 +54,20 @@ router.post("/:provider", async_handler_default(async (req, res) => {
 		}
 		return res.sendStatus(401);
 	}
-	const projectsService = new DeploymentProjectsService({
+	const project = await new DeploymentProjectsService({
 		schema,
 		knex,
 		accountability: null
-	});
-	const project = await projectsService.readByExternalId(event.project_external_id);
+	}).readByExternalId(event.project_external_id);
 	if (!project) {
 		logger.info(`[webhook:${provider}] Project ${event.project_external_id} not tracked`);
 		return res.sendStatus(410);
 	}
-	const runsService = new DeploymentRunsService({
+	const runId = await new DeploymentRunsService({
 		schema,
 		knex,
 		accountability: null
-	});
-	const runId = await runsService.processWebhookEvent(project.id, event);
+	}).processWebhookEvent(project.id, event);
 	const eventPayload = {
 		provider,
 		project_id: project.id,