@directus/api 34.0.1 → 35.0.0

package/dist/services/mail/index.js

@@ -1,109 +1,111 @@
-import path from 'path';
-import { fileURLToPath } from 'url';
-import { useEnv } from '@directus/env';
-import { InvalidPayloadError } from '@directus/errors';
-import { isObject } from '@directus/utils';
-import fse from 'fs-extra';
-import { Liquid } from 'liquidjs';
-import getDatabase from '../../database/index.js';
-import emitter from '../../emitter.js';
-import { useLogger } from '../../logger/index.js';
-import getMailer from '../../mailer.js';
-import { Url } from '../../utils/url.js';
-import { useEmailRateLimiterQueue } from './rate-limiter.js';
+import { useLogger } from "../../logger/index.js";
+import database_default from "../../database/index.js";
+import emitter_default from "../../emitter.js";
+import { Url } from "../../utils/url.js";
+import getMailer from "../../mailer.js";
+import { useEmailRateLimiterQueue } from "./rate-limiter.js";
+import path from "path";
+import { useEnv } from "@directus/env";
+import { InvalidPayloadError } from "@directus/errors";
+import { isObject } from "@directus/utils";
+import fse from "fs-extra";
+import { fileURLToPath } from "url";
+import { Liquid } from "liquidjs";
+
+//#region src/services/mail/index.ts
 const env = useEnv();
 const logger = useLogger();
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const liquidEngine = new Liquid({
-    root: [path.resolve(env['EMAIL_TEMPLATES_PATH']), path.resolve(__dirname, 'templates')],
-    extname: '.liquid',
+	root: [path.resolve(env["EMAIL_TEMPLATES_PATH"]), path.resolve(__dirname, "templates")],
+	extname: ".liquid"
 });
-export class MailService {
-    schema;
-    accountability;
-    knex;
-    mailer;
-    constructor(opts) {
-        this.schema = opts.schema;
-        this.accountability = opts.accountability || null;
-        this.knex = opts?.knex || getDatabase();
-        this.mailer = getMailer();
-        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();
-        const payload = await emitter.emitFilter(`email.send`, data, {});
-        if (!payload)
-            return null;
-        const { template, ...emailOptions } = payload;
-        let { html } = data;
-        // option for providing tempalate data was added to prevent transaction race conditions with preceding promises
-        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' });
-        }
-        const from = isObject(emailOptions.from)
-            ? emailOptions.from
-            : {
-                name: defaultTemplateData.projectName,
-                address: emailOptions.from || env['EMAIL_FROM'],
-            };
-        if (template) {
-            let templateData = template.data;
-            templateData = {
-                ...defaultTemplateData,
-                ...templateData,
-            };
-            html = await this.renderTemplate(template.name, templateData);
-        }
-        if (typeof html === 'string') {
-            // Some email clients start acting funky when line length exceeds 75 characters. See #6074
-            html = html
-                .split('\n')
-                .map((line) => line.trim())
-                .join('\n');
-        }
-        const info = 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` });
-        }
-        const templateString = await fse.readFile(templatePath, 'utf8');
-        const html = await liquidEngine.parseAndRender(templateString, variables);
-        return html;
-    }
-    async getDefaultTemplateData() {
-        const projectInfo = await this.knex
-            .select(['project_name', 'project_logo', 'project_color', 'project_url'])
-            .from('directus_settings')
-            .first();
-        return {
-            projectName: projectInfo?.project_name || 'Directus',
-            projectColor: projectInfo?.project_color || '#171717',
-            projectLogo: getProjectLogoURL(projectInfo?.project_logo),
-            projectUrl: projectInfo?.project_url || '',
-        };
-        function getProjectLogoURL(logoID) {
-            const projectLogoUrl = new Url(env['PUBLIC_URL']);
-            if (logoID) {
-                projectLogoUrl.addPath('assets', logoID);
-            }
-            else {
-                projectLogoUrl.addPath('admin', 'img', 'directus-white.png');
-            }
-            return projectLogoUrl.toString();
-        }
-    }
-}
+var MailService = class {
+	schema;
+	accountability;
+	knex;
+	mailer;
+	constructor(opts) {
+		this.schema = opts.schema;
+		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);
+				}
+			});
+		}
+	}
+	async send(data, options) {
+		await useEmailRateLimiterQueue();
+		const payload = await emitter_default.emitFilter(`email.send`, data, {});
+		if (!payload) return null;
+		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" });
+		}
+		const from = isObject(emailOptions.from) ? emailOptions.from : {
+			name: defaultTemplateData.projectName,
+			address: emailOptions.from || env["EMAIL_FROM"]
+		};
+		if (template) {
+			let templateData = template.data;
+			templateData = {
+				...defaultTemplateData,
+				...templateData
+			};
+			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({
+			...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` });
+		}
+		const templateString = await fse.readFile(templatePath, "utf8");
+		const html = await liquidEngine.parseAndRender(templateString, variables);
+		return html;
+	}
+	async getDefaultTemplateData() {
+		const projectInfo = await this.knex.select([
+			"project_name",
+			"project_logo",
+			"project_color",
+			"project_url"
+		]).from("directus_settings").first();
+		return {
+			projectName: projectInfo?.project_name || "Directus",
+			projectColor: projectInfo?.project_color || "#171717",
+			projectLogo: getProjectLogoURL(projectInfo?.project_logo),
+			projectUrl: projectInfo?.project_url || ""
+		};
+		function getProjectLogoURL(logoID) {
+			const projectLogoUrl = new Url(env["PUBLIC_URL"]);
+			if (logoID) {
+				projectLogoUrl.addPath("assets", logoID);
+			} else {
+				projectLogoUrl.addPath("admin", "img", "directus-white.png");
+			}
+			return projectLogoUrl.toString();
+		}
+	}
+};
+
+//#endregion
+export { MailService };

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

