@social-mail/social-mail-web-server 1.7.252 → 1.7.255

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.7.252",
+  "version": "1.7.255",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",

package/src/server/model/events/EmailEvents.ts

@@ -240,6 +240,13 @@ export default class EmailEvents extends AuthenticatedEvents<Email> {
 
     async afterInsert(entity: Email, entry: ChangeEntry<Email>) {
 
+        if (entity.status === "scheduled") {
+            const r = await this.db.emailRecipients.where(entity, (p) => (x) => x.emailID === p.emailID).some();
+            if (!r) {
+                throw new EntityAccessError(`Email cannot be sent without any recipients`);
+            }
+        }
+
         // eslint-disable-next-line
         // console.log(`${(new Date().toJSON())} Inserted Email ${entity.emailID} with ${entity.dateReceived} on ${new Date()}`);
         if (entity.forwardedID) {
@@ -251,6 +258,14 @@ export default class EmailEvents extends AuthenticatedEvents<Email> {
 
     async afterUpdate(entity: Email, entry: ChangeEntry<Email>) {
         if (entry.isUpdated("status")) {
+
+            if (entity.status === "scheduled") {
+                const r = await this.db.emailRecipients.where(entity, (p) => (x) => x.emailID === p.emailID).some();
+                if (!r) {
+                    throw new EntityAccessError(`Email cannot be sent without any recipients`);
+                }
+            }
+
             switch(entity.status) {
 
                 case "approved":

package/src/server/model/events/MailboxEmailEvents.ts

@@ -91,10 +91,10 @@ export default class MailboxEmailEvents extends AuthenticatedEvents<ChannelEmail
     async getBody(entity: ChannelEmail) {
         const ces = ServiceProvider.resolve(this, CachedEmailService);
         const ea = ServiceProvider.resolve(this, EmailAddressService);
-        let file = await ces.getHtmlForRecipient(entity);
         const channel = await ea.getEmailAddress(entity.mailboxID);
-
         const blog = `@` + channel.emailAddress.split("@")[0];
+        let file = await ces.getHtmlForRecipient(entity, blog);
+
         file = RegExpExtra.replaceLinks(file, blog);
         return Content.text(file);
     }

package/src/server/services/dom/HtmlSanitizer.tsx

@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import { RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
 import { JSDOM } from 'jsdom';
 import DOMPurify from 'dompurify';
@@ -96,7 +97,7 @@ export default class HtmlSanitizer {
         return clean.innerHTML;
     }
 
-    sanitizeExternalResources(html: string, text: string, prefix) {
+    sanitizeExternalResources({ html, text, prefix, blog }: { html: string, text: string, prefix, blog?: string }) {
 
         const window = new JSDOM('', { url }).window;
         const purify = DOMPurify(window);
@@ -105,6 +106,11 @@ export default class HtmlSanitizer {
         for (const e of clean.querySelectorAll("*")) {
             this.replaceSrc(e, prefix);
             this.replaceBackground(e, prefix);
+            if (e.childElementCount === 0) {
+                if(e.textContent) {
+                    e.textContent = RegExpExtra.replaceLinks(e.textContent, blog);
+                }
+            }
         }
 
         html = clean?.outerHTML;
@@ -113,9 +119,6 @@ export default class HtmlSanitizer {
         for (const element of tokenizeCssUrl(html)) {
             html = html.replaceAll(element, element.replace(/https?\:\/\//, prefix));
         }
-
-        html = RegExpExtra.replaceTimeAndEmail(html);
-
         return { html, text };
     }
 

package/src/server/smtp/services/CachedEmailService.ts

@@ -27,7 +27,7 @@ export default class CachedEmailService {
 
     async getHtmlForRecipient({ emailID }: {
         emailID: number
-    }) {
+    }, blog: string = "") {
 
         const factory = async () => {
 
@@ -68,7 +68,12 @@ export default class CachedEmailService {
                 text = mail.text;
             }
             const htmlService = ServiceProvider.resolve(this, HtmlSanitizer);
-            const result = htmlService.sanitizeExternalResources(html, text, `/api/emails/d/${ei}/${emailID}/`);
+            const result = htmlService.sanitizeExternalResources({
+                html,
+                text,
+                prefix: `/api/emails/d/${ei}/${emailID}/`,
+                blog
+            });
 
             const htmlFile = await this.tempFileService.createTempFile(".html", "text/html");
             await htmlFile.writeAllText(result.html || "");