@directus/api 35.0.2 → 35.1.0

package/dist/services/server.js

@@ -39,7 +39,7 @@ var ServerService = class {
 	async serverInfo() {
 		const info = {};
 		const setupComplete = await this.isSetupCompleted();
-		const projectInfo = await this.settingsService.readSingleton({ fields: [
+		info["project"] = await this.settingsService.readSingleton({ fields: [
 			"project_name",
 			"project_descriptor",
 			"project_logo",
@@ -59,28 +59,21 @@ var ServerService = class {
 			"public_registration",
 			"public_registration_verify_email"
 		] });
-		info["project"] = projectInfo;
 		info["setupCompleted"] = setupComplete;
 		if (this.accountability?.user) {
 			info["mcp_enabled"] = toBoolean(env["MCP_ENABLED"] ?? true);
 			info["ai_enabled"] = toBoolean(env["AI_ENABLED"] ?? true);
 			info["files"] = { mimeTypeAllowList: toArray(env["FILES_MIME_TYPE_ALLOW_LIST"]) };
-			if (env["RATE_LIMITER_ENABLED"]) {
-				info["rateLimit"] = {
-					points: env["RATE_LIMITER_POINTS"],
-					duration: env["RATE_LIMITER_DURATION"]
-				};
-			} else {
-				info["rateLimit"] = false;
-			}
-			if (env["RATE_LIMITER_GLOBAL_ENABLED"]) {
-				info["rateLimitGlobal"] = {
-					points: env["RATE_LIMITER_GLOBAL_POINTS"],
-					duration: env["RATE_LIMITER_GLOBAL_DURATION"]
-				};
-			} else {
-				info["rateLimitGlobal"] = false;
-			}
+			if (env["RATE_LIMITER_ENABLED"]) info["rateLimit"] = {
+				points: env["RATE_LIMITER_POINTS"],
+				duration: env["RATE_LIMITER_DURATION"]
+			};
+			else info["rateLimit"] = false;
+			if (env["RATE_LIMITER_GLOBAL_ENABLED"]) info["rateLimitGlobal"] = {
+				points: env["RATE_LIMITER_GLOBAL_POINTS"],
+				duration: env["RATE_LIMITER_GLOBAL_DURATION"]
+			};
+			else info["rateLimitGlobal"] = false;
 			info["extensions"] = { limit: env["EXTENSIONS_LIMIT"] ?? null };
 			info["queryLimit"] = {
 				default: env["QUERY_LIMIT_DEFAULT"],
@@ -99,19 +92,13 @@ var ServerService = class {
 				info["websocket"].heartbeat = toBoolean(env["WEBSOCKETS_HEARTBEAT_ENABLED"]) ? env["WEBSOCKETS_HEARTBEAT_PERIOD"] : false;
 				info["websocket"].collaborativeEditing = toBoolean(env["WEBSOCKETS_COLLAB_ENABLED"]);
 				info["websocket"].logs = toBoolean(env["WEBSOCKETS_LOGS_ENABLED"]) && this.accountability.admin ? { allowedLogLevels: getAllowedLogLevels(env["WEBSOCKETS_LOGS_LEVEL"] || "info") } : false;
-			} else {
-				info["websocket"] = false;
-			}
-			if (FILE_UPLOADS.MAX_CONCURRENCY && FILE_UPLOADS.MAX_CONCURRENCY !== Infinity) {
-				info["uploads"] = { maxConcurrency: FILE_UPLOADS.MAX_CONCURRENCY };
-			}
-			if (RESUMABLE_UPLOADS.ENABLED) {
-				info["uploads"] = {
-					...info["uploads"],
-					tus: true,
-					chunkSize: RESUMABLE_UPLOADS.CHUNK_SIZE
-				};
-			}
+			} else info["websocket"] = false;
+			if (FILE_UPLOADS.MAX_CONCURRENCY && FILE_UPLOADS.MAX_CONCURRENCY !== Infinity) info["uploads"] = { maxConcurrency: FILE_UPLOADS.MAX_CONCURRENCY };
+			if (RESUMABLE_UPLOADS.ENABLED) info["uploads"] = {
+				...info["uploads"],
+				tus: true,
+				chunkSize: RESUMABLE_UPLOADS.CHUNK_SIZE
+			};
 		}
 		if (this.accountability?.user || !setupComplete) info["version"] = version;
 		return info;
@@ -132,9 +119,7 @@ var ServerService = class {
 				testEmail()
 			]))
 		};
-		if (SERVER_ONLINE === false) {
-			data.status = "error";
-		}
+		if (SERVER_ONLINE === false) data.status = "error";
 		for (const [service, healthData] of Object.entries(data.checks)) {
 			for (const healthCheck of healthData) {
 				if (healthCheck.status === "warn" && data.status === "ok") {
@@ -150,11 +135,8 @@ var ServerService = class {
 			}
 			if (data.status === "error") break;
 		}
-		if (this.accountability?.admin !== true) {
-			return { status: data.status };
-		} else {
-			return data;
-		}
+		if (this.accountability?.admin !== true) return { status: data.status };
+		else return data;
 		async function testDatabase() {
 			const database = database_default();
 			const client = env["DB_CLIENT"];
@@ -167,17 +149,14 @@ var ServerService = class {
 				threshold: env["DB_HEALTHCHECK_THRESHOLD"] ? +env["DB_HEALTHCHECK_THRESHOLD"] : 150
 			}];
 			const startTime = performance.now();
-			if (await hasDatabaseConnection()) {
-				checks[`${client}:responseTime`][0].status = "ok";
-			} else {
+			if (await hasDatabaseConnection()) checks[`${client}:responseTime`][0].status = "ok";
+			else {
 				checks[`${client}:responseTime`][0].status = "error";
 				checks[`${client}:responseTime`][0].output = `Can't connect to the database.`;
 			}
 			const endTime = performance.now();
 			checks[`${client}:responseTime`][0].observedValue = +(endTime - startTime).toFixed(3);
-			if (Number(checks[`${client}:responseTime`][0].observedValue) > checks[`${client}:responseTime`][0].threshold && checks[`${client}:responseTime`][0].status !== "error") {
-				checks[`${client}:responseTime`][0].status = "warn";
-			}
+			if (Number(checks[`${client}:responseTime`][0].observedValue) > checks[`${client}:responseTime`][0].threshold && checks[`${client}:responseTime`][0].status !== "error") checks[`${client}:responseTime`][0].status = "warn";
 			checks[`${client}:connectionsAvailable`] = [{
 				status: "ok",
 				componentType: "datastore",
@@ -191,9 +170,7 @@ var ServerService = class {
 			return checks;
 		}
 		async function testCache() {
-			if (env["CACHE_ENABLED"] !== true) {
-				return {};
-			}
+			if (env["CACHE_ENABLED"] !== true) return {};
 			const { cache } = getCache();
 			const checks = { "cache:responseTime": [{
 				status: "ok",
@@ -212,16 +189,12 @@ var ServerService = class {
 			} finally {
 				const endTime = performance.now();
 				checks["cache:responseTime"][0].observedValue = +(endTime - startTime).toFixed(3);
-				if (checks["cache:responseTime"][0].observedValue > checks["cache:responseTime"][0].threshold && checks["cache:responseTime"][0].status !== "error") {
-					checks["cache:responseTime"][0].status = "warn";
-				}
+				if (checks["cache:responseTime"][0].observedValue > checks["cache:responseTime"][0].threshold && checks["cache:responseTime"][0].status !== "error") checks["cache:responseTime"][0].status = "warn";
 			}
 			return checks;
 		}
 		async function testRateLimiter() {
-			if (env["RATE_LIMITER_ENABLED"] !== true) {
-				return {};
-			}
+			if (env["RATE_LIMITER_ENABLED"] !== true) return {};
 			const checks = { "rateLimiter:responseTime": [{
 				status: "ok",
 				componentType: "ratelimiter",
@@ -239,16 +212,12 @@ var ServerService = class {
 			} finally {
 				const endTime = performance.now();
 				checks["rateLimiter:responseTime"][0].observedValue = +(endTime - startTime).toFixed(3);
-				if (checks["rateLimiter:responseTime"][0].observedValue > checks["rateLimiter:responseTime"][0].threshold && checks["rateLimiter:responseTime"][0].status !== "error") {
-					checks["rateLimiter:responseTime"][0].status = "warn";
-				}
+				if (checks["rateLimiter:responseTime"][0].observedValue > checks["rateLimiter:responseTime"][0].threshold && checks["rateLimiter:responseTime"][0].status !== "error") checks["rateLimiter:responseTime"][0].status = "warn";
 			}
 			return checks;
 		}
 		async function testRateLimiterGlobal() {
-			if (env["RATE_LIMITER_GLOBAL_ENABLED"] !== true) {
-				return {};
-			}
+			if (env["RATE_LIMITER_GLOBAL_ENABLED"] !== true) return {};
 			const checks = { "rateLimiterGlobal:responseTime": [{
 				status: "ok",
 				componentType: "ratelimiter",
@@ -266,9 +235,7 @@ var ServerService = class {
 			} finally {
 				const endTime = performance.now();
 				checks["rateLimiterGlobal:responseTime"][0].observedValue = +(endTime - startTime).toFixed(3);
-				if (checks["rateLimiterGlobal:responseTime"][0].observedValue > checks["rateLimiterGlobal:responseTime"][0].threshold && checks["rateLimiterGlobal:responseTime"][0].status !== "error") {
-					checks["rateLimiterGlobal:responseTime"][0].status = "warn";
-				}
+				if (checks["rateLimiterGlobal:responseTime"][0].observedValue > checks["rateLimiterGlobal:responseTime"][0].threshold && checks["rateLimiterGlobal:responseTime"][0].status !== "error") checks["rateLimiterGlobal:responseTime"][0].status = "warn";
 			}
 			return checks;
 		}
@@ -294,9 +261,7 @@ var ServerService = class {
 				} finally {
 					const endTime = performance.now();
 					checks[`storage:${location}:responseTime`][0].observedValue = +(endTime - startTime).toFixed(3);
-					if (Number(checks[`storage:${location}:responseTime`][0].observedValue) > checks[`storage:${location}:responseTime`][0].threshold && checks[`storage:${location}:responseTime`][0].status !== "error") {
-						checks[`storage:${location}:responseTime`][0].status = "warn";
-					}
+					if (Number(checks[`storage:${location}:responseTime`][0].observedValue) > checks[`storage:${location}:responseTime`][0].threshold && checks[`storage:${location}:responseTime`][0].status !== "error") checks[`storage:${location}:responseTime`][0].status = "warn";
 				}
 			}
 			return checks;

package/dist/services/shares.js

@@ -23,17 +23,15 @@ var SharesService = class extends ItemsService {
 		super("directus_shares", options);
 	}
 	async createOne(data, opts) {
-		if (this.accountability) {
-			await validateAccess({
-				accountability: this.accountability,
-				action: "share",
-				collection: data["collection"],
-				primaryKeys: [data["item"]]
-			}, {
-				schema: this.schema,
-				knex: this.knex
-			});
-		}
+		if (this.accountability) await validateAccess({
+			accountability: this.accountability,
+			action: "share",
+			collection: data["collection"],
+			primaryKeys: [data["item"]]
+		}, {
+			schema: this.schema,
+			knex: this.knex
+		});
 		return super.createOne(data, opts);
 	}
 	async updateMany(keys, data, opts) {
@@ -53,18 +51,14 @@ var SharesService = class extends ItemsService {
 			share_max_uses: "max_uses",
 			share_password: "password"
 		}).from("directus_shares").where("id", payload["share"]).andWhere((subQuery) => {
-			subQuery.whereNull("date_end").orWhere("date_end", ">=", new Date());
+			subQuery.whereNull("date_end").orWhere("date_end", ">=", /* @__PURE__ */ new Date());
 		}).andWhere((subQuery) => {
-			subQuery.whereNull("date_start").orWhere("date_start", "<=", new Date());
+			subQuery.whereNull("date_start").orWhere("date_start", "<=", /* @__PURE__ */ new Date());
 		}).andWhere((subQuery) => {
 			subQuery.whereNull("max_uses").orWhere("max_uses", ">=", this.knex.ref("times_used"));
 		}).first();
-		if (!record) {
-			throw new InvalidCredentialsError();
-		}
-		if (record.share_password && !await argon2.verify(record.share_password, payload["password"])) {
-			throw new InvalidCredentialsError();
-		}
+		if (!record) throw new InvalidCredentialsError();
+		if (record.share_password && !await argon2.verify(record.share_password, payload["password"])) throw new InvalidCredentialsError();
 		await this.knex("directus_shares").update({ times_used: record.share_times_used + 1 }).where("id", record.share_id);
 		const tokenPayload = {
 			app_access: false,
@@ -74,9 +68,7 @@ var SharesService = class extends ItemsService {
 		};
 		const refreshToken = nanoid(64);
 		const refreshTokenExpiration = new Date(Date.now() + getMilliseconds(env["REFRESH_TOKEN_TTL"], 0));
-		if (options?.session) {
-			tokenPayload.session = refreshToken;
-		}
+		if (options?.session) tokenPayload.session = refreshToken;
 		const TTL = env[options?.session ? "SESSION_COOKIE_TTL" : "ACCESS_TOKEN_TTL"];
 		const accessToken = jwt.sign(tokenPayload, getSecret(), {
 			expiresIn: TTL,
@@ -90,7 +82,7 @@ var SharesService = class extends ItemsService {
 			origin: this.accountability?.origin,
 			share: record.share_id
 		});
-		await this.knex("directus_sessions").delete().where("expires", "<", new Date());
+		await this.knex("directus_sessions").delete().where("expires", "<", /* @__PURE__ */ new Date());
 		return {
 			accessToken,
 			refreshToken,
@@ -125,18 +117,16 @@ ${userName(userInfo)} has invited you to view an item in ${share["collection"]}.
 
 [Open](${new Url(env["PUBLIC_URL"]).addPath("admin", "shared", payload.share).toString()})
 `;
-		for (const email of payload.emails) {
-			mailService.send({
-				template: {
-					name: "base",
-					data: { html: md(message) }
-				},
-				to: email,
-				subject: `${userName(userInfo)} has shared an item with you`
-			}).catch((error) => {
-				logger.error(error, `Could not send share notification mail`);
-			});
-		}
+		for (const email of payload.emails) mailService.send({
+			template: {
+				name: "base",
+				data: { html: md(message) }
+			},
+			to: email,
+			subject: `${userName(userInfo)} has shared an item with you`
+		}).catch((error) => {
+			logger.error(error, `Could not send share notification mail`);
+		});
 	}
 };
 

package/dist/services/specifications.js

@@ -50,12 +50,11 @@ var OASSpecsService = class {
 				knex: this.knex
 			});
 			schemaForSpec = reduceSchema(this.schema, allowedFields);
-			const policies = await fetchPolicies(this.accountability, {
-				schema: this.schema,
-				knex: this.knex
-			});
 			permissions = await fetchPermissions({
-				policies,
+				policies: await fetchPolicies(this.accountability, {
+					schema: this.schema,
+					knex: this.knex
+				}),
 				accountability: this.accountability
 			}, {
 				schema: this.schema,
@@ -65,18 +64,16 @@ var OASSpecsService = class {
 		const tags = await this.generateTags(schemaForSpec);
 		const paths = await this.generatePaths(schemaForSpec, permissions, tags);
 		const components = await this.generateComponents(schemaForSpec, tags);
-		const isDefaultPublicUrl = env["PUBLIC_URL"] === "/";
-		const url = isDefaultPublicUrl && host ? host : env["PUBLIC_URL"];
-		const hashedVersion = hash({
-			now: new Date().toISOString(),
-			user: this.accountability?.user
-		});
+		const url = env["PUBLIC_URL"] === "/" && host ? host : env["PUBLIC_URL"];
 		const spec$1 = {
 			openapi: "3.0.1",
 			info: {
 				title: "Dynamic API Specification",
 				description: "This is a dynamically generated API specification for all endpoints existing on the current project.",
-				version: hashedVersion
+				version: hash({
+					now: (/* @__PURE__ */ new Date()).toISOString(),
+					user: this.accountability?.user
+				})
 			},
 			servers: [{
 				url,
@@ -95,110 +92,76 @@ var OASSpecsService = class {
 		for (const systemTag of systemTags) {
 			if (systemTag["x-authentication"] === "admin" && !this.accountability?.admin) continue;
 			if (systemTag["x-authentication"] === "user" && !this.accountability?.user) continue;
-			if (!systemTag["x-collection"]) {
-				tags.push(systemTag);
-			}
+			if (!systemTag["x-collection"]) tags.push(systemTag);
 		}
-		for (const collection of collections) {
-			const isSystem = isSystemCollection(collection.collection);
-			if (isSystem) {
-				for (const tag of spec.tags) {
-					if (tag["x-collection"] === collection.collection) {
-						tags.push(tag);
-						break;
-					}
-				}
-			} else {
-				const tag = {
-					name: "Items" + formatTitle(collection.collection).replace(/ /g, ""),
-					"x-collection": collection.collection
-				};
-				if (collection.note) {
-					tag.description = collection.note;
-				}
+		for (const collection of collections) if (isSystemCollection(collection.collection)) {
+			for (const tag of spec.tags) if (tag["x-collection"] === collection.collection) {
 				tags.push(tag);
+				break;
 			}
+		} else {
+			const tag = {
+				name: "Items" + formatTitle(collection.collection).replace(/ /g, ""),
+				"x-collection": collection.collection
+			};
+			if (collection.note) tag.description = collection.note;
+			tags.push(tag);
 		}
 		return tags.filter((tag) => tag.name !== "Items");
 	}
 	async generatePaths(schema, permissions, tags) {
 		const paths = {};
 		if (!tags) return paths;
-		for (const tag of tags) {
-			const isSystem = "x-collection" in tag === false || isSystemCollection(tag["x-collection"]);
-			if (isSystem) {
-				for (const [path, pathItem] of Object.entries(spec.paths)) {
-					for (const [method, operation] of Object.entries(pathItem)) {
-						if (operation.tags?.includes(tag.name)) {
-							if (!paths[path]) {
-								paths[path] = {};
-							}
-							const hasPermission = this.accountability?.admin === true || "x-collection" in tag === false || !!permissions.find((permission) => permission.collection === tag["x-collection"] && permission.action === this.getActionForMethod(method));
-							if (hasPermission) {
-								if ("parameters" in pathItem) {
-									paths[path][method] = {
-										...operation,
-										parameters: [...pathItem.parameters ?? [], ...operation?.parameters ?? []]
-									};
-								} else {
-									paths[path][method] = operation;
-								}
-							}
-						}
-					}
-				}
-			} else {
-				const listBase = cloneDeep(spec.paths["/items/{collection}"]);
-				const detailBase = cloneDeep(spec.paths["/items/{collection}/{id}"]);
-				const collection = tag["x-collection"];
-				const methods = [
-					"post",
-					"get",
-					"patch",
-					"delete"
-				];
-				for (const method of methods) {
-					const hasPermission = this.accountability?.admin === true || !!permissions.find((permission) => permission.collection === collection && permission.action === this.getActionForMethod(method));
-					if (hasPermission) {
-						if (!paths[`/items/${collection}`]) paths[`/items/${collection}`] = {};
-						if (!paths[`/items/${collection}/{id}`]) paths[`/items/${collection}/{id}`] = {};
-						if (listBase?.[method]) {
-							paths[`/items/${collection}`][method] = mergeWith(cloneDeep(listBase[method]), {
-								description: listBase[method].description.replace("item", collection + " item"),
-								tags: [tag.name],
-								parameters: "parameters" in listBase ? this.filterCollectionFromParams(listBase.parameters) : [],
-								operationId: `${this.getActionForMethod(method)}${tag.name}`,
-								requestBody: ["get", "delete"].includes(method) ? undefined : { content: { "application/json": { schema: { oneOf: [{
-									type: "array",
-									items: { $ref: `#/components/schemas/${tag.name}` }
-								}, { $ref: `#/components/schemas/${tag.name}` }] } } } },
-								responses: { "200": {
-									description: "Successful request",
-									content: method === "delete" ? undefined : { "application/json": { schema: { properties: { data: schema.collections[collection]?.singleton ? { $ref: `#/components/schemas/${tag.name}` } : {
-										type: "array",
-										items: { $ref: `#/components/schemas/${tag.name}` }
-									} } } } }
-								} }
-							}, (obj, src) => {
-								if (Array.isArray(obj)) return obj.concat(src);
-								return undefined;
-							});
-						}
-						if (detailBase?.[method]) {
-							paths[`/items/${collection}/{id}`][method] = mergeWith(cloneDeep(detailBase[method]), {
-								description: detailBase[method].description.replace("item", collection + " item"),
-								tags: [tag.name],
-								operationId: `${this.getActionForMethod(method)}Single${tag.name}`,
-								parameters: "parameters" in detailBase ? this.filterCollectionFromParams(detailBase.parameters) : [],
-								requestBody: ["get", "delete"].includes(method) ? undefined : { content: { "application/json": { schema: { $ref: `#/components/schemas/${tag.name}` } } } },
-								responses: { "200": { content: method === "delete" ? undefined : { "application/json": { schema: { properties: { data: { $ref: `#/components/schemas/${tag.name}` } } } } } } }
-							}, (obj, src) => {
-								if (Array.isArray(obj)) return obj.concat(src);
-								return undefined;
-							});
-						}
-					}
-				}
+		for (const tag of tags) if ("x-collection" in tag === false || isSystemCollection(tag["x-collection"])) {
+			for (const [path, pathItem] of Object.entries(spec.paths)) for (const [method, operation] of Object.entries(pathItem)) if (operation.tags?.includes(tag.name)) {
+				if (!paths[path]) paths[path] = {};
+				if (this.accountability?.admin === true || "x-collection" in tag === false || !!permissions.find((permission) => permission.collection === tag["x-collection"] && permission.action === this.getActionForMethod(method))) if ("parameters" in pathItem) paths[path][method] = {
+					...operation,
+					parameters: [...pathItem.parameters ?? [], ...operation?.parameters ?? []]
+				};
+				else paths[path][method] = operation;
+			}
+		} else {
+			const listBase = cloneDeep(spec.paths["/items/{collection}"]);
+			const detailBase = cloneDeep(spec.paths["/items/{collection}/{id}"]);
+			const collection = tag["x-collection"];
+			for (const method of [
+				"post",
+				"get",
+				"patch",
+				"delete"
+			]) if (this.accountability?.admin === true || !!permissions.find((permission) => permission.collection === collection && permission.action === this.getActionForMethod(method))) {
+				if (!paths[`/items/${collection}`]) paths[`/items/${collection}`] = {};
+				if (!paths[`/items/${collection}/{id}`]) paths[`/items/${collection}/{id}`] = {};
+				if (listBase?.[method]) paths[`/items/${collection}`][method] = mergeWith(cloneDeep(listBase[method]), {
+					description: listBase[method].description.replace("item", collection + " item"),
+					tags: [tag.name],
+					parameters: "parameters" in listBase ? this.filterCollectionFromParams(listBase.parameters) : [],
+					operationId: `${this.getActionForMethod(method)}${tag.name}`,
+					requestBody: ["get", "delete"].includes(method) ? void 0 : { content: { "application/json": { schema: { oneOf: [{
+						type: "array",
+						items: { $ref: `#/components/schemas/${tag.name}` }
+					}, { $ref: `#/components/schemas/${tag.name}` }] } } } },
+					responses: { "200": {
+						description: "Successful request",
+						content: method === "delete" ? void 0 : { "application/json": { schema: { properties: { data: schema.collections[collection]?.singleton ? { $ref: `#/components/schemas/${tag.name}` } : {
+							type: "array",
+							items: { $ref: `#/components/schemas/${tag.name}` }
+						} } } } }
+					} }
+				}, (obj, src) => {
+					if (Array.isArray(obj)) return obj.concat(src);
+				});
+				if (detailBase?.[method]) paths[`/items/${collection}/{id}`][method] = mergeWith(cloneDeep(detailBase[method]), {
+					description: detailBase[method].description.replace("item", collection + " item"),
+					tags: [tag.name],
+					operationId: `${this.getActionForMethod(method)}Single${tag.name}`,
+					parameters: "parameters" in detailBase ? this.filterCollectionFromParams(detailBase.parameters) : [],
+					requestBody: ["get", "delete"].includes(method) ? void 0 : { content: { "application/json": { schema: { $ref: `#/components/schemas/${tag.name}` } } } },
+					responses: { "200": { content: method === "delete" ? void 0 : { "application/json": { schema: { properties: { data: { $ref: `#/components/schemas/${tag.name}` } } } } } } }
+				}, (obj, src) => {
+					if (Array.isArray(obj)) return obj.concat(src);
+				});
 			}
 		}
 		return paths;
@@ -210,14 +173,12 @@ var OASSpecsService = class {
 		components.schemas = {};
 		const tagSchemas = tags.reduce((schemas, tag) => [...schemas, ...tag["x-schemas"] ? tag["x-schemas"] : []], []);
 		const requiredSchemas = [...OAS_REQUIRED_SCHEMAS, ...tagSchemas];
-		for (const [name, schema$1] of Object.entries(spec.components?.schemas ?? {})) {
-			if (requiredSchemas.includes(name)) {
-				const collection = spec.tags?.find((tag) => tag.name === name)?.["x-collection"];
-				components.schemas[name] = {
-					...cloneDeep(schema$1),
-					...collection && { "x-collection": collection }
-				};
-			}
+		for (const [name, schema$1] of Object.entries(spec.components?.schemas ?? {})) if (requiredSchemas.includes(name)) {
+			const collection = spec.tags?.find((tag) => tag.name === name)?.["x-collection"];
+			components.schemas[name] = {
+				...cloneDeep(schema$1),
+				...collection && { "x-collection": collection }
+			};
 		}
 		const collections = Object.values(schema.collections);
 		for (const collection of collections) {
@@ -229,9 +190,7 @@ var OASSpecsService = class {
 				const schemaComponent = cloneDeep(spec.components.schemas[tag.name]);
 				schemaComponent.properties = {};
 				schemaComponent["x-collection"] = collection.collection;
-				for (const field of fieldsInCollection) {
-					schemaComponent.properties[field.field] = cloneDeep(spec.components.schemas[tag.name].properties[field.field]) || this.generateField(schema, collection.collection, field, tags);
-				}
+				for (const field of fieldsInCollection) schemaComponent.properties[field.field] = cloneDeep(spec.components.schemas[tag.name].properties[field.field]) || this.generateField(schema, collection.collection, field, tags);
 				components.schemas[tag.name] = schemaComponent;
 			} else {
 				const schemaComponent = {
@@ -243,13 +202,9 @@ var OASSpecsService = class {
 				for (const field of fieldsInCollection) {
 					const fieldSchema = this.generateField(schema, collection.collection, field, tags);
 					schemaComponent.properties[field.field] = fieldSchema;
-					if (field.nullable === false && field.defaultValue === null && field.generated === false) {
-						requiredFields.push(field.field);
-					}
-				}
-				if (requiredFields.length > 0) {
-					schemaComponent.required = requiredFields;
+					if (field.nullable === false && field.defaultValue === null && field.generated === false) requiredFields.push(field.field);
 				}
+				if (requiredFields.length > 0) schemaComponent.required = requiredFields;
 				components.schemas[tag.name] = schemaComponent;
 			}
 		}
@@ -270,16 +225,13 @@ var OASSpecsService = class {
 	generateField(schema, collection, field, tags) {
 		let propertyObject = {};
 		propertyObject.nullable = field.nullable;
-		if (field.note) {
-			propertyObject.description = field.note;
-		}
+		if (field.note) propertyObject.description = field.note;
 		const relation = getRelation(schema.relations, collection, field.field);
-		if (!relation) {
-			propertyObject = {
-				...propertyObject,
-				...this.fieldTypes[field.type]
-			};
-		} else {
+		if (!relation) propertyObject = {
+			...propertyObject,
+			...this.fieldTypes[field.type]
+		};
+		else {
 			const relationType = getRelationType({
 				relation,
 				field: field.field,
@@ -288,17 +240,13 @@ var OASSpecsService = class {
 			});
 			if (relationType === "m2o") {
 				const relatedTag = tags.find((tag) => tag["x-collection"] === relation.related_collection);
-				if (!relatedTag || !relation.related_collection || relation.related_collection in schema.collections === false) {
-					return propertyObject;
-				}
+				if (!relatedTag || !relation.related_collection || relation.related_collection in schema.collections === false) return propertyObject;
 				const relatedCollection = schema.collections[relation.related_collection];
 				const relatedPrimaryKeyField = relatedCollection.fields[relatedCollection.primary];
 				propertyObject.oneOf = [{ ...this.fieldTypes[relatedPrimaryKeyField.type] }, { $ref: `#/components/schemas/${relatedTag.name}` }];
 			} else if (relationType === "o2m") {
 				const relatedTag = tags.find((tag) => tag["x-collection"] === relation.collection);
-				if (!relatedTag || !relation.related_collection || relation.collection in schema.collections === false) {
-					return propertyObject;
-				}
+				if (!relatedTag || !relation.related_collection || relation.collection in schema.collections === false) return propertyObject;
 				const relatedCollection = schema.collections[relation.collection];
 				const relatedPrimaryKeyField = relatedCollection.fields[relatedCollection.primary];
 				if (!relatedTag || !relatedPrimaryKeyField) return propertyObject;

package/dist/services/tfa.js

@@ -13,26 +13,16 @@ var TFAService = class {
 		this.itemsService = new ItemsService("directus_users", options);
 	}
 	async verifyOTP(key, otp, secret) {
-		if (secret) {
-			return authenticator.check(otp, secret);
-		}
+		if (secret) return authenticator.check(otp, secret);
 		const user = await this.knex.select("tfa_secret").from("directus_users").where({ id: key }).first();
-		if (!user?.tfa_secret) {
-			throw new InvalidPayloadError({ reason: `User "${key}" doesn't have TFA enabled` });
-		}
+		if (!user?.tfa_secret) throw new InvalidPayloadError({ reason: `User "${key}" doesn't have TFA enabled` });
 		return authenticator.check(otp, user.tfa_secret);
 	}
 	async generateTFA(key, requiresPassword = true) {
 		const user = await this.knex.select("email", "tfa_secret", "provider", "external_identifier").from("directus_users").where({ id: key }).first();
-		if (user?.tfa_secret !== null) {
-			throw new InvalidPayloadError({ reason: "TFA Secret is already set for this user" });
-		}
-		if (user?.provider === DEFAULT_AUTH_PROVIDER && !user?.email) {
-			throw new InvalidPayloadError({ reason: "User must have a valid email to enable TFA" });
-		}
-		if (!requiresPassword && user?.provider === DEFAULT_AUTH_PROVIDER) {
-			throw new InvalidPayloadError({ reason: "This method is only available for OAuth users" });
-		}
+		if (user?.tfa_secret !== null) throw new InvalidPayloadError({ reason: "TFA Secret is already set for this user" });
+		if (user?.provider === DEFAULT_AUTH_PROVIDER && !user?.email) throw new InvalidPayloadError({ reason: "User must have a valid email to enable TFA" });
+		if (!requiresPassword && user?.provider === DEFAULT_AUTH_PROVIDER) throw new InvalidPayloadError({ reason: "This method is only available for OAuth users" });
 		const secret = authenticator.generateSecret();
 		const project = await this.knex.select("project_name").from("directus_settings").limit(1).first();
 		const accountName = user.email || user.external_identifier || `user_${key}`;
@@ -44,15 +34,9 @@ var TFAService = class {
 	async enableTFA(key, otp, secret) {
 		const user = await this.knex.select("tfa_secret", "provider").from("directus_users").where({ id: key }).first();
 		const requiresPassword = user?.["provider"] === DEFAULT_AUTH_PROVIDER;
-		if (user?.tfa_secret !== null) {
-			throw new InvalidPayloadError({ reason: "TFA Secret is already set for this user" });
-		}
-		if (!requiresPassword && user?.provider === DEFAULT_AUTH_PROVIDER) {
-			throw new InvalidPayloadError({ reason: "This method is only available for OAuth users" });
-		}
-		if (!authenticator.check(otp, secret)) {
-			throw new InvalidPayloadError({ reason: `"otp" is invalid` });
-		}
+		if (user?.tfa_secret !== null) throw new InvalidPayloadError({ reason: "TFA Secret is already set for this user" });
+		if (!requiresPassword && user?.provider === DEFAULT_AUTH_PROVIDER) throw new InvalidPayloadError({ reason: "This method is only available for OAuth users" });
+		if (!authenticator.check(otp, secret)) throw new InvalidPayloadError({ reason: `"otp" is invalid` });
 		await this.itemsService.updateOne(key, { tfa_secret: secret });
 	}
 	async disableTFA(key) {