@social-mail/social-mail-web-server 1.7.95 → 1.7.97

package/dist/wwwroot/routes/api/emails/logs/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/api/emails/logs/index.tsx"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAE5D,OAAO,eAAe,MAAM,8DAA8D,CAAC;AAI3F,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,eAAe,EAAE,eAAe,CAAC;IAE3B,GAAG;CA6BZ"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/api/emails/logs/index.tsx"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAE5D,OAAO,eAAe,MAAM,8DAA8D,CAAC;AAI3F,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,eAAe,EAAE,eAAe,CAAC;IAE3B,GAAG;CAoCZ"}

package/dist/wwwroot/routes/api/emails/logs/index.js

@@ -14,6 +14,12 @@ import EmailLogService from "../../../../../server/services/email-logs/EmailLogS
 let default_1 = class extends Page {
     async run() {
         const [logID, fileName] = this.childPath;
+        if (logID === "null") {
+            return this.content({
+                body: "",
+                contentType: "text/plain"
+            });
+        }
         this.sessionUser.ensureLoggedIn();
         const tf = await this.emailLogService.load({ logID });
         const body = await tf.readAsText();

package/dist/wwwroot/routes/api/emails/logs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/api/emails/logs/index.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,wDAAwD,CAAC;AACjF,OAAO,eAAe,MAAM,8DAA8D,CAAC;AAI5E,gBAAA,KAAM,SAAQ,IAAI;IAK7B,KAAK,CAAC,GAAG;QACL,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC,SAAkB,CAAC;QAElD,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;QAElC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAEtD,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,UAAU,EAAE,CAAC;QAEnC,IAAI,CAAC,YAAY,GAAG,oCAAoC,CAAC;QAEzD,IAAI,QAAQ,EAAE,CAAC;YACX,OAAO,IAAI,CAAC,OAAO,CAAC;gBAChB,IAAI;gBACJ,OAAO,EAAE;oBACL,qBAAqB,EAAE,qBAAqB,kBAAkB,CAAC,QAAQ,CAAC,EAAE;iBAC7E;gBACD,WAAW,EAAE,gBAAgB;gBAC7B,QAAQ,EAAE,IAAI;aACjB,CAAC,CAAC;QACP,CAAC;QAED,OAAO,IAAI,CAAC,OAAO,CAAC;YAChB,IAAI;YACJ,WAAW,EAAE,YAAY;YACzB,QAAQ,EAAE,IAAI;SACjB,CAAC,CAAC;IAEP,CAAC;CACJ,CAAA;AA/BG;IADC,MAAM;8BACU,eAAe;kDAAC;AAHtB;IADd,OAAO,CAAC,SAAS;aAmCjB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/api/emails/logs/index.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,wDAAwD,CAAC;AACjF,OAAO,eAAe,MAAM,8DAA8D,CAAC;AAI5E,gBAAA,KAAM,SAAQ,IAAI;IAK7B,KAAK,CAAC,GAAG;QACL,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC,SAAkB,CAAC;QAElD,IAAI,KAAK,KAAK,MAAM,EAAE,CAAC;YACnB,OAAO,IAAI,CAAC,OAAO,CAAC;gBAChB,IAAI,EAAE,EAAE;gBACR,WAAW,EAAE,YAAY;aAC5B,CAAC,CAAC;QACP,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;QAElC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAEtD,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,UAAU,EAAE,CAAC;QAEnC,IAAI,CAAC,YAAY,GAAG,oCAAoC,CAAC;QAEzD,IAAI,QAAQ,EAAE,CAAC;YACX,OAAO,IAAI,CAAC,OAAO,CAAC;gBAChB,IAAI;gBACJ,OAAO,EAAE;oBACL,qBAAqB,EAAE,qBAAqB,kBAAkB,CAAC,QAAQ,CAAC,EAAE;iBAC7E;gBACD,WAAW,EAAE,gBAAgB;gBAC7B,QAAQ,EAAE,IAAI;aACjB,CAAC,CAAC;QACP,CAAC;QAED,OAAO,IAAI,CAAC,OAAO,CAAC;YAChB,IAAI;YACJ,WAAW,EAAE,YAAY;YACzB,QAAQ,EAAE,IAAI;SACjB,CAAC,CAAC;IAEP,CAAC;CACJ,CAAA;AAtCG;IADC,MAAM;8BACU,eAAe;kDAAC;AAHtB;IADd,OAAO,CAAC,SAAS;aA0CjB"}

package/package.json

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

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

@@ -149,15 +149,15 @@ export default class MailboxEvents extends AuthenticatedEvents<Mailbox> {
         const { name } = domain;
         const emailAddress = `${entity.username}@${name}`;
         entity.mailboxID = await this.emailAddressService.getId(emailAddress, entity.name || entity.username);
-        if (userID && !this.sessionUser.isAdmin) {
-            // we need to add access to mailbox without security filter
-            const um = this.db.userMailboxes.add({
-                userID
-            });
-            // we will not check FK we it was inserted from this code
-            um[ignoreFK] = "mailbox";
-            (entity.userMailboxes ??= []).push(um);
-        }
+        // if (userID && !this.sessionUser.isAdmin) {
+        //     // we need to add access to mailbox without security filter
+        //     const um = this.db.userMailboxes.add({
+        //         userID
+        //     });
+        //     // we will not check FK we it was inserted from this code
+        //     um[ignoreFK] = "mailbox";
+        //     (entity.userMailboxes ??= []).push(um);
+        // }
         entity.dateUpdated = DateTime.now;
     }
 
@@ -179,7 +179,6 @@ export default class MailboxEvents extends AuthenticatedEvents<Mailbox> {
         entity.mailboxID = mailboxID;
         entity.domainID = domainID;
         entity.isExternal = true;
-        await this.db.userMailboxes.statements.selectOrInsert({ mailboxID, userID }, { mailboxID , userID });
     }
 
     beforeUpdate(entity: Mailbox, entry: ChangeEntry<Mailbox>) {
@@ -211,6 +210,17 @@ export default class MailboxEvents extends AuthenticatedEvents<Mailbox> {
     async afterInsert(entity: Mailbox) {
         this.emailAddressService.cache?.clear("getHostedMailbox");
         this.emailAddressService.cache?.clear("getHostedMailboxID");
+
+        const { userID } = this.sessionUser;
+        if (!this.sessionUser.isAdmin && userID) {
+            // lets add user if the user does not have access to domain
+            const { domainID, mailboxID } = entity;
+            const hasDomainAccess = await this.db.hostedDomainUsers.where({ userID, domainID}, (p) => (x) => x.domainID === p.domainID && x.userID === p.userID).some();
+            if (!hasDomainAccess) {
+                await this.db.userMailboxes.statements.selectOrInsert({ mailboxID, userID }, { mailboxID , userID });
+            }
+        }
+
         await this.updateFolders(entity);
         return this.updateIndex(entity);
     }

package/src/wwwroot/routes/api/emails/logs/index.tsx

@@ -13,6 +13,13 @@ export default class extends Page {
     async run() {
         const [logID, fileName] = this.childPath as any[];
 
+        if (logID === "null") {
+            return this.content({
+                body: "",
+                contentType: "text/plain"
+            });
+        }
+
         this.sessionUser.ensureLoggedIn();
 
         const tf = await this.emailLogService.load({ logID });