@directus/api 35.0.2 → 35.1.0

package/dist/logger/index.js

@@ -12,28 +12,22 @@ import { build } from "pino-pretty";
 
 //#region src/logger/index.ts
 const _cache = {
-	logger: undefined,
-	logsStream: undefined,
-	httpLogsStream: undefined
+	logger: void 0,
+	logsStream: void 0,
+	httpLogsStream: void 0
 };
 const useLogger = () => {
-	if (_cache.logger) {
-		return _cache.logger;
-	}
+	if (_cache.logger) return _cache.logger;
 	_cache.logger = createLogger();
 	return _cache.logger;
 };
 const getLogsStream = (pretty) => {
-	if (_cache.logsStream) {
-		return _cache.logsStream;
-	}
+	if (_cache.logsStream) return _cache.logsStream;
 	_cache.logsStream = new LogsStream(pretty ? "basic" : false);
 	return _cache.logsStream;
 };
 const getHttpLogsStream = (pretty) => {
-	if (_cache.httpLogsStream) {
-		return _cache.httpLogsStream;
-	}
+	if (_cache.httpLogsStream) return _cache.httpLogsStream;
 	_cache.httpLogsStream = new LogsStream(pretty ? "http" : false);
 	return _cache.httpLogsStream;
 };
@@ -66,25 +60,20 @@ const createLogger = () => {
 	}
 	const mergedOptions = merge(pinoOptions, loggerEnvConfig);
 	const streams = [];
