@social-mail/social-mail-web-server 1.4.897 → 1.4.899

package/package.json

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

package/src/server/model/entities/Mailbox.ts

@@ -108,6 +108,9 @@ export default class Mailbox {
     })
     public logoID: number;
 
+    @Column({ dataType: "BigInt", default: () => false })
+    public isExternal: boolean;
+
     @Column({ dataType: "Char", nullable: true })
     public description: string;
 

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

@@ -3,7 +3,7 @@ import { HostedDomain } from "../entities/HostedDomain.js";
 import AuthenticatedEvents from "./AuthenticatedEvents.js";
 import { ForeignKeyFilter } from "@entity-access/entity-access/dist/model/events/EntityEvents.js";
 import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeEntry.js";
-import Inject from "@entity-access/entity-access/dist/di/di.js";
+import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import EmailAddressService from "../../services/EmailAddressService.js";
 import SocialMailContext from "../SocialMailContext.js";
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
@@ -56,4 +56,20 @@ export default class HostedDomainEvents extends AuthenticatedEvents<HostedDomain
     beforeDelete(entity: HostedDomain, entry: ChangeEntry<HostedDomain>) {
         throw new EntityAccessError(`Not supported`);
     }
+
+    async afterInsert(entity: HostedDomain, entry: ChangeEntry<HostedDomain>) {
+        const db = ServiceProvider.resolve(this, SocialMailContext);
+        await db.mailboxes.where(entity, (p) => (x) => x.domainID === p.domainID)
+            .update(void 0, (p) => (x) => ({
+                isExternal: false
+            }));
+    }
+
+    async afterDelete(entity: HostedDomain, entry: ChangeEntry<HostedDomain>) {
+        const db = ServiceProvider.resolve(this, SocialMailContext);
+        await db.mailboxes.where(entity, (p) => (x) => x.domainID === p.domainID)
+            .update(void 0, (p) => (x) => ({
+                isExternal: true
+            }));
+    }
 }

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

@@ -160,6 +160,7 @@ export default class MailboxEvents extends AuthenticatedEvents<Mailbox> {
         const { emailAddressID: mailboxID, domainID } = await this.emailAddressService.getEmailAddressFrom(entity.externalEmailAddress);
         entity.mailboxID = mailboxID;
         entity.domainID = domainID;
+        entity.isExternal = true;
         await this.db.userMailboxes.statements.selectOrInsert({ mailboxID, userID }, { mailboxID , userID });
     }
 

package/src/server/services/EmailAddressService.ts

@@ -77,13 +77,10 @@ export default class EmailAddressService {
         emailAddress = emailAddress.trim().toLocaleLowerCase();
         using scope = globalServices.createScope();
         const db = scope.resolve(SocialMailContext);
-        const mb = await db.mailboxes.where({ emailAddress }, (p) => (x) => x.emailAddress.emailAddress === p.emailAddress)
-            .include((x) => x.domain.hostedDomain)
+        const mb = await db.mailboxes.where({ emailAddress }, (p) => (x) => x.emailAddress.emailAddress === p.emailAddress
+                && x.isExternal === false)
             .first();
-        if (mb.domain?.hostedDomain) {
-            return mb.mailboxID;
-        }
-        return mb?.mailboxID > 0 ? mb.mailboxID : void 0;
+       return mb?.mailboxID > 0 ? mb.mailboxID : void 0;
     }
 
     @cacheFor()

package/src/server/workflows/smtp/PrepareEmailToSend.ts

@@ -76,7 +76,7 @@ export default class PrepareEmailToSend extends Workflow<number, string> {
                 senderID: email.senderID,
                 emailID: x.emailID,
                 emailAddressID: x.emailAddressID,
-                external: !email.senderEmail.mailbox.domain.hostedDomain,
+                external: email.senderEmail.mailbox.isExternal,
                 to: [ x.replyTo ?? x.emailAddress.emailAddress]
             }));
         return outsiders;