@@ -1,29 +1,30 @@
-import { useEnv } from '@directus/env';
-import { EmailLimitExceededError } from '@directus/errors';
-import { toBoolean } from '@directus/utils';
-import { RateLimiterQueue } from 'rate-limiter-flexible';
-import { createRateLimiter } from '../../rate-limiter.js';
+import { createRateLimiter } from "../../rate-limiter.js";
+import { useEnv } from "@directus/env";
+import { EmailLimitExceededError } from "@directus/errors";
+import { toBoolean } from "@directus/utils";
+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"]) });
 }
-export 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,
-            });
-        }
-        throw err;
-    }
+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
+			});
+		}
+		throw err;
+	}
 }
+
+//#endregion
+export { useEmailRateLimiterQueue };

package/dist/services/meta.js

@@ -1,63 +1,71 @@
-import { isArray } from 'lodash-es';
-import getDatabase from '../database/index.js';
-import applyQuery from '../database/run-ast/lib/apply-query/index.js';
-import { fetchPermissions } from '../permissions/lib/fetch-permissions.js';
-import { fetchPolicies } from '../permissions/lib/fetch-policies.js';
-import { getCases } from '../permissions/modules/process-ast/lib/get-cases.js';
-import { validateAccess } from '../permissions/modules/validate-access/validate-access.js';
-export class MetaService {
-    knex;
-    accountability;
-    schema;
-    constructor(options) {
-        this.knex = options.knex || getDatabase();
-        this.accountability = options.accountability || null;
-        this.schema = options.schema;
-    }
-    async getMetaForQuery(collection, query) {
-        if (!query || !query.meta)
-            return;
-        const results = 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) => {
-            return {
-                ...metaObject,
-                [query.meta[index]]: value,
-            };
-        }, {});
-    }
-    async totalCount(collection) {
-        return this.filterCount(collection, {});
-    }
-    async filterCount(collection, query) {
-        let permissions = [];
-        if (this.accountability && this.accountability.admin !== true) {
-            const context = { knex: this.knex, schema: this.schema };
-            await validateAccess({
-                accountability: this.accountability,
-                action: 'read',
-                collection,
-            }, context);
-            const policies = await fetchPolicies(this.accountability, context);
-            permissions = await fetchPermissions({ action: 'read', accountability: this.accountability, policies }, context);
-        }
-        const { cases } = getCases(collection, permissions, []);
-        const { query: dbQuery, hasJoins } = applyQuery(this.knex, collection, this.knex(collection), {
-            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' });
-        }
-        const records = await dbQuery;
-        return Number((isArray(records) ? records[0]?.['count'] : records?.['count']) ?? 0);
-    }
-}
+import { getCases } from "../permissions/modules/process-ast/lib/get-cases.js";
+import applyQuery from "../database/run-ast/lib/apply-query/index.js";
+import database_default from "../database/index.js";
+import { fetchPolicies } from "../permissions/lib/fetch-policies.js";
+import { fetchPermissions } from "../permissions/lib/fetch-permissions.js";
+import { validateAccess } from "../permissions/modules/validate-access/validate-access.js";
+import { isArray } from "lodash-es";
+
+//#region src/services/meta.ts
+var MetaService = class {
+	knex;
+	accountability;
+	schema;
+	constructor(options) {
+		this.knex = options.knex || database_default();
+		this.accountability = options.accountability || null;
+		this.schema = options.schema;
+	}
+	async getMetaForQuery(collection, query) {
+		if (!query || !query.meta) return;
+		const results = 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) => {
+			return {
+				...metaObject,
+				[query.meta[index]]: value
+			};
+		}, {});
+	}
+	async totalCount(collection) {
+		return this.filterCount(collection, {});
+	}
+	async filterCount(collection, query) {
+		let permissions = [];
+		if (this.accountability && this.accountability.admin !== true) {
+			const context = {
+				knex: this.knex,
+				schema: this.schema
+			};
+			await validateAccess({
+				accountability: this.accountability,
+				action: "read",
+				collection
+			}, context);
+			const policies = await fetchPolicies(this.accountability, context);
+			permissions = await fetchPermissions({
+				action: "read",
+				accountability: this.accountability,
+				policies
+			}, context);
+		}
+		const { cases } = getCases(collection, permissions, []);
+		const { query: dbQuery, hasJoins } = applyQuery(this.knex, collection, this.knex(collection), {
+			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" });
+		}
+		const records = await dbQuery;
+		return Number((isArray(records) ? records[0]?.["count"] : records?.["count"]) ?? 0);
+	}
+};
+
+//#endregion
+export { MetaService };