-	if (env["LOG_STYLE"] !== "raw") {
-		streams.push({
-			level: mergedOptions.level,
-			stream: build({
-				ignore: "hostname,pid",
-				sync: true
-			})
-		});
-	} else {
-		streams.push({
-			level: mergedOptions.level,
-			stream: process.stdout
-		});
-	}
+	if (env["LOG_STYLE"] !== "raw") streams.push({
+		level: mergedOptions.level,
+		stream: build({
+			ignore: "hostname,pid",
+			sync: true
+		})
+	});
+	else streams.push({
+		level: mergedOptions.level,
+		stream: process.stdout
+	});
 	if (toBoolean(env["WEBSOCKETS_LOGS_ENABLED"])) {
 		const wsLevel = env["WEBSOCKETS_LOGS_LEVEL"] || "info";
-		if (getLoggerLevelValue(wsLevel) < getLoggerLevelValue(mergedOptions.level)) {
-			mergedOptions.level = wsLevel;
-		}
+		if (getLoggerLevelValue(wsLevel) < getLoggerLevelValue(mergedOptions.level)) mergedOptions.level = wsLevel;
 		streams.push({
 			level: wsLevel,
 			stream: getLogsStream(env["WEBSOCKETS_LOGS_STYLE"] !== "raw")
@@ -103,26 +92,21 @@ const createExpressLogger = () => {
 			censor: REDACTED_TEXT
 		}
 	};
-	if (env["LOG_STYLE"] === "raw" || toBoolean(env["WEBSOCKETS_LOGS_ENABLED"])) {
-		httpLoggerOptions.redact = {
-			paths: [
-				"req.headers.authorization",
-				"req.headers.cookie",
-				"res.headers",
-				"req.query.access_token"
-			],
-			censor: (value, pathParts) => {
-				const path = pathParts.join(".");
-				if (path === "res.headers") {
-					if ("set-cookie" in value) {
-						value["set-cookie"] = REDACTED_TEXT;
-					}
-					return value;
-				}
-				return REDACTED_TEXT;
+	if (env["LOG_STYLE"] === "raw" || toBoolean(env["WEBSOCKETS_LOGS_ENABLED"])) httpLoggerOptions.redact = {
+		paths: [
+			"req.headers.authorization",
+			"req.headers.cookie",
+			"res.headers",
+			"req.query.access_token"
+		],
+		censor: (value, pathParts) => {
+			if (pathParts.join(".") === "res.headers") {
+				if ("set-cookie" in value) value["set-cookie"] = REDACTED_TEXT;
+				return value;
 			}
-		};
-	}
+			return REDACTED_TEXT;
+		}
+	};
 	if (loggerEnvConfig["levels"]) {
 		const customLogLevels = {};
 		for (const el of toArray(loggerEnvConfig["levels"])) {
@@ -161,17 +145,13 @@ const createExpressLogger = () => {
 			level: mergedHttpOptions.level,
 			stream: pinoHttpPretty(process.stdout)
 		});
-	} else {
-		streams.push({
-			level: mergedHttpOptions.level,
-			stream: process.stdout
-		});
-	}
+	} else streams.push({
+		level: mergedHttpOptions.level,
+		stream: process.stdout
+	});
 	if (toBoolean(env["WEBSOCKETS_LOGS_ENABLED"])) {
 		const wsLevel = env["WEBSOCKETS_LOGS_LEVEL"] || "info";
-		if (getLoggerLevelValue(wsLevel) < getLoggerLevelValue(mergedHttpOptions.level)) {
-			mergedHttpOptions.level = wsLevel;
-		}
+		if (getLoggerLevelValue(wsLevel) < getLoggerLevelValue(mergedHttpOptions.level)) mergedHttpOptions.level = wsLevel;
 		streams.push({
 			level: wsLevel,
 			stream: getHttpLogsStream(env["WEBSOCKETS_LOGS_STYLE"] !== "raw")

package/dist/logger/redact-query.js

@@ -4,9 +4,7 @@ import { REDACTED_TEXT } from "@directus/utils";
 function redactQuery(originalPath) {
 	try {
 		const url = new URL(originalPath, "http://example.com/");
-		if (url.searchParams.has("access_token")) {
-			url.searchParams.set("access_token", REDACTED_TEXT);
-		}
+		if (url.searchParams.has("access_token")) url.searchParams.set("access_token", REDACTED_TEXT);
 		return url.pathname + url.search;
 	} catch {
 		return originalPath;

package/dist/mailer.js

@@ -12,28 +12,24 @@ function getMailer() {
 	const env = useEnv();
 	const logger = useLogger();
 	const transportName = env["EMAIL_TRANSPORT"].toLowerCase();
-	if (transportName === "sendmail") {
-		transporter = nodemailer.createTransport({
-			sendmail: true,
-			newline: env["EMAIL_SENDMAIL_NEW_LINE"] || "unix",
-			path: env["EMAIL_SENDMAIL_PATH"] || "/usr/sbin/sendmail"
-		});
-	} else if (transportName === "ses") {
+	if (transportName === "sendmail") transporter = nodemailer.createTransport({
+		sendmail: true,
+		newline: env["EMAIL_SENDMAIL_NEW_LINE"] || "unix",
+		path: env["EMAIL_SENDMAIL_PATH"] || "/usr/sbin/sendmail"
+	});
+	else if (transportName === "ses") {
 		const { SESv2Client, SendEmailCommand } = require("@aws-sdk/client-sesv2");
-		const sesOptions = getConfigFromEnv("EMAIL_SES_");
-		const sesClient = new SESv2Client(sesOptions);
+		const sesClient = new SESv2Client(getConfigFromEnv("EMAIL_SES_"));
 		transporter = nodemailer.createTransport({ SES: {
 			sesClient,
 			SendEmailCommand
 		} });
 	} else if (transportName === "smtp") {
 		let auth = false;
-		if (env["EMAIL_SMTP_USER"] || env["EMAIL_SMTP_PASSWORD"]) {
-			auth = {
-				user: env["EMAIL_SMTP_USER"],
-				pass: env["EMAIL_SMTP_PASSWORD"]
-			};
-		}
+		if (env["EMAIL_SMTP_USER"] || env["EMAIL_SMTP_PASSWORD"]) auth = {
+			user: env["EMAIL_SMTP_USER"],
+			pass: env["EMAIL_SMTP_PASSWORD"]
+		};
 		const tls = getConfigFromEnv("EMAIL_SMTP_TLS_");
 		transporter = nodemailer.createTransport({
 			name: env["EMAIL_SMTP_NAME"],
@@ -54,9 +50,7 @@ function getMailer() {
 			},
 			host: env["EMAIL_MAILGUN_HOST"] || "api.mailgun.net"
 		}));
-	} else {
-		logger.warn("Illegal transport given for email. Check the EMAIL_TRANSPORT env var.");
-	}
+	} else logger.warn("Illegal transport given for email. Check the EMAIL_TRANSPORT env var.");
 	return transporter;
 }
 

package/dist/metrics/lib/create-metrics.js

@@ -24,16 +24,14 @@ function createMetrics() {
 	const services = env["METRICS_SERVICES"] ?? [];
 	const metricNamePrefix = env["METRICS_NAME_PREFIX"] ?? "directus_";
 	const metricsHealthCheckPrefix = env["METRICS_HEALTH_CHECK_PREFIX"];
-	const aggregates = new Map();
+	const aggregates = /* @__PURE__ */ new Map();
 	/**
 	* Listen for PM2 metric data sync messages and add them to the aggregate
 	*/
-	if (isPM2) {
-		process.on("message", (packet) => {
-			if (!packet.data || packet.topic !== METRICS_SYNC_PACKET) return;
-			aggregate(packet.data);
-		});
-	}
+	if (isPM2) process.on("message", (packet) => {
+		if (!packet.data || packet.topic !== METRICS_SYNC_PACKET) return;
+		aggregate(packet.data);
+	});
 	async function generate() {
 		const checkId = randomUUID();
 		await Promise.all([
@@ -45,27 +43,23 @@ function createMetrics() {
 		/**
 		* Push generated metrics to all pm2 instances
 		*/
-		if (isPM2) {
-			try {
-				const apps = await listApps();
-				const data = await register.getMetricsAsJSON();
-				const syncs = [];
-				for (const app of apps) {
-					if (app.pm_id === undefined || app.pid === 0 || app.name !== "directus") {
-						continue;
-					}
-					syncs.push(sendDataToProcessId(app.pm_id, {
-						data: {
-							pid: process.pid,
-							metrics: data
-						},
-						topic: METRICS_SYNC_PACKET
-					}));
-				}
-				await Promise.allSettled(syncs);
-			} catch (error) {
-				logger.error(error);
+		if (isPM2) try {
+			const apps = await listApps();
+			const data = await register.getMetricsAsJSON();
+			const syncs = [];
+			for (const app of apps) {
+				if (app.pm_id === void 0 || app.pid === 0 || app.name !== "directus") continue;
+				syncs.push(sendDataToProcessId(app.pm_id, {
+					data: {
+						pid: process.pid,
+						metrics: data
+					},
+					topic: METRICS_SYNC_PACKET
+				}));
 			}
+			await Promise.allSettled(syncs);
+		} catch (error) {
+			logger.error(error);
 		}
 	}
 	/**
@@ -83,122 +77,86 @@ function createMetrics() {
 		if (isPM2 && aggregates.size !== 0) {
 			const apps = await listApps();
 			const aggregate$1 = [];
-			for (const app of apps) {
-				if (aggregates.has(app.pid)) {
-					aggregate$1.push(aggregates.get(app.pid));
-				}
-			}
-			if (aggregate$1.length !== 0) {
-				return AggregatorRegistry.aggregate(aggregate$1).metrics();
-			}
+			for (const app of apps) if (aggregates.has(app.pid)) aggregate$1.push(aggregates.get(app.pid));
+			if (aggregate$1.length !== 0) return AggregatorRegistry.aggregate(aggregate$1).metrics();
 		}
 		return register.metrics();
 	}
 	function getDatabaseErrorMetric() {
-		if (services.includes("database") === false) {
-			return null;
-		}
+		if (services.includes("database") === false) return null;
 		const client = env["DB_CLIENT"];
 		let metric = register.getSingleMetric(`${metricNamePrefix}db_${client}_connection_errors`);
-		if (!metric) {
-			metric = new Counter({
-				name: `${metricNamePrefix}db_${client}_connection_errors`,
-				help: `${client} Database connection error count`
-			});
-		}
+		if (!metric) metric = new Counter({
+			name: `${metricNamePrefix}db_${client}_connection_errors`,
+			help: `${client} Database connection error count`
+		});
 		return metric;
 	}
 	function getDatabaseResponseMetric() {
-		if (services.includes("database") === false) {
-			return null;
-		}
+		if (services.includes("database") === false) return null;
 		const client = env["DB_CLIENT"];
 		let metric = register.getSingleMetric(`${metricNamePrefix}db_${client}_response_time_ms`);
-		if (!metric) {
-			metric = new Histogram({
-				name: `${metricNamePrefix}db_${client}_response_time_ms`,
-				help: `${client} Database connection response time`,
-				buckets: [
-					1,
-					10,
-					20,
-					40,
-					60,
-					80,
-					100,
-					200,
-					500,
-					750,
-					1e3
-				]
-			});
-		}
+		if (!metric) metric = new Histogram({
+			name: `${metricNamePrefix}db_${client}_response_time_ms`,
+			help: `${client} Database connection response time`,
+			buckets: [
+				1,
+				10,
+				20,
+				40,
+				60,
+				80,
+				100,
+				200,
+				500,
+				750,
+				1e3
+			]
+		});
 		return metric;
 	}
 	function getCacheErrorMetric() {
-		if (services.includes("cache") === false || env["CACHE_ENABLED"] !== true) {
-			return null;
-		}
-		if (env["CACHE_STORE"] === "redis" && redisConfigAvailable() !== true) {
-			return null;
-		}
+		if (services.includes("cache") === false || env["CACHE_ENABLED"] !== true) return null;
+		if (env["CACHE_STORE"] === "redis" && redisConfigAvailable() !== true) return null;
 		let metric = register.getSingleMetric(`${metricNamePrefix}cache_${env["CACHE_STORE"]}_connection_errors`);
-		if (!metric) {
-			metric = new Counter({
-				name: `${metricNamePrefix}cache_${env["CACHE_STORE"]}_connection_errors`,
-				help: "Cache connection error count"
-			});
-		}
+		if (!metric) metric = new Counter({
+			name: `${metricNamePrefix}cache_${env["CACHE_STORE"]}_connection_errors`,
+			help: "Cache connection error count"
+		});
 		return metric;
 	}
 	function getRedisErrorMetric() {
-		if (services.includes("redis") === false || redisConfigAvailable() !== true) {
-			return null;
-		}
+		if (services.includes("redis") === false || redisConfigAvailable() !== true) return null;
 		let metric = register.getSingleMetric(`${metricNamePrefix}redis_connection_errors`);
-		if (!metric) {
-			metric = new Counter({
-				name: `${metricNamePrefix}redis_connection_errors`,
-				help: "Redis connection error count"
-			});
-		}
+		if (!metric) metric = new Counter({
+			name: `${metricNamePrefix}redis_connection_errors`,
+			help: "Redis connection error count"
+		});
 		return metric;
 	}
 	function getStorageErrorMetric(location) {
-		if (services.includes("storage") === false) {
-			return null;
-		}
+		if (services.includes("storage") === false) return null;
 		let metric = register.getSingleMetric(`${metricNamePrefix}storage_${location}_connection_errors`);
-		if (!metric) {
-			metric = new Counter({
-				name: `${metricNamePrefix}storage_${location}_connection_errors`,
-				help: `${location} storage connection error count`
-			});
-		}
+		if (!metric) metric = new Counter({
+			name: `${metricNamePrefix}storage_${location}_connection_errors`,
+			help: `${location} storage connection error count`
+		});
 		return metric;
 	}
 	async function trackDatabaseMetric() {
 		const metric = getDatabaseErrorMetric();
-		if (metric === null) {
-			return;
-		}
+		if (metric === null) return;
 		try {
-			if (!await hasDatabaseConnection()) {
-				metric.inc();
-			}
+			if (!await hasDatabaseConnection()) metric.inc();
 		} catch {
 			metric.inc();
 		}
 	}
 	async function trackCacheMetric(checkId) {
 		const metric = getCacheErrorMetric();
-		if (metric === null) {
-			return;
-		}
+		if (metric === null) return;
 		const { cache } = getCache();
-		if (!cache) {
-			return;
-		}
+		if (!cache) return;
 		try {
 			await cache.set(`${metricsHealthCheckPrefix}${checkId}`, "1", 5);
 			await cache.delete(`${metricsHealthCheckPrefix}${checkId}`);
@@ -208,9 +166,7 @@ function createMetrics() {
 	}
 	async function trackRedisMetric(checkId) {
 		const metric = getRedisErrorMetric();
-		if (metric === null) {
-			return;
-		}
+		if (metric === null) return;
 		const redis = useRedis();
 		try {
 			await redis.set(`${metricsHealthCheckPrefix}${checkId}`, "1");
@@ -220,16 +176,12 @@ function createMetrics() {
 		}
 	}
 	async function trackStorageMetric(checkId) {
-		if (services.includes("storage") === false) {
-			return;
-		}
+		if (services.includes("storage") === false) return;
 		const storage = await getStorage();
 		for (const location of toArray(env["STORAGE_LOCATIONS"])) {
 			const disk = storage.location(location);
 			const metric = getStorageErrorMetric(location);
-			if (metric === null) {
-				continue;
-			}
+			if (metric === null) continue;
 			try {
 				await disk.write(`${metricsHealthCheckPrefix}file`, Readable.from([checkId]));
 			} catch {

package/dist/metrics/lib/use-metrics.js

@@ -3,15 +3,10 @@ import { useEnv } from "@directus/env";
 import { toBoolean } from "@directus/utils";
 
 //#region src/metrics/lib/use-metrics.ts
-const _cache = { metrics: undefined };
+const _cache = { metrics: void 0 };
 const useMetrics = () => {
-	const env = useEnv();
-	if (!toBoolean(env["METRICS_ENABLED"])) {
-		return;
-	}
-	if (_cache.metrics) {
-		return _cache.metrics;
-	}
+	if (!toBoolean(useEnv()["METRICS_ENABLED"])) return;
+	if (_cache.metrics) return _cache.metrics;
 	_cache.metrics = createMetrics();
 	return _cache.metrics;
 };

package/dist/middleware/authenticate.js

@@ -34,9 +34,7 @@ const handler = async (req, res, next) => {
 		req.accountability = await getAccountabilityForToken(req.token, defaultAccountability);
 	} catch (err) {
 		if (isDirectusError(err, ErrorCode.InvalidCredentials) || isDirectusError(err, ErrorCode.InvalidToken)) {
-			if (req.cookies[env["SESSION_COOKIE_NAME"]] === req.token) {
-				res.clearCookie(env["SESSION_COOKIE_NAME"], SESSION_COOKIE_OPTIONS);
-			}
+			if (req.cookies[env["SESSION_COOKIE_NAME"]] === req.token) res.clearCookie(env["SESSION_COOKIE_NAME"], SESSION_COOKIE_OPTIONS);
 		}
 		throw err;
 	}

package/dist/middleware/cache.js

@@ -38,17 +38,14 @@ const checkCacheMiddleware = async_handler_default(async (req, res, next) => {
 			if (env["CACHE_STATUS_HEADER"]) res.setHeader(`${env["CACHE_STATUS_HEADER"]}`, "MISS");
 			return next();
 		}
-		const cacheTTL = cacheExpiryDate ? cacheExpiryDate - Date.now() : undefined;
+		const cacheTTL = cacheExpiryDate ? cacheExpiryDate - Date.now() : void 0;
 		res.setHeader("Cache-Control", getCacheControlHeader(req, cacheTTL, true, true));
 		res.setHeader("Vary", "Origin, Cache-Control");
 		if (env["CACHE_STATUS_HEADER"]) res.setHeader(`${env["CACHE_STATUS_HEADER"]}`, "HIT");
-		if (toBoolean(env["TELEMETRY"])) {
-			try {
-				const counter = useBufferedCounter("api-requests");
-				counter.increment("cached");
-			} catch (err) {
-				logger.trace(err, "Failed to increment cached request counter");
-			}
+		if (toBoolean(env["TELEMETRY"])) try {
+			useBufferedCounter("api-requests").increment("cached");
+		} catch (err) {
+			logger.trace(err, "Failed to increment cached request counter");
 		}
 		return res.json(cachedData);
 	} else {

package/dist/middleware/collection-exists.js

@@ -5,18 +5,13 @@ import { systemCollectionRows } from "@directus/system-data";
 //#region src/middleware/collection-exists.ts
 const collectionExists = async_handler_default(async (req, _res, next) => {
 	if (!req.params["collection"]) return next();
-	if (req.params["collection"] in req.schema.collections === false) {
-		throw createCollectionForbiddenError("", req.params["collection"]);
-	}
+	if (req.params["collection"] in req.schema.collections === false) throw createCollectionForbiddenError("", req.params["collection"]);
 	req.collection = req.params["collection"];
 	const systemCollectionRow = systemCollectionRows.find((collection) => {
 		return collection?.collection === req.collection;
 	});
-	if (systemCollectionRow !== undefined) {
-		req.singleton = !!systemCollectionRow?.singleton;
-	} else {
-		req.singleton = req.schema.collections[req.collection]?.singleton ?? false;
-	}
+	if (systemCollectionRow !== void 0) req.singleton = !!systemCollectionRow?.singleton;
+	else req.singleton = req.schema.collections[req.collection]?.singleton ?? false;
 	return next();
 });
 var collection_exists_default = collectionExists;

package/dist/middleware/cors.js

@@ -4,16 +4,14 @@ import cors from "cors";
 //#region src/middleware/cors.ts
 let corsMiddleware = (_req, _res, next) => next();
 const env = useEnv();
-if (env["CORS_ENABLED"] === true) {
-	corsMiddleware = cors({
-		origin: env["CORS_ORIGIN"],
-		methods: env["CORS_METHODS"],
-		allowedHeaders: env["CORS_ALLOWED_HEADERS"],
-		exposedHeaders: env["CORS_EXPOSED_HEADERS"],
-		credentials: env["CORS_CREDENTIALS"],
-		maxAge: env["CORS_MAX_AGE"]
-	});
-}
+if (env["CORS_ENABLED"] === true) corsMiddleware = cors({
+	origin: env["CORS_ORIGIN"],
+	methods: env["CORS_METHODS"],
+	allowedHeaders: env["CORS_ALLOWED_HEADERS"],
+	exposedHeaders: env["CORS_EXPOSED_HEADERS"],
+	credentials: env["CORS_CREDENTIALS"],
+	maxAge: env["CORS_MAX_AGE"]
+});
 var cors_default = corsMiddleware;
 
 //#endregion

package/dist/middleware/error-handler.js

@@ -13,16 +13,11 @@ const errorHandler = asyncErrorHandler(async (err, req, res) => {
 	let status = null;
 	const receivedErrors = Array.isArray(err) ? err : [err];
 	for (const error of receivedErrors) {
-		if (getNodeEnv() === "development" && error instanceof Error && error.stack) {
-			(error.extensions ??= {})["stack"] = error.stack;
-		}
+		if (getNodeEnv() === "development" && error instanceof Error && error.stack) (error.extensions ??= {})["stack"] = error.stack;
 		if (isDirectusError(error)) {
 			logger.debug(error);
-			if (status === null) {
-				status = error.status;
-			} else if (status !== error.status) {
-				status = FALLBACK_ERROR.status;
-			}
+			if (status === null) status = error.status;
+			else if (status !== error.status) status = FALLBACK_ERROR.status;
 			errors.push({
 				message: error.message,
 				extensions: {
@@ -30,28 +25,23 @@ const errorHandler = asyncErrorHandler(async (err, req, res) => {
 					code: error.code
 				}
 			});
-			if (isDirectusError(error, ErrorCode.MethodNotAllowed)) {
-				res.header("Allow", error.extensions.allowed.join(", "));
-			}
+			if (isDirectusError(error, ErrorCode.MethodNotAllowed)) res.header("Allow", error.extensions.allowed.join(", "));
 		} else {
 			logger.error(error);
 			status = FALLBACK_ERROR.status;
 			if (req.accountability?.admin === true) {
 				const localError = isObject(error) ? error : {};
-				const message = (typeof localError["message"] === "string" ? localError["message"] : null) ?? (typeof error === "string" ? error : null);
 				errors = [{
-					message: message || FALLBACK_ERROR.message,
+					message: ((typeof localError["message"] === "string" ? localError["message"] : null) ?? (typeof error === "string" ? error : null)) || FALLBACK_ERROR.message,
 					extensions: {
 						code: FALLBACK_ERROR.code,
 						...localError["extensions"] ?? {}
 					}
 				}];
-			} else {
-				errors = [{
-					message: FALLBACK_ERROR.message,
-					extensions: { code: FALLBACK_ERROR.code }
-				}];
-			}
+			} else errors = [{
+				message: FALLBACK_ERROR.message,
+				extensions: { code: FALLBACK_ERROR.code }
+			}];
 		}
 	}
 	res.status(status ?? FALLBACK_ERROR.status);
@@ -65,8 +55,7 @@ const errorHandler = asyncErrorHandler(async (err, req, res) => {
 function asyncErrorHandler(fn) {
 	return (err, req, res, next) => fn(err, req, res, next).catch((error) => {
 		try {
-			const logger = useLogger();
-			logger.error(error, "Unexpected error in error handler");
+			useLogger().error(error, "Unexpected error in error handler");
 		} catch {}
 		if (res.headersSent) return next(err);
 		res.status(FALLBACK_ERROR.status);

package/dist/middleware/extract-token.js

@@ -14,22 +14,16 @@ import { InvalidPayloadError } from "@directus/errors";
 const extractToken = (req, _res, next) => {
 	const env = useEnv();
 	let token = null;
-	if (req.query && req.query["access_token"]) {
-		token = req.query["access_token"];
-	}
+	if (req.query && req.query["access_token"]) token = req.query["access_token"];
 	if (req.headers && req.headers.authorization) {
 		const parts = req.headers.authorization.split(" ");
 		if (parts.length === 2 && parts[0].toLowerCase() === "bearer") {
-			if (token !== null) {
-				throw new InvalidPayloadError({ reason: "The request uses more than one method for including an access token" });
-			}
+			if (token !== null) throw new InvalidPayloadError({ reason: "The request uses more than one method for including an access token" });
 			token = parts[1];
 		}
 	}
 	if (req.cookies && req.cookies[env["SESSION_COOKIE_NAME"]]) {
-		if (token === null) {
-			token = req.cookies[env["SESSION_COOKIE_NAME"]];
-		}
+		if (token === null) token = req.cookies[env["SESSION_COOKIE_NAME"]];
 	}
 	req.token = token;
 	next();