@social-mail/social-mail-web-server 1.7.49 → 1.7.50

package/package.json

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

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

@@ -13,7 +13,9 @@ export default class EmailAddressEvents extends AuthenticatedEvents<EmailAddress
         }
         const { userID } = this.sessionUser;
         return query.where({ userID }, (p) => (x) =>
-            x.mailboxContactEmails.some((mce) =>
+            x.mailbox.userMailboxes.some((m) => m.userID === p.userID)
+            || x.mailbox.domain.hostedDomain.domainUsers.some((u) => u.userID === p.userID)
+            || x.mailboxContactEmails.some((mce) =>
                 mce.mailbox.userMailboxes.some((u) => u.userID === p.userID)
                 || mce.mailbox.domain.hostedDomain.domainUsers.some((du) => du.userID === p.userID)
             )

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

@@ -11,6 +11,7 @@ import CachedEmailService from "../../smtp/services/CachedEmailService.js";
 import Content from "@entity-access/server-pages/dist/Content.js";
 import SessionSecurity from "@entity-access/server-pages/dist/services/SessionSecurity.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
+import { ForeignKeyFilter } from "@entity-access/entity-access/dist/model/events/EntityEvents.js";
 
 export default class MailboxContactEmailEvents extends AuthenticatedEvents<MailboxContactEmail> {
 
@@ -34,6 +35,12 @@ export default class MailboxContactEmailEvents extends AuthenticatedEvents<Mailb
         return this.filter(query);
     }
 
+    onForeignKeyFilter(filter: ForeignKeyFilter<MailboxContactEmail, any>): IEntityQuery<any> {
+        if (filter.is((x) => x.emailAddress)) {
+            return null;
+        }
+    }
+
     includeFilter(query: IEntityQuery<MailboxContactEmail>, type?: any, key?: string): IEntityQuery<MailboxContactEmail> {
         return null;
     }