@directus/api 35.0.2 → 35.1.0

package/dist/services/mail/index.js

@@ -30,14 +30,12 @@ var MailService = class {
 		this.accountability = opts.accountability || null;
 		this.knex = opts?.knex || database_default();
 		this.mailer = getMailer();
-		if (env["EMAIL_VERIFY_SETUP"]) {
-			this.mailer.verify((error) => {
-				if (error) {
-					logger.warn(`Email connection failed:`);
-					logger.warn(error);
-				}
-			});
-		}
+		if (env["EMAIL_VERIFY_SETUP"]) this.mailer.verify((error) => {
+			if (error) {
+				logger.warn(`Email connection failed:`);
+				logger.warn(error);
+			}
+		});
 	}
 	async send(data, options) {
 		await useEmailRateLimiterQueue();
@@ -46,9 +44,7 @@ var MailService = class {
 		const { template,...emailOptions } = payload;
 		let { html } = data;
 		const defaultTemplateData = options?.defaultTemplateData ?? await this.getDefaultTemplateData();
-		if (isObject(emailOptions.from) && (!emailOptions.from.name || !emailOptions.from.address)) {
-			throw new InvalidPayloadError({ reason: "A name and address property are required in the \"from\" object" });
-		}
+		if (isObject(emailOptions.from) && (!emailOptions.from.name || !emailOptions.from.address)) throw new InvalidPayloadError({ reason: "A name and address property are required in the \"from\" object" });
 		const from = isObject(emailOptions.from) ? emailOptions.from : {
 			name: defaultTemplateData.projectName,
 			address: emailOptions.from || env["EMAIL_FROM"]
@@ -61,26 +57,20 @@ var MailService = class {
 			};
 			html = await this.renderTemplate(template.name, templateData);
 		}
-		if (typeof html === "string") {
-			html = html.split("\n").map((line) => line.trim()).join("\n");
-		}
-		const info = await this.mailer.sendMail({
+		if (typeof html === "string") html = html.split("\n").map((line) => line.trim()).join("\n");
+		return await this.mailer.sendMail({
 			...emailOptions,
 			from,
 			html
 		});
-		return info;
 	}
 	async renderTemplate(template, variables) {
 		const customTemplatePath = path.resolve(env["EMAIL_TEMPLATES_PATH"], template + ".liquid");
 		const systemTemplatePath = path.join(__dirname, "templates", template + ".liquid");
 		const templatePath = await fse.pathExists(customTemplatePath) ? customTemplatePath : systemTemplatePath;
-		if (await fse.pathExists(templatePath) === false) {
-			throw new InvalidPayloadError({ reason: `Template "${template}" doesn't exist` });
-		}
+		if (await fse.pathExists(templatePath) === false) throw new InvalidPayloadError({ reason: `Template "${template}" doesn't exist` });
 		const templateString = await fse.readFile(templatePath, "utf8");
-		const html = await liquidEngine.parseAndRender(templateString, variables);
-		return html;
+		return await liquidEngine.parseAndRender(templateString, variables);
 	}
 	async getDefaultTemplateData() {
 		const projectInfo = await this.knex.select([
@@ -97,11 +87,8 @@ var MailService = class {
 		};
 		function getProjectLogoURL(logoID) {
 			const projectLogoUrl = new Url(env["PUBLIC_URL"]);
-			if (logoID) {
-				projectLogoUrl.addPath("assets", logoID);
-			} else {
-				projectLogoUrl.addPath("admin", "img", "directus-white.png");
-			}
+			if (logoID) projectLogoUrl.addPath("assets", logoID);
+			else projectLogoUrl.addPath("admin", "img", "directus-white.png");
 			return projectLogoUrl.toString();
 		}
 	}

package/dist/services/mail/rate-limiter.js

@@ -7,21 +7,17 @@ import { RateLimiterQueue } from "rate-limiter-flexible";
 //#region src/services/mail/rate-limiter.ts
 let emailRateLimiterQueue;
 const env = useEnv();
-if (toBoolean(env["RATE_LIMITER_EMAIL_ENABLED"]) === true) {
-	emailRateLimiterQueue = new RateLimiterQueue(createRateLimiter("RATE_LIMITER_EMAIL"), { maxQueueSize: Number(env["RATE_LIMITER_EMAIL_QUEUE_SIZE"]) });
-}
+if (toBoolean(env["RATE_LIMITER_EMAIL_ENABLED"]) === true) emailRateLimiterQueue = new RateLimiterQueue(createRateLimiter("RATE_LIMITER_EMAIL"), { maxQueueSize: Number(env["RATE_LIMITER_EMAIL_QUEUE_SIZE"]) });
 async function useEmailRateLimiterQueue() {
 	if (!emailRateLimiterQueue) return;
 	try {
 		await emailRateLimiterQueue.removeTokens(1);
 	} catch (err) {
-		if (err instanceof Error) {
-			throw new EmailLimitExceededError({
-				points: "RATE_LIMITER_EMAIL_POINTS" in env ? Number(env["RATE_LIMITER_EMAIL_POINTS"]) : undefined,
-				duration: "RATE_LIMITER_EMAIL_DURATION" in env ? Number(env["RATE_LIMITER_EMAIL_DURATION"]) : undefined,
-				message: "RATE_LIMITER_EMAIL_ERROR_MESSAGE" in env ? String(env["RATE_LIMITER_EMAIL_ERROR_MESSAGE"]) : undefined
-			});
-		}
+		if (err instanceof Error) throw new EmailLimitExceededError({
+			points: "RATE_LIMITER_EMAIL_POINTS" in env ? Number(env["RATE_LIMITER_EMAIL_POINTS"]) : void 0,
+			duration: "RATE_LIMITER_EMAIL_DURATION" in env ? Number(env["RATE_LIMITER_EMAIL_DURATION"]) : void 0,
+			message: "RATE_LIMITER_EMAIL_ERROR_MESSAGE" in env ? String(env["RATE_LIMITER_EMAIL_ERROR_MESSAGE"]) : void 0
+		});
 		throw err;
 	}
 }

package/dist/services/meta.js

@@ -18,12 +18,10 @@ var MetaService = class {
 	}
 	async getMetaForQuery(collection, query) {
 		if (!query || !query.meta) return;
-		const results = await Promise.all(query.meta.map((metaVal) => {
+		return (await Promise.all(query.meta.map((metaVal) => {
 			if (metaVal === "total_count") return this.totalCount(collection);
 			if (metaVal === "filter_count") return this.filterCount(collection, query);
-			return undefined;
-		}));
-		return results.reduce((metaObject, value, index) => {
+		}))).reduce((metaObject, value, index) => {
 			return {
 				...metaObject,
 				[query.meta[index]]: value
@@ -57,11 +55,8 @@ var MetaService = class {
 			filter: query.filter ?? null,
 			search: query.search ?? null
 		}, this.schema, cases, permissions);
-		if (hasJoins) {
-			dbQuery.countDistinct({ count: [`${collection}.${this.schema.collections[collection].primary}`] });
-		} else {
-			dbQuery.count("*", { as: "count" });
-		}
+		if (hasJoins) dbQuery.countDistinct({ count: [`${collection}.${this.schema.collections[collection].primary}`] });
+		else dbQuery.count("*", { as: "count" });
 		const records = await dbQuery;
 		return Number((isArray(records) ? records[0]?.["count"] : records?.["count"]) ?? 0);
 	}

package/dist/services/notifications.js

@@ -22,11 +22,10 @@ var NotificationsService = class extends ItemsService {
 	}
 	async sendEmail(data) {
 		if (data.recipient) {
-			const usersService = new UsersService({
+			const user = await new UsersService({
 				schema: this.schema,
 				knex: this.knex
-			});
-			const user = await usersService.readOne(data.recipient, { fields: [
+			}).readOne(data.recipient, { fields: [
 				"id",
 				"email",
 				"email_notifications",

package/dist/services/operations.js

@@ -8,20 +8,17 @@ var OperationsService = class extends ItemsService {
 	}
 	async createOne(data, opts) {
 		const result = await super.createOne(data, opts);
-		const flowManager = getFlowManager();
-		await flowManager.reload();
+		await getFlowManager().reload();
 		return result;
 	}
 	async updateMany(keys, data, opts) {
 		const result = await super.updateMany(keys, data, opts);
-		const flowManager = getFlowManager();
-		await flowManager.reload();
+		await getFlowManager().reload();
 		return result;
 	}
 	async deleteMany(keys, opts) {
 		const result = await super.deleteMany(keys, opts);
-		const flowManager = getFlowManager();
-		await flowManager.reload();
+		await getFlowManager().reload();
 		return result;
 	}
 };