@antelopejs/dms-mailing 0.2.3 → 0.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +7 -8
- package/dist/antelope-modules.d.ts +5 -5
- package/dist/antelope-modules.js +5 -5
- package/dist/antelope-modules.js.map +1 -1
- package/dist/constants.d.ts +0 -3
- package/dist/constants.js +1 -4
- package/dist/constants.js.map +1 -1
- package/dist/crons/retention.js +1 -1
- package/dist/crons/retention.js.map +1 -1
- package/dist/data/templates-table.d.ts +1 -1
- package/dist/data/templates-table.js +21 -0
- package/dist/data/templates-table.js.map +1 -1
- package/dist/data-types/categories-type.d.ts +5 -5
- package/dist/db/models/sends.model.d.ts +2 -1
- package/dist/db/models/sends.model.js +1 -0
- package/dist/db/models/sends.model.js.map +1 -1
- package/dist/db/models/settings.model.d.ts +1 -1
- package/dist/db/models/settings.model.js +4 -1
- package/dist/db/models/settings.model.js.map +1 -1
- package/dist/db/tables/send-events.table.js +0 -1
- package/dist/db/tables/send-events.table.js.map +1 -1
- package/dist/db/tables/sends.table.js +0 -1
- package/dist/db/tables/sends.table.js.map +1 -1
- package/dist/db/tables/templates.table.js +0 -1
- package/dist/db/tables/templates.table.js.map +1 -1
- package/dist/hooks/tenant-export.js +1 -1
- package/dist/hooks/tenant-export.js.map +1 -1
- package/dist/pages/editor.js +0 -1
- package/dist/pages/editor.js.map +1 -1
- package/dist/pages/module.d.ts +1 -1
- package/dist/pages/overview.d.ts +5 -5
- package/dist/pages/overview.js +0 -1
- package/dist/pages/overview.js.map +1 -1
- package/dist/pages/sends.d.ts +3 -3
- package/dist/pages/sends.js +0 -1
- package/dist/pages/sends.js.map +1 -1
- package/dist/pages/settings/form.d.ts +1 -1
- package/dist/pages/settings/page.d.ts +2 -2
- package/dist/pages/settings/page.js +0 -2
- package/dist/pages/settings/page.js.map +1 -1
- package/dist/pages/templates.d.ts +1 -1
- package/dist/pages/templates.js +0 -1
- package/dist/pages/templates.js.map +1 -1
- package/dist/permissions.js +10 -32
- package/dist/permissions.js.map +1 -1
- package/dist/quick-actions.d.ts +2 -2
- package/dist/routes/events.js +2 -2
- package/dist/routes/events.js.map +1 -1
- package/dist/routes/period.js +7 -4
- package/dist/routes/period.js.map +1 -1
- package/dist/routes/templates.d.ts +2 -2
- package/dist/services/attention.d.ts +3 -3
- package/dist/services/categories.d.ts +5 -5
- package/dist/services/events.d.ts +1 -1
- package/dist/services/events.js.map +1 -1
- package/dist/services/metrics.d.ts +4 -4
- package/dist/services/settings.d.ts +1 -0
- package/dist/services/settings.js +25 -8
- package/dist/services/settings.js.map +1 -1
- package/dist/test/antelope.test.js +1 -0
- package/dist/test/antelope.test.js.map +1 -1
- package/dist/test/integration/events.test.js +11 -0
- package/dist/test/integration/events.test.js.map +1 -1
- package/dist/test/integration/sends.test.js +53 -0
- package/dist/test/integration/sends.test.js.map +1 -1
- package/dist/test/integration/settings.test.js +92 -0
- package/dist/test/integration/settings.test.js.map +1 -1
- package/dist/test/integration/templates.test.js +68 -2
- package/dist/test/integration/templates.test.js.map +1 -1
- package/dist/test/unit/period.test.js +17 -0
- package/dist/test/unit/period.test.js.map +1 -1
- package/dist/test/unit/permissions.test.d.ts +1 -0
- package/dist/test/unit/permissions.test.js +27 -0
- package/dist/test/unit/permissions.test.js.map +1 -0
- package/dist/test/unit/webhook-secret.test.js +1 -0
- package/dist/test/unit/webhook-secret.test.js.map +1 -1
- package/dist/validation/settings.schema.d.ts +6 -6
- package/dist/validation/templates.schema.d.ts +14 -14
- package/frontend-vue/app/components/editor/EditorDataPanel.vue +3 -1
- package/frontend-vue/i18n/locales/mailing-en-GB.json +1 -0
- package/frontend-vue/i18n/locales/mailing-fr-FR.json +1 -0
- package/frontend-vue/package.json +1 -1
- package/frontend-vue/pnpm-lock.yaml +2 -28
- package/package.json +10 -12
- package/src/antelope-modules.ts +5 -5
- package/src/constants.ts +0 -3
- package/src/crons/retention.ts +3 -1
- package/src/data/templates-table.ts +46 -0
- package/src/db/models/sends.model.ts +6 -2
- package/src/db/models/settings.model.ts +7 -1
- package/src/db/tables/send-events.table.ts +0 -1
- package/src/db/tables/sends.table.ts +0 -1
- package/src/db/tables/templates.table.ts +0 -1
- package/src/hooks/tenant-export.ts +1 -1
- package/src/pages/editor.ts +1 -2
- package/src/pages/overview.ts +0 -2
- package/src/pages/sends.ts +1 -7
- package/src/pages/settings/page.ts +1 -3
- package/src/pages/templates.ts +1 -7
- package/src/permissions.ts +14 -42
- package/src/routes/events.ts +3 -3
- package/src/routes/metrics.ts +3 -3
- package/src/routes/period.ts +9 -4
- package/src/routes/templates.ts +1 -1
- package/src/services/attention.ts +5 -5
- package/src/services/events.ts +4 -4
- package/src/services/metrics.ts +9 -9
- package/src/services/settings.ts +36 -7
- package/src/test/antelope.test.ts +2 -0
- package/src/test/integration/events.test.ts +24 -1
- package/src/test/integration/sends.test.ts +33 -0
- package/src/test/integration/settings.test.ts +78 -0
- package/src/test/integration/templates.test.ts +49 -6
- package/src/test/unit/period.test.ts +27 -0
- package/src/test/unit/permissions.test.ts +30 -0
- package/src/test/unit/webhook-secret.test.ts +1 -0
- package/frontend-vue/tests/email-render-cases.json +0 -77
|
@@ -5,6 +5,6 @@ declare const TemplatesPageController_base: {
|
|
|
5
5
|
location: string;
|
|
6
6
|
};
|
|
7
7
|
export declare class TemplatesPageController extends TemplatesPageController_base {
|
|
8
|
-
static table: import("@antelopejs/interface-dms").ComponentBuilder<import("@antelopejs/interface-dms/
|
|
8
|
+
static table: import("@antelopejs/interface-dms").ComponentBuilder<import("@antelopejs/interface-dms/base").TableViewOptionsSerialized>;
|
|
9
9
|
}
|
|
10
10
|
export {};
|
package/dist/pages/templates.js
CHANGED
|
@@ -39,7 +39,6 @@ let TemplatesPageController = class TemplatesPageController extends (0, page_1.P
|
|
|
39
39
|
icon: "i-ph-envelope-simple",
|
|
40
40
|
module: constants_1.MODULE_ID,
|
|
41
41
|
order: TEMPLATES_ORDER,
|
|
42
|
-
permission: { id: constants_1.MAILING_ACCESS_PERMISSION },
|
|
43
42
|
}, (0, layouts_1.DefaultLayout)({ fullWidth: true })) {
|
|
44
43
|
static table = (0, table_view_1.TableView)(templates_table_1.TemplatesTableAPI, {
|
|
45
44
|
caption: "$dms_mailing.templates.title",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"templates.js","sourceRoot":"","sources":["../../src/pages/templates.ts"],"names":[],"mappings":";;;;;;;;;AAAA,yDAA8E;AAC9E,oEAAuE;AAEvE,kEAAwE;AACxE,0EAAsE;AACtE,
|
|
1
|
+
{"version":3,"file":"templates.js","sourceRoot":"","sources":["../../src/pages/templates.ts"],"names":[],"mappings":"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"}
|
package/dist/permissions.js
CHANGED
|
@@ -1,37 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const page_1 = require("@antelopejs/interface-dms/page");
|
|
3
4
|
const permissions_1 = require("@antelopejs/interface-dms/permissions");
|
|
4
5
|
const constants_1 = require("./constants");
|
|
5
|
-
const
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
title: "Manage e-mail templates",
|
|
15
|
-
icon: "i-ph-note-pencil",
|
|
16
|
-
description: "Create, edit, publish, duplicate and archive templates",
|
|
17
|
-
dependencies: [constants_1.MAILING_ACCESS_PERMISSION],
|
|
18
|
-
},
|
|
19
|
-
{
|
|
20
|
-
id: constants_1.MAILING_SEND_PERMISSION,
|
|
21
|
-
title: "Send e-mails and tests",
|
|
22
|
-
icon: "i-ph-paper-plane-tilt",
|
|
23
|
-
description: "Trigger test sends and replay a previous send",
|
|
24
|
-
dependencies: [constants_1.MAILING_ACCESS_PERMISSION],
|
|
25
|
-
},
|
|
26
|
-
{
|
|
27
|
-
id: constants_1.MAILING_SETTINGS_MANAGE_PERMISSION,
|
|
28
|
-
title: "Manage mailing settings",
|
|
29
|
-
icon: "i-ph-sliders",
|
|
30
|
-
description: "Edit sender identity, retention and template categories",
|
|
31
|
-
dependencies: [constants_1.MAILING_ACCESS_PERMISSION],
|
|
32
|
-
},
|
|
33
|
-
];
|
|
34
|
-
for (const permission of MAILING_PERMISSIONS) {
|
|
35
|
-
(0, permissions_1.RegisterPermission)(permission.id, permission);
|
|
36
|
-
}
|
|
6
|
+
const sends_1 = require("./pages/sends");
|
|
7
|
+
const sendsPagePermissionId = (0, page_1.GetPermissionId)(sends_1.SendsPageController);
|
|
8
|
+
(0, permissions_1.RegisterPermission)(constants_1.MAILING_SEND_PERMISSION, {
|
|
9
|
+
id: constants_1.MAILING_SEND_PERMISSION,
|
|
10
|
+
title: "Send e-mails and tests",
|
|
11
|
+
icon: "i-ph-paper-plane-tilt",
|
|
12
|
+
description: "Trigger test sends and replay a previous send",
|
|
13
|
+
dependencies: sendsPagePermissionId ? [sendsPagePermissionId] : [],
|
|
14
|
+
});
|
|
37
15
|
//# sourceMappingURL=permissions.js.map
|
package/dist/permissions.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../src/permissions.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../src/permissions.ts"],"names":[],"mappings":";;AAAA,yDAAiE;AACjE,uEAA2E;AAC3E,2CAAsD;AACtD,yCAAoD;AAIpD,MAAM,qBAAqB,GAAG,IAAA,sBAAe,EAAC,2BAAmB,CAAC,CAAC;AAEnE,IAAA,gCAAkB,EAAC,mCAAuB,EAAE;IAC1C,EAAE,EAAE,mCAAuB;IAC3B,KAAK,EAAE,wBAAwB;IAC/B,IAAI,EAAE,uBAAuB;IAC7B,WAAW,EAAE,+CAA+C;IAC5D,YAAY,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,EAAE;CACnE,CAAC,CAAC"}
|
package/dist/quick-actions.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const mailingQuickActionCategory: import("@antelopejs/interface-dms
|
|
2
|
-
export declare const newTemplateQuickAction: import("@antelopejs/interface-dms
|
|
1
|
+
export declare const mailingQuickActionCategory: import("@antelopejs/interface-dms").QuickActionCategoryInfo;
|
|
2
|
+
export declare const newTemplateQuickAction: import("@antelopejs/interface-dms").QuickActionInfo;
|
package/dist/routes/events.js
CHANGED
|
@@ -34,8 +34,8 @@ class MailingEventsController extends (0, interface_api_1.Controller)(`${constan
|
|
|
34
34
|
async receive(provider, secret, body) {
|
|
35
35
|
const event = (0, interface_api_util_1.assertValidation)(body, (value) => eventSchema.parse(value));
|
|
36
36
|
const tenantId = event.tenantId ?? (0, request_tenant_1.getRequestTenantId)(this.ctx);
|
|
37
|
-
const settings = await (0, settings_1.
|
|
38
|
-
(0, interface_api_util_1.assert)((0, events_1.webhookSecretMatches)(secret, settings
|
|
37
|
+
const settings = await (0, settings_1.findSettings)(tenantId);
|
|
38
|
+
(0, interface_api_util_1.assert)((0, events_1.webhookSecretMatches)(secret, settings?.webhookSecret), constants_1.HTTP_FORBIDDEN, BAD_SECRET);
|
|
39
39
|
const recorded = await (0, events_1.recordEmailEvent)(tenantId, {
|
|
40
40
|
provider,
|
|
41
41
|
messageId: event.messageId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../src/routes/events.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6DAOmC;AACnC,uEAA0E;AAC1E,6EAA8E;AAC9E,6BAAwB;AACxB,4CAA6D;AAC7D,+CAA4E;AAC5E,
|
|
1
|
+
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../src/routes/events.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6DAOmC;AACnC,uEAA0E;AAC1E,6EAA8E;AAC9E,6BAAwB;AACxB,4CAA6D;AAC7D,+CAA4E;AAC5E,mDAAoD;AACpD,oCAA0D;AAE1D,MAAM,aAAa,GAAG,0BAA0B,CAAC;AACjD,MAAM,UAAU,GAAG,wCAAwC,CAAC;AAE5D,MAAM,WAAW,GAAG,OAAC,CAAC,MAAM,CAAC;IAC3B,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5B,IAAI,EAAE,OAAC,CAAC,IAAI,CAAC,qBAA8C,CAAC;IAC5D,EAAE,EAAE,OAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE;IAC9B,OAAO,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE;IACzC,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAChC,CAAC,CAAC;AAEH,MAAa,uBAAwB,SAAQ,IAAA,0BAAU,EACrD,GAAG,yBAAa,SAAS,CAC1B;IAKO,AAAN,KAAK,CAAC,OAAO,CACqB,QAAgB,EACZ,MAA0B,EAClD,IAAa;QAEzB,MAAM,KAAK,GAAG,IAAA,qCAAgB,EAAC,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1E,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,IAAI,IAAA,mCAAkB,EAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAChE,MAAM,QAAQ,GAAG,MAAM,IAAA,uBAAY,EAAC,QAAQ,CAAC,CAAC;QAC9C,IAAA,2BAAM,EACJ,IAAA,6BAAoB,EAAC,MAAM,EAAE,QAAQ,EAAE,aAAa,CAAC,EACrD,0BAAc,EACd,UAAU,CACX,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,IAAA,yBAAgB,EAAC,QAAQ,EAAE;YAChD,QAAQ;YACR,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,EAAE,EAAE,KAAK,CAAC,EAAE;YACZ,OAAO,EAAE,KAAK,CAAC,OAAO;SACvB,CAAC,CAAC;QACH,OAAO,EAAE,QAAQ,EAAE,CAAC;IACtB,CAAC;CACF;AA7BD,0DA6BC;AAzBS;IADP,IAAA,uBAAO,GAAE;;oDACkB;AAGtB;IADL,IAAA,oBAAI,EAAC,YAAY,CAAC;IAEhB,WAAA,IAAA,yBAAS,EAAC,UAAU,EAAE,OAAO,CAAC,CAAA;IAC9B,WAAA,IAAA,yBAAS,EAAC,aAAa,EAAE,QAAQ,CAAC,CAAA;IAClC,WAAA,IAAA,wBAAQ,GAAE,CAAA;;;;sDAkBZ"}
|
package/dist/routes/period.js
CHANGED
|
@@ -14,19 +14,22 @@ function parseDate(raw) {
|
|
|
14
14
|
const parsed = new Date(raw);
|
|
15
15
|
return Number.isNaN(parsed.getTime()) ? undefined : parsed;
|
|
16
16
|
}
|
|
17
|
+
function clampToMaxWindow(requested, to) {
|
|
18
|
+
const earliest = to.getTime() - constants_1.MAX_WINDOW_DAYS * DAY_MS;
|
|
19
|
+
const from = requested.getTime() < earliest ? new Date(earliest) : requested;
|
|
20
|
+
return { from, to };
|
|
21
|
+
}
|
|
17
22
|
function currentRange(ctx) {
|
|
18
23
|
const to = parseDate(readQuery(ctx, "to")) ?? new Date();
|
|
19
24
|
const requested = parseDate(readQuery(ctx, "from")) ??
|
|
20
25
|
new Date(to.getTime() - DEFAULT_WINDOW_DAYS * DAY_MS);
|
|
21
|
-
|
|
22
|
-
const from = requested.getTime() < earliest ? new Date(earliest) : requested;
|
|
23
|
-
return { from, to };
|
|
26
|
+
return clampToMaxWindow(requested, to);
|
|
24
27
|
}
|
|
25
28
|
function comparisonRange(ctx, current) {
|
|
26
29
|
const from = parseDate(readQuery(ctx, "compareFrom"));
|
|
27
30
|
const to = parseDate(readQuery(ctx, "compareTo"));
|
|
28
31
|
if (from && to)
|
|
29
|
-
return
|
|
32
|
+
return clampToMaxWindow(from, to);
|
|
30
33
|
const span = current.to.getTime() - current.from.getTime();
|
|
31
34
|
return {
|
|
32
35
|
from: new Date(current.from.getTime() - span),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"period.js","sourceRoot":"","sources":["../../src/routes/period.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"period.js","sourceRoot":"","sources":["../../src/routes/period.ts"],"names":[],"mappings":";;AA8BA,oCAMC;AAED,0CAYC;AA3CD,4CAA+C;AAG/C,MAAM,MAAM,GAAG,UAAU,CAAC;AAC1B,MAAM,mBAAmB,GAAG,EAAE,CAAC;AAE/B,SAAS,SAAS,CAAC,GAAiB,EAAE,GAAW;IAC/C,OAAO,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC;AACpD,CAAC;AAED,SAAS,SAAS,CAAC,GAAuB;IACxC,IAAI,CAAC,GAAG;QAAE,OAAO,SAAS,CAAC;IAC3B,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7B,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;AAC7D,CAAC;AAGD,SAAS,gBAAgB,CAAC,SAAe,EAAE,EAAQ;IACjD,MAAM,QAAQ,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,2BAAe,GAAG,MAAM,CAAC;IACzD,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7E,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;AACtB,CAAC;AAED,SAAgB,YAAY,CAAC,GAAiB;IAC5C,MAAM,EAAE,GAAG,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;IACzD,MAAM,SAAS,GACb,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACjC,IAAI,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,mBAAmB,GAAG,MAAM,CAAC,CAAC;IACxD,OAAO,gBAAgB,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AACzC,CAAC;AAED,SAAgB,eAAe,CAC7B,GAAiB,EACjB,OAAkB;IAElB,MAAM,IAAI,GAAG,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC;IACtD,MAAM,EAAE,GAAG,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC;IAClD,IAAI,IAAI,IAAI,EAAE;QAAE,OAAO,gBAAgB,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAClD,MAAM,IAAI,GAAG,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;IAC3D,OAAO;QACL,IAAI,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC;QAC7C,EAAE,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;KACrC,CAAC;AACJ,CAAC"}
|
|
@@ -39,9 +39,9 @@ export declare class TemplatesController extends TemplatesController_base {
|
|
|
39
39
|
private transition;
|
|
40
40
|
variables(id: string, body: unknown): Promise<{
|
|
41
41
|
variables: {
|
|
42
|
-
required: boolean;
|
|
43
|
-
type: "string" | "number" | "boolean" | "url" | "text" | "date" | "array" | "money";
|
|
44
42
|
path: string;
|
|
43
|
+
type: "string" | "number" | "boolean" | "date" | "array" | "url" | "text" | "money";
|
|
44
|
+
required: boolean;
|
|
45
45
|
}[];
|
|
46
46
|
}>;
|
|
47
47
|
testData(id: string, body: unknown): Promise<{
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { SendSummary, MailingTemplate } from "../db";
|
|
2
2
|
export type AttentionTone = "error" | "warning" | "neutral";
|
|
3
3
|
export interface AttentionItem {
|
|
4
4
|
id: string;
|
|
@@ -11,8 +11,8 @@ export interface AttentionItem {
|
|
|
11
11
|
}
|
|
12
12
|
export interface AttentionWindow {
|
|
13
13
|
templates: MailingTemplate[];
|
|
14
|
-
sends:
|
|
15
|
-
excluded:
|
|
14
|
+
sends: SendSummary[];
|
|
15
|
+
excluded: SendSummary[];
|
|
16
16
|
tracking: ProviderTracking | null;
|
|
17
17
|
}
|
|
18
18
|
export interface ProviderTracking {
|
|
@@ -6,29 +6,29 @@ export declare const CATEGORIES_SCHEMA: z.ZodPipeline<z.ZodEffects<z.ZodUnion<[z
|
|
|
6
6
|
label: z.ZodString;
|
|
7
7
|
icon: z.ZodString;
|
|
8
8
|
}, "strip", z.ZodTypeAny, {
|
|
9
|
-
id: string;
|
|
10
9
|
label: string;
|
|
11
10
|
icon: string;
|
|
12
|
-
}, {
|
|
13
11
|
id: string;
|
|
12
|
+
}, {
|
|
14
13
|
label: string;
|
|
15
14
|
icon: string;
|
|
16
|
-
}>, "many">]>, unknown, string | {
|
|
17
15
|
id: string;
|
|
16
|
+
}>, "many">]>, unknown, string | {
|
|
18
17
|
label: string;
|
|
19
18
|
icon: string;
|
|
19
|
+
id: string;
|
|
20
20
|
}[]>, z.ZodArray<z.ZodObject<{
|
|
21
21
|
id: z.ZodString;
|
|
22
22
|
label: z.ZodString;
|
|
23
23
|
icon: z.ZodString;
|
|
24
24
|
}, "strip", z.ZodTypeAny, {
|
|
25
|
-
id: string;
|
|
26
25
|
label: string;
|
|
27
26
|
icon: string;
|
|
28
|
-
}, {
|
|
29
27
|
id: string;
|
|
28
|
+
}, {
|
|
30
29
|
label: string;
|
|
31
30
|
icon: string;
|
|
31
|
+
id: string;
|
|
32
32
|
}>, "many">>;
|
|
33
33
|
export declare function parseCategories(raw: unknown): TemplateCategory[];
|
|
34
34
|
export declare function reassignRemovedCategories(templates: MailingTemplate[], categories: TemplateCategory[]): string[];
|
|
@@ -7,4 +7,4 @@ export interface SendCounters {
|
|
|
7
7
|
}
|
|
8
8
|
export declare function applyEvent(current: SendCounters, type: SendEventType): SendCounters;
|
|
9
9
|
export declare function recordEmailEvent(tenantId: string, event: EmailEvent): Promise<boolean>;
|
|
10
|
-
export declare function webhookSecretMatches(provided: string | undefined, stored: string): boolean;
|
|
10
|
+
export declare function webhookSecretMatches(provided: string | undefined, stored: string | undefined): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../src/services/events.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../src/services/events.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { SendSummary } from "../db";
|
|
2
2
|
import { type SendAudience } from "../types";
|
|
3
3
|
export declare function readAudience(raw: string | null | undefined): SendAudience;
|
|
4
|
-
export declare function forAudience(sends:
|
|
4
|
+
export declare function forAudience(sends: SendSummary[], audience: SendAudience): SendSummary[];
|
|
5
5
|
export interface Totals {
|
|
6
6
|
sends: number;
|
|
7
7
|
queued: number;
|
|
@@ -27,8 +27,8 @@ export interface DateRange {
|
|
|
27
27
|
to: Date;
|
|
28
28
|
}
|
|
29
29
|
export declare const ratio: (part: number, whole: number) => number;
|
|
30
|
-
export declare function aggregate(sends:
|
|
30
|
+
export declare function aggregate(sends: SendSummary[]): Totals;
|
|
31
31
|
export declare function deltaPercent(current: number, previous: number): number;
|
|
32
|
-
export declare function dailySeries(sends:
|
|
32
|
+
export declare function dailySeries(sends: SendSummary[], from: Date, to: Date): SeriesPoint[];
|
|
33
33
|
export declare function domainOf(email: string): string;
|
|
34
34
|
export declare function groupBy<T>(items: T[], key: (item: T) => string): Map<string, T[]>;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { type MailingSettingsValues, type TemplateCategory } from "../types";
|
|
2
|
+
export declare function findSettings(tenantId: string): Promise<MailingSettingsValues | undefined>;
|
|
2
3
|
export declare function getSettings(tenantId: string): Promise<MailingSettingsValues>;
|
|
3
4
|
export declare function saveSettings(tenantId: string, values: MailingSettingsValues): Promise<MailingSettingsValues>;
|
|
4
5
|
export declare function findCategory(categories: TemplateCategory[], id: string): TemplateCategory | undefined;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.findSettings = findSettings;
|
|
3
4
|
exports.getSettings = getSettings;
|
|
4
5
|
exports.saveSettings = saveSettings;
|
|
5
6
|
exports.findCategory = findCategory;
|
|
@@ -37,22 +38,38 @@ function toRow(values) {
|
|
|
37
38
|
const { categories, ...rest } = values;
|
|
38
39
|
return { ...rest, json_categories: JSON.stringify(categories) };
|
|
39
40
|
}
|
|
40
|
-
async function
|
|
41
|
+
async function findSettings(tenantId) {
|
|
42
|
+
const existing = await (0, interface_database_decorators_1.GetModel)(db_1.SettingsModel, tenantId).getSingleton(tenantId);
|
|
43
|
+
return existing ? toValues(existing) : undefined;
|
|
44
|
+
}
|
|
45
|
+
async function insertKeyedSettings(tenantId, values) {
|
|
41
46
|
const model = (0, interface_database_decorators_1.GetModel)(db_1.SettingsModel, tenantId);
|
|
42
|
-
|
|
47
|
+
try {
|
|
48
|
+
await model.insert({ ...toRow(values), _id: tenantId });
|
|
49
|
+
return true;
|
|
50
|
+
}
|
|
51
|
+
catch (error) {
|
|
52
|
+
if (await model.get(tenantId))
|
|
53
|
+
return false;
|
|
54
|
+
throw error;
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
async function getSettings(tenantId) {
|
|
58
|
+
const existing = await findSettings(tenantId);
|
|
43
59
|
if (existing)
|
|
44
|
-
return
|
|
60
|
+
return existing;
|
|
45
61
|
const created = defaults();
|
|
46
|
-
await
|
|
47
|
-
|
|
62
|
+
if (await insertKeyedSettings(tenantId, created))
|
|
63
|
+
return created;
|
|
64
|
+
return (await findSettings(tenantId));
|
|
48
65
|
}
|
|
49
66
|
async function saveSettings(tenantId, values) {
|
|
50
67
|
const model = (0, interface_database_decorators_1.GetModel)(db_1.SettingsModel, tenantId);
|
|
51
|
-
const existing = await model.getSingleton();
|
|
68
|
+
const existing = await model.getSingleton(tenantId);
|
|
52
69
|
if (existing)
|
|
53
70
|
await model.update(existing._id, toRow(values));
|
|
54
|
-
else
|
|
55
|
-
await model.
|
|
71
|
+
else if (!(await insertKeyedSettings(tenantId, values)))
|
|
72
|
+
await model.update(tenantId, toRow(values));
|
|
56
73
|
return values;
|
|
57
74
|
}
|
|
58
75
|
function findCategory(categories, id) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../src/services/settings.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../src/services/settings.ts"],"names":[],"mappings":"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"}
|
|
@@ -116,6 +116,7 @@ exports.default = (0, config_1.defineConfig)({
|
|
|
116
116
|
source: antelope_modules_1.SHARED_MODULE_SOURCES.api,
|
|
117
117
|
config: {
|
|
118
118
|
servers: [{ protocol: "http", host: "127.0.0.1", port: API_PORT }],
|
|
119
|
+
publicBaseUrl: `http://127.0.0.1:${API_PORT}`,
|
|
119
120
|
},
|
|
120
121
|
},
|
|
121
122
|
"file-storage-local": {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"antelope.test.js","sourceRoot":"","sources":["../../src/test/antelope.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"antelope.test.js","sourceRoot":"","sources":["../../src/test/antelope.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,6 +39,7 @@ const http_1 = require("../helpers/http");
|
|
|
39
39
|
const owner_1 = require("../helpers/owner");
|
|
40
40
|
const HTTP_OK = 200;
|
|
41
41
|
const HTTP_FORBIDDEN = 403;
|
|
42
|
+
const SECRET_LENGTH = 48;
|
|
42
43
|
const TABLE = "/api/mailing/tables/templates";
|
|
43
44
|
describe("[integration] events", () => {
|
|
44
45
|
it("records a webhook event against the send that carries the provider message id", async () => {
|
|
@@ -103,6 +104,16 @@ describe("[integration] events", () => {
|
|
|
103
104
|
(0, chai_1.expect)(after.data.send.status).to.equal("delivered");
|
|
104
105
|
});
|
|
105
106
|
});
|
|
107
|
+
describe("[integration] webhook for a tenant without settings", () => {
|
|
108
|
+
it("refuses the event and stores nothing", async () => {
|
|
109
|
+
const { GetModel } = await Promise.resolve().then(() => __importStar(require("@antelopejs/interface-database-decorators")));
|
|
110
|
+
const { SettingsModel } = await Promise.resolve().then(() => __importStar(require("../../db")));
|
|
111
|
+
const tenantId = `unknown-tenant-${Date.now()}`;
|
|
112
|
+
const hook = await (0, http_1.createClient)().post("/api/mailing/events/manual", { messageId: "unknown-message", type: "opened", tenantId }, { headers: { "x-mailing-webhook-secret": "a".repeat(SECRET_LENGTH) } });
|
|
113
|
+
(0, chai_1.expect)(hook.status).to.equal(HTTP_FORBIDDEN);
|
|
114
|
+
(0, chai_1.expect)(await GetModel(SettingsModel, tenantId).getAll()).to.have.lengthOf(0);
|
|
115
|
+
});
|
|
116
|
+
});
|
|
106
117
|
describe("[integration] send event purge", () => {
|
|
107
118
|
it("deletes only the events of the send it targets", async () => {
|
|
108
119
|
const { GetModel } = await Promise.resolve().then(() => __importStar(require("@antelopejs/interface-database-decorators")));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.test.js","sourceRoot":"","sources":["../../../src/test/integration/events.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA8B;AAC9B,8EAG8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"events.test.js","sourceRoot":"","sources":["../../../src/test/integration/events.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,37 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
2
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
36
|
const chai_1 = require("chai");
|
|
4
37
|
const http_1 = require("../helpers/http");
|
|
@@ -32,6 +65,26 @@ describe("[integration] sends", () => {
|
|
|
32
65
|
(0, chai_1.expect)(detail.data.send.templateSlug).to.equal("test-send");
|
|
33
66
|
(0, chai_1.expect)(detail.data.events[0].type).to.equal(detail.data.send.status);
|
|
34
67
|
});
|
|
68
|
+
it("reads a metrics window without the rendered variables", async () => {
|
|
69
|
+
const session = await (0, owner_1.ensureOwnerSession)();
|
|
70
|
+
const client = (0, http_1.authorizedClient)(session.accessToken);
|
|
71
|
+
const created = await client.post(`${TABLE}/new`, {
|
|
72
|
+
slug: "metrics-window",
|
|
73
|
+
name: "Metrics window",
|
|
74
|
+
category: "orders",
|
|
75
|
+
});
|
|
76
|
+
const sent = await client.post(`/api/mailing/templates/${created.data[0]}/test-send`, { to: ["metrics@example.test"], locale: "en", data: { any: "value" } });
|
|
77
|
+
(0, chai_1.expect)(sent.status, JSON.stringify(sent.data)).to.equal(HTTP_OK);
|
|
78
|
+
const sendId = sent.data.results[0].sendId;
|
|
79
|
+
const { GetModel } = await Promise.resolve().then(() => __importStar(require("@antelopejs/interface-database-decorators")));
|
|
80
|
+
const { DEFAULT_TENANT_ID } = await Promise.resolve().then(() => __importStar(require("@antelopejs/interface-dms/constants")));
|
|
81
|
+
const { SendModel } = await Promise.resolve().then(() => __importStar(require("../../db")));
|
|
82
|
+
const now = Date.now();
|
|
83
|
+
const rows = await GetModel(SendModel, DEFAULT_TENANT_ID).listBetween(new Date(now - DAY_MS), new Date(now + DAY_MS));
|
|
84
|
+
const row = rows.find((candidate) => candidate._id === sendId);
|
|
85
|
+
(0, chai_1.expect)(row?.templateSlug).to.equal("metrics-window");
|
|
86
|
+
(0, chai_1.expect)(row).to.not.have.property("json_variables");
|
|
87
|
+
});
|
|
35
88
|
it("refuses a real send on a draft template", async () => {
|
|
36
89
|
const session = await (0, owner_1.ensureOwnerSession)();
|
|
37
90
|
const client = (0, http_1.authorizedClient)(session.accessToken);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sends.test.js","sourceRoot":"","sources":["../../../src/test/integration/sends.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"sends.test.js","sourceRoot":"","sources":["../../../src/test/integration/sends.test.ts"],"names":[],"mappings":"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"}
|