@antelopejs/dms-mailing 0.9.0 → 0.9.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/dist/db/tables/settings.table.d.ts +1 -0
- package/dist/db/tables/settings.table.js +4 -0
- package/dist/db/tables/settings.table.js.map +1 -1
- package/dist/hooks/tenant-export.d.ts +1 -1
- package/dist/hooks/tenant-export.js.map +1 -1
- package/dist/implementations/dms-mailing/index.d.ts +1 -0
- package/dist/implementations/dms-mailing/index.js +3 -1
- package/dist/implementations/dms-mailing/index.js.map +1 -1
- package/dist/pages/sends.js.map +1 -1
- package/dist/routes/settings.d.ts +3 -2
- package/dist/routes/settings.js +8 -4
- package/dist/routes/settings.js.map +1 -1
- package/dist/services/send-import.js +4 -4
- package/dist/services/send-import.js.map +1 -1
- package/dist/services/settings.d.ts +2 -1
- package/dist/services/settings.js +19 -1
- package/dist/services/settings.js.map +1 -1
- package/dist/services/webhook-secret-declaration.d.ts +4 -0
- package/dist/services/webhook-secret-declaration.js +25 -0
- package/dist/services/webhook-secret-declaration.js.map +1 -0
- package/dist/services/webhook-status.js +7 -2
- package/dist/services/webhook-status.js.map +1 -1
- package/dist/types/settings.d.ts +3 -0
- package/dist/types/settings.js +6 -1
- package/dist/types/settings.js.map +1 -1
- package/dist/validation/declarations.schema.d.ts +13 -0
- package/dist/validation/declarations.schema.js +6 -1
- package/dist/validation/declarations.schema.js.map +1 -1
- package/frontend-vue/app/components/editor/EditorCanvas.vue +8 -4
- package/frontend-vue/app/composables/useSortableList.ts +2 -2
- package/frontend-vue/package.json +37 -36
- package/frontend-vue/pnpm-lock.yaml +25 -5
- package/frontend-vue/tests/editor-canvas.test.ts +142 -0
- package/frontend-vue/tests/sortable-list.test-d.ts +19 -0
- package/frontend-vue/tsconfig.typecheck.json +12 -0
- package/frontend-vue/vitest.config.ts +16 -0
- package/package.json +4 -4
- package/skills/dms-mailing/SKILL.md +2 -0
- package/src/db/tables/settings.table.ts +4 -0
- package/src/hooks/tenant-export.ts +4 -1
- package/src/implementations/dms-mailing/index.ts +1 -0
- package/src/pages/sends.ts +3 -2
- package/src/routes/settings.ts +19 -7
- package/src/services/send-import.ts +10 -8
- package/src/services/settings.ts +40 -2
- package/src/services/webhook-secret-declaration.ts +47 -0
- package/src/services/webhook-status.ts +9 -5
- package/src/types/settings.ts +14 -0
- package/src/validation/declarations.schema.ts +7 -0
|
@@ -62,6 +62,10 @@ __decorate([
|
|
|
62
62
|
(0, interface_database_decorators_1.Field)("string"),
|
|
63
63
|
__metadata("design:type", String)
|
|
64
64
|
], MailingSettings.prototype, "webhookSecret", void 0);
|
|
65
|
+
__decorate([
|
|
66
|
+
(0, interface_database_decorators_1.Field)("string"),
|
|
67
|
+
__metadata("design:type", String)
|
|
68
|
+
], MailingSettings.prototype, "webhookSecretSource", void 0);
|
|
65
69
|
exports.MailingSettings = MailingSettings = __decorate([
|
|
66
70
|
(0, interface_database_decorators_1.RegisterTable)(exports.MAILING_SETTINGS_TABLE_NAME, constants_1.TENANT_SCHEMA_NAME)
|
|
67
71
|
], MailingSettings);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.table.js","sourceRoot":"","sources":["../../../src/db/tables/settings.table.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6FAMmD;AACnD,mEAAyE;AAE5D,QAAA,2BAA2B,GAAG,kBAAkB,CAAC;AAGvD,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,qCAAK;
|
|
1
|
+
{"version":3,"file":"settings.table.js","sourceRoot":"","sources":["../../../src/db/tables/settings.table.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6FAMmD;AACnD,mEAAyE;AAE5D,QAAA,2BAA2B,GAAG,kBAAkB,CAAC;AAGvD,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,qCAAK;CAwCzC,CAAA;AAxCY,0CAAe;AAElB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;4CACI;AAIZ;IAFP,IAAA,4CAAY,GAAE;IACd,IAAA,qCAAK,EAAC,MAAM,CAAC;8BACK,IAAI;kDAAC;AAIhB;IAFP,IAAA,0CAAU,GAAE;IACZ,IAAA,qCAAK,EAAC,MAAM,CAAC;8BACK,IAAI;kDAAC;AAGhB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;uDACe;AAGvB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;yDACiB;AAGzB;IADP,IAAA,qCAAK,EAAC,SAAS,CAAC;;gEACwB;AAGjC;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;mDACW;AAGnB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;oDACY;AAGpB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;gDACQ;AAIhB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;wDACgB;AAGxB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;sDACc;AAItB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;4DACqB;0BAvC1B,eAAe;IAD3B,IAAA,6CAAa,EAAC,mCAA2B,EAAE,8BAAkB,CAAC;GAClD,eAAe,CAwC3B"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Hook, type HookHandler } from "@antelopejs/interface-dms/hooks";
|
|
2
2
|
import type { MailingSettingsValues } from "../types";
|
|
3
|
-
export type ExportedSettings = Omit<MailingSettingsValues, "webhookSecret">;
|
|
3
|
+
export type ExportedSettings = Omit<MailingSettingsValues, "webhookSecret" | "webhookSecretSource">;
|
|
4
4
|
export type ExportPageLoader<T> = (offset: number, size: number) => Promise<T[]>;
|
|
5
5
|
export interface ExportedCollection {
|
|
6
6
|
entry: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tenant-export.js","sourceRoot":"","sources":["../../src/hooks/tenant-export.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"tenant-export.js","sourceRoot":"","sources":["../../src/hooks/tenant-export.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export { declareTemplate as DeclareTemplate, declareTemplateCategory as DeclareTemplateCategory, } from "../../services/declarations";
|
|
2
2
|
export { importSends as ImportSends } from "../../services/send-import";
|
|
3
3
|
export { declareSender as DeclareSender } from "../../services/sender-declaration";
|
|
4
|
+
export { declareWebhookSecret as DeclareWebhookSecret } from "../../services/webhook-secret-declaration";
|
|
4
5
|
export { recordEmailEvent as RecordEmailEvent } from "../../services/events";
|
|
5
6
|
export { sendUnlessSuppressed as SendTemplate } from "../../services/checked-send";
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.SendTemplate = exports.RecordEmailEvent = exports.DeclareSender = exports.ImportSends = exports.DeclareTemplateCategory = exports.DeclareTemplate = void 0;
|
|
3
|
+
exports.SendTemplate = exports.RecordEmailEvent = exports.DeclareWebhookSecret = exports.DeclareSender = exports.ImportSends = exports.DeclareTemplateCategory = exports.DeclareTemplate = void 0;
|
|
4
4
|
var declarations_1 = require("../../services/declarations");
|
|
5
5
|
Object.defineProperty(exports, "DeclareTemplate", { enumerable: true, get: function () { return declarations_1.declareTemplate; } });
|
|
6
6
|
Object.defineProperty(exports, "DeclareTemplateCategory", { enumerable: true, get: function () { return declarations_1.declareTemplateCategory; } });
|
|
@@ -8,6 +8,8 @@ var send_import_1 = require("../../services/send-import");
|
|
|
8
8
|
Object.defineProperty(exports, "ImportSends", { enumerable: true, get: function () { return send_import_1.importSends; } });
|
|
9
9
|
var sender_declaration_1 = require("../../services/sender-declaration");
|
|
10
10
|
Object.defineProperty(exports, "DeclareSender", { enumerable: true, get: function () { return sender_declaration_1.declareSender; } });
|
|
11
|
+
var webhook_secret_declaration_1 = require("../../services/webhook-secret-declaration");
|
|
12
|
+
Object.defineProperty(exports, "DeclareWebhookSecret", { enumerable: true, get: function () { return webhook_secret_declaration_1.declareWebhookSecret; } });
|
|
11
13
|
var events_1 = require("../../services/events");
|
|
12
14
|
Object.defineProperty(exports, "RecordEmailEvent", { enumerable: true, get: function () { return events_1.recordEmailEvent; } });
|
|
13
15
|
var checked_send_1 = require("../../services/checked-send");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/implementations/dms-mailing/index.ts"],"names":[],"mappings":";;;AAAA,4DAGqC;AAFnC,+GAAA,eAAe,OAAmB;AAClC,uHAAA,uBAAuB,OAA2B;AAEpD,0DAAwE;AAA/D,0GAAA,WAAW,OAAe;AACnC,wEAAmF;AAA1E,mHAAA,aAAa,OAAiB;AACvC,gDAA6E;AAApE,0GAAA,gBAAgB,OAAoB;AAC7C,4DAAmF;AAA1E,4GAAA,oBAAoB,OAAgB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/implementations/dms-mailing/index.ts"],"names":[],"mappings":";;;AAAA,4DAGqC;AAFnC,+GAAA,eAAe,OAAmB;AAClC,uHAAA,uBAAuB,OAA2B;AAEpD,0DAAwE;AAA/D,0GAAA,WAAW,OAAe;AACnC,wEAAmF;AAA1E,mHAAA,aAAa,OAAiB;AACvC,wFAAyG;AAAhG,kIAAA,oBAAoB,OAAwB;AACrD,gDAA6E;AAApE,0GAAA,gBAAgB,OAAoB;AAC7C,4DAAmF;AAA1E,4GAAA,oBAAoB,OAAgB"}
|
package/dist/pages/sends.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sends.js","sourceRoot":"","sources":["../../src/pages/sends.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"sends.js","sourceRoot":"","sources":["../../src/pages/sends.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,8 @@ import { SendModel, TemplateModel } from "../db";
|
|
|
4
4
|
import { type MissingVariablesPolicy } from "../services/settings";
|
|
5
5
|
import { type WebhookTestOutcome } from "../services/webhook-status";
|
|
6
6
|
import type { MailingSettingsValues, WebhookStatus } from "../types";
|
|
7
|
-
|
|
7
|
+
type FormSettings = Omit<MailingSettingsValues, "webhookSecretSource">;
|
|
8
|
+
export interface MailingSettingsResponse extends FormSettings {
|
|
8
9
|
webhookUrl: string;
|
|
9
10
|
provider: string;
|
|
10
11
|
missingVariables: MissingVariablesPolicy;
|
|
@@ -14,7 +15,7 @@ export interface SettingsNotice {
|
|
|
14
15
|
color?: string;
|
|
15
16
|
params?: Record<string, number | string>;
|
|
16
17
|
}
|
|
17
|
-
export interface SettingsWriteResponse extends
|
|
18
|
+
export interface SettingsWriteResponse extends FormSettings {
|
|
18
19
|
notice?: SettingsNotice;
|
|
19
20
|
}
|
|
20
21
|
export interface WebhookTestResponse extends WebhookTestOutcome {
|
package/dist/routes/settings.js
CHANGED
|
@@ -53,6 +53,10 @@ const retentionDaysSchema = zod_1.z.coerce
|
|
|
53
53
|
.int()
|
|
54
54
|
.min(settings_schema_1.MIN_RETENTION_DAYS)
|
|
55
55
|
.max(settings_schema_1.MAX_RETENTION_DAYS);
|
|
56
|
+
function formSettings(values) {
|
|
57
|
+
const { webhookSecretSource: _source, ...form } = values;
|
|
58
|
+
return form;
|
|
59
|
+
}
|
|
56
60
|
function providerSlug(name) {
|
|
57
61
|
const slug = (name ?? "").toLowerCase().replace(/[^a-z0-9]+/g, "-");
|
|
58
62
|
return slug || DEFAULT_PROVIDER_SLUG;
|
|
@@ -109,7 +113,7 @@ class MailingSettingsController extends (0, interface_api_1.Controller)(`${const
|
|
|
109
113
|
(0, provider_1.readCapabilities)(),
|
|
110
114
|
]);
|
|
111
115
|
return {
|
|
112
|
-
...values,
|
|
116
|
+
...formSettings(values),
|
|
113
117
|
webhookUrl: await this.providerWebhookUrl(capabilities?.name),
|
|
114
118
|
provider: capabilities?.name ?? "",
|
|
115
119
|
missingVariables: (0, settings_1.missingVariablesPolicy)(values),
|
|
@@ -125,7 +129,7 @@ class MailingSettingsController extends (0, interface_api_1.Controller)(`${const
|
|
|
125
129
|
? await this.reassignCategories(categories, (0, categories_1.categoryMoves)(entries))
|
|
126
130
|
: 0;
|
|
127
131
|
const [notice] = [...reassignedNotice(reassigned), ...senderNotice(saved)];
|
|
128
|
-
return { ...saved, ...(notice && { notice }) };
|
|
132
|
+
return { ...formSettings(saved), ...(notice && { notice }) };
|
|
129
133
|
}
|
|
130
134
|
readPatch(raw) {
|
|
131
135
|
const body = (0, body_1.parseBody)(raw);
|
|
@@ -133,9 +137,9 @@ class MailingSettingsController extends (0, interface_api_1.Controller)(`${const
|
|
|
133
137
|
return (0, interface_api_util_1.assertValidation)((0, settings_1.clearedToEmpty)(body), (value) => settings_schema_1.settingsPatchSchema.parse(value), (error) => error instanceof zod_1.z.ZodError ? invalidSettings(error) : INVALID_SETTINGS);
|
|
134
138
|
}
|
|
135
139
|
async rotateSecret() {
|
|
136
|
-
|
|
140
|
+
await (0, settings_1.getSettings)(this.tenantId);
|
|
137
141
|
const value = (0, node_crypto_1.randomBytes)(settings_1.WEBHOOK_SECRET_BYTES).toString("hex");
|
|
138
|
-
await (0, settings_1.
|
|
142
|
+
await (0, settings_1.saveWebhookSecret)(this.tenantId, value, "operator");
|
|
139
143
|
return { value };
|
|
140
144
|
}
|
|
141
145
|
async webhookStatus() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../src/routes/settings.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../src/routes/settings.ts"],"names":[],"mappings":"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"}
|
|
@@ -99,8 +99,10 @@ async function templatesOf(tenantId, sends) {
|
|
|
99
99
|
}
|
|
100
100
|
async function importOne(tenantId, send, template, fallbackLocale) {
|
|
101
101
|
const id = importedSendIdOf(tenantId, send.importId);
|
|
102
|
-
const sends = (0, interface_database_decorators_1.GetModel)(db_1.SendModel, tenantId);
|
|
103
102
|
const timeline = timelineOf(send);
|
|
103
|
+
const locale = send.locale ?? fallbackLocale;
|
|
104
|
+
const row = sendRow(id, send, template, locale, foldEvents(send, timeline));
|
|
105
|
+
const isImported = await (0, interface_database_decorators_1.GetModel)(db_1.SendModel, tenantId).insertImported(row);
|
|
104
106
|
const events = (0, interface_database_decorators_1.GetModel)(db_1.SendEventModel, tenantId);
|
|
105
107
|
for (const [index, entry] of timeline.entries()) {
|
|
106
108
|
await events.insertImported({
|
|
@@ -111,9 +113,7 @@ async function importOne(tenantId, send, template, fallbackLocale) {
|
|
|
111
113
|
json_details: JSON.stringify(entry.details ?? {}),
|
|
112
114
|
});
|
|
113
115
|
}
|
|
114
|
-
|
|
115
|
-
const row = sendRow(id, send, template, locale, foldEvents(send, timeline));
|
|
116
|
-
return { id, isImported: await sends.insertImported(row) };
|
|
116
|
+
return { id, isImported };
|
|
117
117
|
}
|
|
118
118
|
async function importSends(input) {
|
|
119
119
|
const { tenantId, sends } = (0, declaration_error_1.parseDeclared)(declarations_schema_1.sendImportSchema, input, "invalid_import", "send import");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send-import.js","sourceRoot":"","sources":["../../src/services/send-import.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"send-import.js","sourceRoot":"","sources":["../../src/services/send-import.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import { type MailingSettingsValues, type TemplateCategory } from "../types";
|
|
1
|
+
import { type MailingSettingsValues, type TemplateCategory, type WebhookSecretSource } from "../types";
|
|
2
2
|
import type { JsonObject } from "../types/json";
|
|
3
3
|
import type { SettingsPatch } from "../validation/settings.schema";
|
|
4
4
|
export declare const WEBHOOK_SECRET_BYTES = 24;
|
|
5
5
|
export declare function findSettings(tenantId: string): Promise<MailingSettingsValues | undefined>;
|
|
6
6
|
export declare function getSettings(tenantId: string): Promise<MailingSettingsValues>;
|
|
7
7
|
export declare function saveSettings(tenantId: string, values: MailingSettingsValues): Promise<MailingSettingsValues>;
|
|
8
|
+
export declare function saveWebhookSecret(tenantId: string, webhookSecret: string, webhookSecretSource: WebhookSecretSource): Promise<void>;
|
|
8
9
|
export declare function findCategory(categories: TemplateCategory[], id: string): TemplateCategory | undefined;
|
|
9
10
|
export type MissingVariablesPolicy = "refuse" | "send";
|
|
10
11
|
export declare function missingVariablesPolicy(values: Pick<MailingSettingsValues, "blockOnMissingVariables">): MissingVariablesPolicy;
|
|
@@ -4,6 +4,7 @@ exports.WEBHOOK_SECRET_BYTES = void 0;
|
|
|
4
4
|
exports.findSettings = findSettings;
|
|
5
5
|
exports.getSettings = getSettings;
|
|
6
6
|
exports.saveSettings = saveSettings;
|
|
7
|
+
exports.saveWebhookSecret = saveWebhookSecret;
|
|
7
8
|
exports.findCategory = findCategory;
|
|
8
9
|
exports.missingVariablesPolicy = missingVariablesPolicy;
|
|
9
10
|
exports.clearedToEmpty = clearedToEmpty;
|
|
@@ -13,6 +14,8 @@ const interface_database_decorators_1 = require("@antelopejs/interface-database-
|
|
|
13
14
|
const db_1 = require("../db");
|
|
14
15
|
const types_1 = require("../types");
|
|
15
16
|
exports.WEBHOOK_SECRET_BYTES = 24;
|
|
17
|
+
const GENERATED_SECRET = "generated";
|
|
18
|
+
const OPERATOR_SECRET = "operator";
|
|
16
19
|
function defaults() {
|
|
17
20
|
return {
|
|
18
21
|
...types_1.MODULE_DEFAULT_SETTINGS,
|
|
@@ -20,8 +23,13 @@ function defaults() {
|
|
|
20
23
|
senderEmail: "",
|
|
21
24
|
replyTo: "",
|
|
22
25
|
webhookSecret: (0, node_crypto_1.randomBytes)(exports.WEBHOOK_SECRET_BYTES).toString("hex"),
|
|
26
|
+
webhookSecretSource: GENERATED_SECRET,
|
|
23
27
|
};
|
|
24
28
|
}
|
|
29
|
+
function storedSecretSource(stored) {
|
|
30
|
+
return (types_1.WEBHOOK_SECRET_SOURCES.find((source) => source === stored) ??
|
|
31
|
+
OPERATOR_SECRET);
|
|
32
|
+
}
|
|
25
33
|
function toValues(row) {
|
|
26
34
|
return {
|
|
27
35
|
fallbackLocale: row.fallbackLocale,
|
|
@@ -31,6 +39,7 @@ function toValues(row) {
|
|
|
31
39
|
senderEmail: row.senderEmail,
|
|
32
40
|
replyTo: row.replyTo,
|
|
33
41
|
webhookSecret: row.webhookSecret,
|
|
42
|
+
webhookSecretSource: storedSecretSource(row.webhookSecretSource),
|
|
34
43
|
categories: JSON.parse(row.json_categories),
|
|
35
44
|
};
|
|
36
45
|
}
|
|
@@ -73,6 +82,12 @@ async function saveSettings(tenantId, values) {
|
|
|
73
82
|
await model.update(tenantId, toRow(values));
|
|
74
83
|
return values;
|
|
75
84
|
}
|
|
85
|
+
async function saveWebhookSecret(tenantId, webhookSecret, webhookSecretSource) {
|
|
86
|
+
await (0, interface_database_decorators_1.GetModel)(db_1.SettingsModel, tenantId).update(tenantId, {
|
|
87
|
+
webhookSecret,
|
|
88
|
+
webhookSecretSource,
|
|
89
|
+
});
|
|
90
|
+
}
|
|
76
91
|
function findCategory(categories, id) {
|
|
77
92
|
return categories.find((category) => category.id === id);
|
|
78
93
|
}
|
|
@@ -91,6 +106,9 @@ function mergeSettingsPatch(current, patch) {
|
|
|
91
106
|
const guard = isChoice && !("blockOnMissingVariables" in patch)
|
|
92
107
|
? { blockOnMissingVariables: policy === REFUSE_POLICY }
|
|
93
108
|
: {};
|
|
94
|
-
|
|
109
|
+
const merged = { ...current, ...written, ...guard };
|
|
110
|
+
return merged.webhookSecret === current.webhookSecret
|
|
111
|
+
? merged
|
|
112
|
+
: { ...merged, webhookSecretSource: OPERATOR_SECRET };
|
|
95
113
|
}
|
|
96
114
|
//# sourceMappingURL=settings.js.map
|
|
@@ -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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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import type { DeclareWebhookSecretResult, WebhookSecretDeclaration, WebhookSecretOutcome } from "@antelopejs/interface-dms-mailing";
|
|
2
|
+
import type { MailingSettingsValues } from "../types";
|
|
3
|
+
export declare function webhookSecretOutcome(stored: Pick<MailingSettingsValues, "webhookSecret" | "webhookSecretSource">, secret: string, replaceRotated: boolean): WebhookSecretOutcome;
|
|
4
|
+
export declare function declareWebhookSecret(input: WebhookSecretDeclaration): Promise<DeclareWebhookSecretResult>;
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.webhookSecretOutcome = webhookSecretOutcome;
|
|
4
|
+
exports.declareWebhookSecret = declareWebhookSecret;
|
|
5
|
+
const declarations_schema_1 = require("../validation/declarations.schema");
|
|
6
|
+
const declaration_error_1 = require("./declaration-error");
|
|
7
|
+
const events_1 = require("./events");
|
|
8
|
+
const settings_1 = require("./settings");
|
|
9
|
+
const SET = "set";
|
|
10
|
+
function webhookSecretOutcome(stored, secret, replaceRotated) {
|
|
11
|
+
if ((0, events_1.webhookSecretMatches)(secret, stored.webhookSecret))
|
|
12
|
+
return "unchanged";
|
|
13
|
+
if (stored.webhookSecretSource === "operator" && !replaceRotated)
|
|
14
|
+
return "kept";
|
|
15
|
+
return SET;
|
|
16
|
+
}
|
|
17
|
+
async function declareWebhookSecret(input) {
|
|
18
|
+
const { tenantId, secret, replaceRotated } = (0, declaration_error_1.parseDeclared)(declarations_schema_1.webhookSecretDeclarationSchema, input, "invalid_webhook_secret", "webhook secret declaration");
|
|
19
|
+
const stored = await (0, settings_1.getSettings)(tenantId);
|
|
20
|
+
const outcome = webhookSecretOutcome(stored, secret, replaceRotated);
|
|
21
|
+
if (outcome === SET)
|
|
22
|
+
await (0, settings_1.saveWebhookSecret)(tenantId, secret, "declared");
|
|
23
|
+
return { outcome };
|
|
24
|
+
}
|
|
25
|
+
//# sourceMappingURL=webhook-secret-declaration.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"webhook-secret-declaration.js","sourceRoot":"","sources":["../../src/services/webhook-secret-declaration.ts"],"names":[],"mappings":";;AAkBA,oDASC;AAMD,oDAaC;AAxCD,2EAAmF;AACnF,2DAAoD;AACpD,qCAAgD;AAChD,yCAA4D;AAE5D,MAAM,GAAG,GAAyB,KAAK,CAAC;AAOxC,SAAgB,oBAAoB,CAClC,MAA4E,EAC5E,MAAc,EACd,cAAuB;IAEvB,IAAI,IAAA,6BAAoB,EAAC,MAAM,EAAE,MAAM,CAAC,aAAa,CAAC;QAAE,OAAO,WAAW,CAAC;IAC3E,IAAI,MAAM,CAAC,mBAAmB,KAAK,UAAU,IAAI,CAAC,cAAc;QAC9D,OAAO,MAAM,CAAC;IAChB,OAAO,GAAG,CAAC;AACb,CAAC;AAMM,KAAK,UAAU,oBAAoB,CACxC,KAA+B;IAE/B,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,IAAA,iCAAa,EACxD,oDAA8B,EAC9B,KAAK,EACL,wBAAwB,EACxB,4BAA4B,CAC7B,CAAC;IACF,MAAM,MAAM,GAAG,MAAM,IAAA,sBAAW,EAAC,QAAQ,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;IACrE,IAAI,OAAO,KAAK,GAAG;QAAE,MAAM,IAAA,4BAAiB,EAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;IAC3E,OAAO,EAAE,OAAO,EAAE,CAAC;AACrB,CAAC"}
|
|
@@ -87,10 +87,15 @@ function toWebhookStatus(row) {
|
|
|
87
87
|
async function readWebhookStatus(tenantId) {
|
|
88
88
|
return toWebhookStatus(await (0, interface_database_decorators_1.GetModel)(db_1.WebhookStatusModel, tenantId).get(tenantId));
|
|
89
89
|
}
|
|
90
|
+
function isWebhookRefusal(value) {
|
|
91
|
+
return (0, guards_1.isText)(value) && Object.hasOwn(exports.WEBHOOK_REFUSAL_MESSAGES, value);
|
|
92
|
+
}
|
|
90
93
|
async function refusalOf(response) {
|
|
91
94
|
try {
|
|
92
|
-
const body =
|
|
93
|
-
return body.reason
|
|
95
|
+
const body = await response.json();
|
|
96
|
+
return (0, guards_1.isObject)(body) && isWebhookRefusal(body.reason)
|
|
97
|
+
? body.reason
|
|
98
|
+
: undefined;
|
|
94
99
|
}
|
|
95
100
|
catch {
|
|
96
101
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook-status.js","sourceRoot":"","sources":["../../src/services/webhook-status.ts"],"names":[],"mappings":";;;AAuDA,kCAMC;AAGD,sCAMC;AAED,gDAEC;AAcD,kDAWC;AAGD,gDAUC;AAED,0CAsBC;AAED,8CAMC;
|
|
1
|
+
{"version":3,"file":"webhook-status.js","sourceRoot":"","sources":["../../src/services/webhook-status.ts"],"names":[],"mappings":"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"}
|
package/dist/types/settings.d.ts
CHANGED
|
@@ -9,6 +9,8 @@ export interface CategoryInLocale {
|
|
|
9
9
|
label: string;
|
|
10
10
|
icon: string;
|
|
11
11
|
}
|
|
12
|
+
export declare const WEBHOOK_SECRET_SOURCES: readonly ["generated", "declared", "operator"];
|
|
13
|
+
export type WebhookSecretSource = (typeof WEBHOOK_SECRET_SOURCES)[number];
|
|
12
14
|
export interface MailingSettingsValues {
|
|
13
15
|
fallbackLocale: string;
|
|
14
16
|
logRetentionDays: number;
|
|
@@ -17,6 +19,7 @@ export interface MailingSettingsValues {
|
|
|
17
19
|
senderEmail: string;
|
|
18
20
|
replyTo: string;
|
|
19
21
|
webhookSecret: string;
|
|
22
|
+
webhookSecretSource: WebhookSecretSource;
|
|
20
23
|
categories: TemplateCategory[];
|
|
21
24
|
}
|
|
22
25
|
export declare const DEFAULT_CATEGORIES: TemplateCategory[];
|
package/dist/types/settings.js
CHANGED
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.MODULE_DEFAULT_SETTINGS = exports.DEFAULT_FALLBACK_LOCALE = exports.DEFAULT_CATEGORIES = void 0;
|
|
3
|
+
exports.MODULE_DEFAULT_SETTINGS = exports.DEFAULT_FALLBACK_LOCALE = exports.DEFAULT_CATEGORIES = exports.WEBHOOK_SECRET_SOURCES = void 0;
|
|
4
|
+
exports.WEBHOOK_SECRET_SOURCES = [
|
|
5
|
+
"generated",
|
|
6
|
+
"declared",
|
|
7
|
+
"operator",
|
|
8
|
+
];
|
|
4
9
|
exports.DEFAULT_CATEGORIES = [
|
|
5
10
|
{
|
|
6
11
|
id: "orders",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../src/types/settings.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../src/types/settings.ts"],"names":[],"mappings":";;;AAqBa,QAAA,sBAAsB,GAAG;IACpC,WAAW;IACX,UAAU;IACV,UAAU;CACF,CAAC;AAgBE,QAAA,kBAAkB,GAAuB;IACpD;QACE,EAAE,EAAE,QAAQ;QACZ,KAAK,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,WAAW,EAAE;QACxC,IAAI,EAAE,cAAc;KACrB;IACD;QACE,EAAE,EAAE,SAAS;QACb,KAAK,EAAE,EAAE,EAAE,EAAE,kBAAkB,EAAE,EAAE,EAAE,iBAAiB,EAAE;QACxD,IAAI,EAAE,WAAW;KAClB;IACD;QACE,EAAE,EAAE,SAAS;QACb,KAAK,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,aAAa,EAAE;QAC3C,IAAI,EAAE,gBAAgB;KACvB;IACD;QACE,EAAE,EAAE,WAAW;QACf,KAAK,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,WAAW,EAAE;QAC3C,IAAI,EAAE,cAAc;KACrB;IACD;QACE,EAAE,EAAE,OAAO;QACX,KAAK,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,aAAa,EAAE;QACzC,IAAI,EAAE,cAAc;KACrB;CACF,CAAC;AAEW,QAAA,uBAAuB,GAAG,IAAI,CAAC;AAO/B,QAAA,uBAAuB,GAMhC;IACF,cAAc,EAAE,+BAAuB;IACvC,gBAAgB,EAAE,EAAE;IACpB,uBAAuB,EAAE,KAAK;IAC9B,UAAU,EAAE,0BAAkB;CAC/B,CAAC"}
|
|
@@ -122,6 +122,19 @@ export declare const senderDeclarationSchema: z.ZodObject<{
|
|
|
122
122
|
replyTo?: string | undefined;
|
|
123
123
|
}>;
|
|
124
124
|
export type ParsedSenderDeclaration = z.infer<typeof senderDeclarationSchema>;
|
|
125
|
+
export declare const webhookSecretDeclarationSchema: z.ZodObject<{
|
|
126
|
+
tenantId: z.ZodString;
|
|
127
|
+
secret: z.ZodString;
|
|
128
|
+
replaceRotated: z.ZodDefault<z.ZodBoolean>;
|
|
129
|
+
}, "strip", z.ZodTypeAny, {
|
|
130
|
+
tenantId: string;
|
|
131
|
+
secret: string;
|
|
132
|
+
replaceRotated: boolean;
|
|
133
|
+
}, {
|
|
134
|
+
tenantId: string;
|
|
135
|
+
secret: string;
|
|
136
|
+
replaceRotated?: boolean | undefined;
|
|
137
|
+
}>;
|
|
125
138
|
declare const importedSendSchema: z.ZodObject<{
|
|
126
139
|
importId: z.ZodString;
|
|
127
140
|
templateSlug: z.ZodString;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.sendImportSchema = exports.senderDeclarationSchema = exports.categoryDeclarationSchema = exports.templateDeclarationSchema = exports.localizedTextSchema = void 0;
|
|
3
|
+
exports.sendImportSchema = exports.webhookSecretDeclarationSchema = exports.senderDeclarationSchema = exports.categoryDeclarationSchema = exports.templateDeclarationSchema = exports.localizedTextSchema = void 0;
|
|
4
4
|
const interface_dms_mailing_1 = require("@antelopejs/interface-dms-mailing");
|
|
5
5
|
const zod_1 = require("zod");
|
|
6
6
|
const constants_1 = require("../constants");
|
|
@@ -37,6 +37,11 @@ exports.senderDeclarationSchema = zod_1.z.object({
|
|
|
37
37
|
name: settings_schema_1.settingsSchema.shape.senderName.default(""),
|
|
38
38
|
replyTo: settings_schema_1.settingsSchema.shape.replyTo.default(""),
|
|
39
39
|
});
|
|
40
|
+
exports.webhookSecretDeclarationSchema = zod_1.z.object({
|
|
41
|
+
tenantId: tenantIdSchema,
|
|
42
|
+
secret: settings_schema_1.settingsSchema.shape.webhookSecret,
|
|
43
|
+
replaceRotated: zod_1.z.boolean().default(false),
|
|
44
|
+
});
|
|
40
45
|
const recipientSchema = zod_1.z.union([
|
|
41
46
|
zod_1.z.string().trim().email(),
|
|
42
47
|
zod_1.z.object({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"declarations.schema.js","sourceRoot":"","sources":["../../src/validation/declarations.schema.ts"],"names":[],"mappings":";;;AAAA,6EAAmF;AACnF,6BAAwB;AACxB,4CAA+C;AAC/C,qEAA+D;AAC/D,uDAAmE;AACnE,yDAI4B;AAC5B,+CAAiD;AAEjD,MAAM,iBAAiB,GAAG,2BAAe,CAAC;AAC1C,MAAM,oBAAoB,GAAG,GAAG,CAAC;AAEjC,MAAM,cAAc,GAAG,OAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AAOnC,QAAA,mBAAmB,GAAG,OAAC;KACjC,MAAM,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,2BAAe,CAAC,CAAC;KACrD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,sDAA8B,CAAC,CAAC,EAAE;IAC/D,OAAO,EAAE,cAAc,sDAA8B,eAAe;CACrE,CAAC,CAAC;AAMQ,QAAA,yBAAyB,GAAG,OAAC,CAAC,MAAM,CAAC;IAChD,QAAQ,EAAE,cAAc;IACxB,IAAI,EAAE,6BAAU;IAChB,IAAI,EAAE,2BAAmB;IACzB,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;IACvC,OAAO,EAAE,wCAAqB;IAC9B,SAAS,EAAE,qCAAkB,CAAC,OAAO,CAAC,EAAE,CAAC;IACzC,QAAQ,EAAE,8BAAgB,CAAC,OAAO,CAAC,EAAE,CAAC;IACtC,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,QAAQ,EAAE;CACnE,CAAC,CAAC;AAMU,QAAA,yBAAyB,GAAG,gCAAc,CAAC,MAAM,CAAC;IAC7D,QAAQ,EAAE,cAAc;IACxB,KAAK,EAAE,2BAAmB;CAC3B,CAAC,CAAC;AAMH,MAAM,eAAe,GAAG,8BAA8B,CAAC;AAG1C,QAAA,uBAAuB,GAAG,OAAC,CAAC,MAAM,CAAC;IAC9C,QAAQ,EAAE,cAAc;IACxB,KAAK,EAAE,gCAAc,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAC1C,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,eAAe,CAAC,CACnC;IACD,IAAI,EAAE,gCAAc,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;IACjD,OAAO,EAAE,gCAAc,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;CAClD,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"declarations.schema.js","sourceRoot":"","sources":["../../src/validation/declarations.schema.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,9 @@ const SCROLL_OPTIONS: ScrollIntoViewOptions = {
|
|
|
20
20
|
|
|
21
21
|
/** The DMS app config the e-mail logo is read from. */
|
|
22
22
|
interface EmailBrandingConfig {
|
|
23
|
-
branding?: {
|
|
23
|
+
branding?: {
|
|
24
|
+
logo?: { default?: { light?: string }; email?: { light?: string } }
|
|
25
|
+
}
|
|
24
26
|
}
|
|
25
27
|
|
|
26
28
|
const { t } = useI18n()
|
|
@@ -28,11 +30,13 @@ const { editor, session } = useEditorContext()
|
|
|
28
30
|
useEditorAnnouncements(editor)
|
|
29
31
|
|
|
30
32
|
/**
|
|
31
|
-
* The logo header the sent e-mail carries, when it can carry one: the
|
|
32
|
-
* `EmailLayout` runs with `publicLogoOnly`.
|
|
33
|
+
* The logo header the sent e-mail carries, when it can carry one: the choice
|
|
34
|
+
* and the check `EmailLayout` runs with `publicLogoOnly`. The paper is white,
|
|
35
|
+
* so the dark-mode logo never applies.
|
|
33
36
|
*/
|
|
37
|
+
const logo = (useDmsAppConfig() as EmailBrandingConfig).branding?.logo
|
|
34
38
|
const logoUrl = emailLogoUrl(
|
|
35
|
-
|
|
39
|
+
logo?.email?.light || logo?.default?.light,
|
|
36
40
|
useDmsRuntimeConfig().public.dms?.clientBaseUrl ?? '',
|
|
37
41
|
)
|
|
38
42
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { useSortable } from '@vueuse/integrations/useSortable'
|
|
2
|
-
import { toValue, watch, type MaybeRefOrGetter, type Ref } from 'vue'
|
|
2
|
+
import { toRef, toValue, watch, type MaybeRefOrGetter, type Ref } from 'vue'
|
|
3
3
|
|
|
4
4
|
/** What a drop did to a list, as vuedraggable's `change` event said it. */
|
|
5
5
|
export interface SortableListChange<Item> {
|
|
@@ -95,7 +95,7 @@ export function useSortableList<Item>(
|
|
|
95
95
|
if (origin) origin.parent.insertBefore(item, origin.next)
|
|
96
96
|
}
|
|
97
97
|
|
|
98
|
-
const { option } = useSortable(root, list, {
|
|
98
|
+
const { option } = useSortable(root, toRef(list), {
|
|
99
99
|
...defined({
|
|
100
100
|
group: options.group,
|
|
101
101
|
handle: options.handle,
|