package/dist/services/notifications.js

@@ -1,60 +1,68 @@
-import { useEnv } from '@directus/env';
-import { useLogger } from '../logger/index.js';
-import { fetchRolesTree } from '../permissions/lib/fetch-roles-tree.js';
-import { fetchGlobalAccess } from '../permissions/modules/fetch-global-access/fetch-global-access.js';
-import { md } from '../utils/md.js';
-import { Url } from '../utils/url.js';
-import { ItemsService } from './items.js';
-import { MailService } from './mail/index.js';
-import { UsersService } from './users.js';
+import { useLogger } from "../logger/index.js";
+import { fetchRolesTree } from "../permissions/lib/fetch-roles-tree.js";
+import { fetchGlobalAccess } from "../permissions/modules/fetch-global-access/fetch-global-access.js";
+import { ItemsService } from "./items.js";
+import { Url } from "../utils/url.js";
+import { md } from "../utils/md.js";
+import { MailService } from "./mail/index.js";
+import { UsersService } from "./users.js";
+import { useEnv } from "@directus/env";
+
+//#region src/services/notifications.ts
 const env = useEnv();
 const logger = useLogger();
-export class NotificationsService extends ItemsService {
-    constructor(options) {
-        super('directus_notifications', options);
-    }
-    async createOne(data, opts) {
-        const response = await super.createOne(data, opts);
-        await this.sendEmail(data);
-        return response;
-    }
-    async sendEmail(data) {
-        if (data.recipient) {
-            const usersService = new UsersService({ schema: this.schema, knex: this.knex });
-            const user = await usersService.readOne(data.recipient, {
-                fields: ['id', 'email', 'email_notifications', 'role'],
-            });
-            if (user['email'] && user['email_notifications'] === true) {
-                const manageUserAccountUrl = new Url(env['PUBLIC_URL'])
-                    .addPath('admin', 'users', user['id'])
-                    .toString();
-                const html = data.message ? md(data.message) : '';
-                const roles = await fetchRolesTree(user['role'], { knex: this.knex });
-                const { app: app_access } = await fetchGlobalAccess({
-                    user: user['id'],
-                    roles,
-                    ip: null,
-                }, { knex: this.knex });
-                const mailService = new MailService({
-                    schema: this.schema,
-                    knex: this.knex,
-                    accountability: this.accountability,
-                });
-                mailService
-                    .send({
-                    template: {
-                        name: 'base',
-                        data: app_access ? { url: manageUserAccountUrl, html } : { html },
-                    },
-                    to: user['email'],
-                    subject: data.subject,
-                }, {
-                    defaultTemplateData: await mailService.getDefaultTemplateData(),
-                })
-                    .catch((error) => {
-                    logger.error(error, `Could not send notification via mail`);
-                });
-            }
-        }
-    }
-}
+var NotificationsService = class extends ItemsService {
+	constructor(options) {
+		super("directus_notifications", options);
+	}
+	async createOne(data, opts) {
+		const response = await super.createOne(data, opts);
+		await this.sendEmail(data);
+		return response;
+	}
+	async sendEmail(data) {
+		if (data.recipient) {
+			const usersService = new UsersService({
+				schema: this.schema,
+				knex: this.knex
+			});
+			const user = await usersService.readOne(data.recipient, { fields: [
+				"id",
+				"email",
+				"email_notifications",
+				"role"
+			] });
+			if (user["email"] && user["email_notifications"] === true) {
+				const manageUserAccountUrl = new Url(env["PUBLIC_URL"]).addPath("admin", "users", user["id"]).toString();
+				const html = data.message ? md(data.message) : "";
+				const roles = await fetchRolesTree(user["role"], { knex: this.knex });
+				const { app: app_access } = await fetchGlobalAccess({
+					user: user["id"],
+					roles,
+					ip: null
+				}, { knex: this.knex });
+				const mailService = new MailService({
+					schema: this.schema,
+					knex: this.knex,
+					accountability: this.accountability
+				});
+				mailService.send({
+					template: {
+						name: "base",
+						data: app_access ? {
+							url: manageUserAccountUrl,
+							html
+						} : { html }
+					},
+					to: user["email"],
+					subject: data.subject
+				}, { defaultTemplateData: await mailService.getDefaultTemplateData() }).catch((error) => {
+					logger.error(error, `Could not send notification via mail`);
+				});
+			}
+		}
+	}
+};
+
+//#endregion
+export { NotificationsService };

