@social-mail/social-mail-web-server 1.5.385 → 1.5.386
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/server/services/TemplateExpander.js +1 -1
- package/dist/server/services/TemplateExpander.js.map +1 -1
- package/dist/server/services/dom/HtmlSanitizer.d.ts +1 -0
- package/dist/server/services/dom/HtmlSanitizer.d.ts.map +1 -1
- package/dist/server/services/dom/HtmlSanitizer.js.map +1 -1
- package/dist/server/workflows/smtp/MailDispatcherService.d.ts +2 -0
- package/dist/server/workflows/smtp/MailDispatcherService.d.ts.map +1 -1
- package/dist/server/workflows/smtp/MailDispatcherService.js +7 -0
- package/dist/server/workflows/smtp/MailDispatcherService.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/wwwroot/routes/social-mail/c/c/[channel]/[postID]/index.d.ts.map +1 -1
- package/dist/wwwroot/routes/social-mail/c/c/[channel]/[postID]/index.js +2 -7
- package/dist/wwwroot/routes/social-mail/c/c/[channel]/[postID]/index.js.map +1 -1
- package/dist/wwwroot/routes/social-mail/c/d/[domain]/[type]/[postID]/[fileID]/index.d.ts.map +1 -1
- package/dist/wwwroot/routes/social-mail/c/d/[domain]/[type]/[postID]/[fileID]/index.js +2 -7
- package/dist/wwwroot/routes/social-mail/c/d/[domain]/[type]/[postID]/[fileID]/index.js.map +1 -1
- package/package.json +1 -1
- package/src/server/services/TemplateExpander.ts +1 -1
- package/src/server/services/dom/HtmlSanitizer.ts +1 -0
- package/src/server/workflows/smtp/MailDispatcherService.ts +7 -0
- package/src/wwwroot/routes/social-mail/c/c/[channel]/[postID]/index.ts +0 -1
- package/src/wwwroot/routes/social-mail/c/d/[domain]/[type]/[postID]/[fileID]/index.ts +0 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export const expandPlaceholders = (text, a) => {
|
|
2
2
|
const keys = Object.keys(a).map((x) => ({ key: x.toLocaleLowerCase(), value: x }));
|
|
3
|
-
return text.replaceAll(/(\$([^\$\s]
|
|
3
|
+
return text.replaceAll(/(\$([^\$\s]{3,50})\$)|(\[\{([^\}\s]{3,50})\}\])/g, (original, g1, gv1, g2, gv2) => {
|
|
4
4
|
let key = gv1?.toLocaleLowerCase() ?? gv2?.toLocaleLowerCase();
|
|
5
5
|
if (!key) {
|
|
6
6
|
return original;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TemplateExpander.js","sourceRoot":"","sources":["../../../src/server/services/TemplateExpander.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,CAAsB,EAAE,EAAE;IACvE,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,iBAAiB,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACnF,OAAO,IAAI,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"TemplateExpander.js","sourceRoot":"","sources":["../../../src/server/services/TemplateExpander.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,CAAsB,EAAE,EAAE;IACvE,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,iBAAiB,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACnF,OAAO,IAAI,CAAC,UAAU,CAAC,kDAAkD,EAAC,CAAC,QAAQ,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE;QACrG,IAAI,GAAG,GAAG,GAAG,EAAE,iBAAiB,EAAE,IAAI,GAAG,EAAE,iBAAiB,EAAE,CAAC;QAC/D,IAAI,CAAC,GAAG,EAAE,CAAC;YACP,OAAO,QAAQ,CAAC;QACpB,CAAC;QACD,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;QACtC,IAAI,GAAG,EAAE,CAAC;YACN,OAAO,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC;QACpC,CAAC;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC,CAAC,CAAC;AACP,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HtmlSanitizer.d.ts","sourceRoot":"","sources":["../../../../src/server/services/dom/HtmlSanitizer.ts"],"names":[],"mappings":"AAQA,OAAO,aAAa,MAAM,+BAA+B,CAAC;AAO1D,MAAM,WAAW,mBAAmB;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,GAAG,CAAC;IAClB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AAKD,MAAM,CAAC,OAAO,OAAO,aAAa;IAE9B,iBAAiB,CAAC,IAAI,EAAE,MAAM;IA0D9B,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,KAAA;;;;IAqB5D,iBAAiB,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG;IAczC,UAAU,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG;IAalC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,mBAAmB;;;;;IAiDlE,oBAAoB,CAAC,IAAI,EAAE,MAAM;IAqBjC,SAAS,CAAC,YAAY,CAAC,CAAC,EAAE,OAAO,GAAG,aAAa;IAQjD,OAAO,CAAC,uBAAuB;IAwF/B,OAAO,CAAC,cAAc;CAYzB"}
|
|
1
|
+
{"version":3,"file":"HtmlSanitizer.d.ts","sourceRoot":"","sources":["../../../../src/server/services/dom/HtmlSanitizer.ts"],"names":[],"mappings":"AAQA,OAAO,aAAa,MAAM,+BAA+B,CAAC;AAO1D,MAAM,WAAW,mBAAmB;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,GAAG,CAAC;IAClB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AAKD,MAAM,CAAC,OAAO,OAAO,aAAa;IAE9B,iBAAiB,CAAC,IAAI,EAAE,MAAM;IA0D9B,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,KAAA;;;;IAqB5D,iBAAiB,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG;IAczC,UAAU,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG;IAalC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,mBAAmB;;;;;IAiDlE,oBAAoB,CAAC,IAAI,EAAE,MAAM;IAqBjC,SAAS,CAAC,YAAY,CAAC,CAAC,EAAE,OAAO,GAAG,aAAa;IAQjD,OAAO,CAAC,uBAAuB;IAwF/B,OAAO,CAAC,cAAc;CAYzB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HtmlSanitizer.js","sourceRoot":"","sources":["../../../../src/server/services/dom/HtmlSanitizer.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAC9B,OAAO,SAAS,MAAM,WAAW,CAAC;AAClC,OAAO,SAAS,MAAM,kCAAkC,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,KAAK,CAAC;AAEtC,OAAO,QAAQ,MAAM,0BAA0B,CAAC;AAEhD,OAAO,EAAE,cAAc,EAAiB,MAAM,sCAAsC,CAAC;AAErF,MAAM,GAAG,GAAG,WAAW,SAAS,CAAC,IAAI,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"HtmlSanitizer.js","sourceRoot":"","sources":["../../../../src/server/services/dom/HtmlSanitizer.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ import HtmlSanitizer from "../../services/dom/HtmlSanitizer.js";
|
|
|
5
5
|
import EmailLogService from "../../services/email-logs/EmailLogService.js";
|
|
6
6
|
import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
|
|
7
7
|
import CachedEmailService from "../../smtp/services/CachedEmailService.js";
|
|
8
|
+
import EncryptionService from "../../services/encryption/EncryptionService.js";
|
|
8
9
|
export default class MailDispatcherService {
|
|
9
10
|
db: SocialMailContext;
|
|
10
11
|
tfs: TempFileService;
|
|
@@ -12,6 +13,7 @@ export default class MailDispatcherService {
|
|
|
12
13
|
emailLogService: EmailLogService;
|
|
13
14
|
htmlSanitizer: HtmlSanitizer;
|
|
14
15
|
cachedEmailService: CachedEmailService;
|
|
16
|
+
encryptionService: EncryptionService;
|
|
15
17
|
encodeForBulk({ senderID, emailID, recipientID, activityID, accessCode, external, to }: {
|
|
16
18
|
senderID: number;
|
|
17
19
|
emailID: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MailDispatcherService.d.ts","sourceRoot":"","sources":["../../../../src/server/workflows/smtp/MailDispatcherService.ts"],"names":[],"mappings":"AACA,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAKjE,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAC/D,OAAO,WAAW,MAAM,8BAA8B,CAAC;AACvD,OAAO,aAAa,MAAM,qCAAqC,CAAC;AAGhE,OAAO,eAAe,MAAM,8CAA8C,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAC/E,OAAO,kBAAkB,MAAM,2CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"MailDispatcherService.d.ts","sourceRoot":"","sources":["../../../../src/server/workflows/smtp/MailDispatcherService.ts"],"names":[],"mappings":"AACA,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAKjE,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAC/D,OAAO,WAAW,MAAM,8BAA8B,CAAC;AACvD,OAAO,aAAa,MAAM,qCAAqC,CAAC;AAGhE,OAAO,eAAe,MAAM,8CAA8C,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAC/E,OAAO,kBAAkB,MAAM,2CAA2C,CAAC;AAI3E,OAAO,iBAAiB,MAAM,gDAAgD,CAAC;AAG/E,MAAM,CAAC,OAAO,OAAO,qBAAqB;IAGtC,EAAE,EAAE,iBAAiB,CAAC;IAGtB,GAAG,EAAE,eAAe,CAAC;IAGrB,OAAO,EAAE,WAAW,CAAC;IAGrB,eAAe,EAAE,eAAe,CAAC;IAGjC,aAAa,EAAE,aAAa,CAAC;IAG7B,kBAAkB,EAAE,kBAAkB,CAAC;IAGvC,iBAAiB,EAAE,iBAAiB,CAAC;IAE/B,aAAa,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE,EACxF;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;QAAC,EAAE,EAAE,MAAM,EAAE,CAAA;KAAE;IAoHlI,QAAQ,CAAC,EACX,OAAO,EACP,QAAQ,EACR,IAAI,EACP,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,MAAC;QAAC,IAAI,EAAE,SAAS,CAAA;KAAE;IAkB3C,MAAM,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,SAAkB,EAAE;;;;;;;;;KAAA;CA+BlG"}
|
|
@@ -21,6 +21,7 @@ import CachedEmailService from "../../smtp/services/CachedEmailService.js";
|
|
|
21
21
|
import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
|
|
22
22
|
import { randomUUID } from "node:crypto";
|
|
23
23
|
import DomainKeyService from "../../services/domain-keys/DomainKeyService.js";
|
|
24
|
+
import EncryptionService from "../../services/encryption/EncryptionService.js";
|
|
24
25
|
let MailDispatcherService = class MailDispatcherService {
|
|
25
26
|
async encodeForBulk({ senderID, emailID, recipientID, activityID, accessCode, external, to }) {
|
|
26
27
|
const { db, tfs, storage, htmlSanitizer } = this;
|
|
@@ -85,12 +86,14 @@ let MailDispatcherService = class MailDispatcherService {
|
|
|
85
86
|
const senderEmail = email.senderEmail.emailAddress;
|
|
86
87
|
let html = email.htmlBody ?? await this.cachedEmailService.getHtmlText(email);
|
|
87
88
|
if (html) {
|
|
89
|
+
const postID = this.encryptionService.encrypt(emailID.toString());
|
|
88
90
|
const s = htmlSanitizer.sanitize(html, email.textBody, {
|
|
89
91
|
senderEmail,
|
|
90
92
|
emailID: Base36.encode(emailID),
|
|
91
93
|
messageID: email.headerMessageID,
|
|
92
94
|
uid: Base36.encode(activityID),
|
|
93
95
|
accessCode,
|
|
96
|
+
postID,
|
|
94
97
|
trackerUrl: `https://${globalEnv.host}/social-mail/social/t/${Base36.encode(emailID)}/${Base36.encode(activityID)}/`
|
|
95
98
|
});
|
|
96
99
|
html = s.html;
|
|
@@ -178,6 +181,10 @@ __decorate([
|
|
|
178
181
|
Inject,
|
|
179
182
|
__metadata("design:type", CachedEmailService)
|
|
180
183
|
], MailDispatcherService.prototype, "cachedEmailService", void 0);
|
|
184
|
+
__decorate([
|
|
185
|
+
Inject,
|
|
186
|
+
__metadata("design:type", EncryptionService)
|
|
187
|
+
], MailDispatcherService.prototype, "encryptionService", void 0);
|
|
181
188
|
MailDispatcherService = __decorate([
|
|
182
189
|
RegisterScoped
|
|
183
190
|
], MailDispatcherService);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MailDispatcherService.js","sourceRoot":"","sources":["../../../../src/server/workflows/smtp/MailDispatcherService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,EAAE,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AACrG,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAEjE,OAAO,IAAI,MAAM,8BAA8B,CAAC;AAChD,OAAO,YAAY,MAAM,uCAAuC,CAAC;AAEjE,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAC/D,OAAO,WAAW,MAAM,8BAA8B,CAAC;AACvD,OAAO,aAAa,MAAM,qCAAqC,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,eAAe,MAAM,8CAA8C,CAAC;AAE3E,OAAO,kBAAkB,MAAM,2CAA2C,CAAC;AAC3E,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,gBAAgB,MAAM,gDAAgD,CAAC;
|
|
1
|
+
{"version":3,"file":"MailDispatcherService.js","sourceRoot":"","sources":["../../../../src/server/workflows/smtp/MailDispatcherService.ts"],"names":[],"mappings":"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"}
|