package/dist/services/operations.js

@@ -1,25 +1,30 @@
-import { getFlowManager } from '../flows.js';
-import { ItemsService } from './items.js';
-export class OperationsService extends ItemsService {
-    constructor(options) {
-        super('directus_operations', options);
-    }
-    async createOne(data, opts) {
-        const result = await super.createOne(data, opts);
-        const flowManager = getFlowManager();
-        await flowManager.reload();
-        return result;
-    }
-    async updateMany(keys, data, opts) {
-        const result = await super.updateMany(keys, data, opts);
-        const flowManager = getFlowManager();
-        await flowManager.reload();
-        return result;
-    }
-    async deleteMany(keys, opts) {
-        const result = await super.deleteMany(keys, opts);
-        const flowManager = getFlowManager();
-        await flowManager.reload();
-        return result;
-    }
-}
+import { ItemsService } from "./items.js";
+import { getFlowManager } from "../flows.js";
+
+//#region src/services/operations.ts
+var OperationsService = class extends ItemsService {
+	constructor(options) {
+		super("directus_operations", options);
+	}
+	async createOne(data, opts) {
+		const result = await super.createOne(data, opts);
+		const flowManager = getFlowManager();
+		await flowManager.reload();
+		return result;
+	}
+	async updateMany(keys, data, opts) {
+		const result = await super.updateMany(keys, data, opts);
+		const flowManager = getFlowManager();
+		await flowManager.reload();
+		return result;
+	}
+	async deleteMany(keys, opts) {
+		const result = await super.deleteMany(keys, opts);
+		const flowManager = getFlowManager();
+		await flowManager.reload();
+		return result;
+	}
+};
+
+//#endregion
+export { OperationsService };

package/dist/services/panels.js

@@ -1,6 +1,11 @@
-import { ItemsService } from './items.js';
-export class PanelsService extends ItemsService {
-    constructor(options) {
-        super('directus_panels', options);
-    }
-}
+import { ItemsService } from "./items.js";
+
+//#region src/services/panels.ts
+var PanelsService = class extends ItemsService {
+	constructor(options) {
+		super("directus_panels", options);
+	}
+};
+
+//#endregion
+export { PanelsService };