@social-mail/social-mail-web-server 1.8.499 → 1.8.501

package/dist/wwwroot/routes/social-mail/site/contact/post.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"post.d.ts","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/social-mail/site/contact/post.tsx"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,cAAc,MAAM,0DAA0D,CAAC;AACtF,OAAO,iBAAiB,MAAM,kDAAkD,CAAC;AACjF,OAAO,mBAAmB,MAAM,uDAAuD,CAAC;AAExF,OAAO,qBAAqB,MAAM,+DAA+D,CAAC;AAGlG,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,cAAc,EAAE,qBAAqB,CAAC;IAGtC,cAAc,EAAE,cAAc,CAAC;IAG/B,EAAE,EAAE,iBAAiB,CAAC;IAGtB,mBAAmB,EAAE,mBAAmB,CAAC;IAEnC,GAAG;CAyEZ"}
+{"version":3,"file":"post.d.ts","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/social-mail/site/contact/post.tsx"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,cAAc,MAAM,0DAA0D,CAAC;AACtF,OAAO,iBAAiB,MAAM,kDAAkD,CAAC;AACjF,OAAO,mBAAmB,MAAM,uDAAuD,CAAC;AAExF,OAAO,qBAAqB,MAAM,+DAA+D,CAAC;AAGlG,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,cAAc,EAAE,qBAAqB,CAAC;IAGtC,cAAc,EAAE,cAAc,CAAC;IAG/B,EAAE,EAAE,iBAAiB,CAAC;IAGtB,mBAAmB,EAAE,mBAAmB,CAAC;IAEnC,GAAG;CAyFZ"}

package/dist/wwwroot/routes/social-mail/site/contact/post.js

@@ -20,27 +20,39 @@ let default_1 = class extends Page {
         const model = this.body;
         await this.captchaService.verify(model.captcha);
         const website = await this.websiteService.getWebSite(this.request.hostName?.toLocaleLowerCase());
-        const senderID = await this.emailAddressService.getId(website.fromEmail);
+        let replyTo = void 0;
+        const { email } = model;
+        if (email?.includes("@")) {
+            replyTo = email;
+        }
+        const senderID = replyTo
+            ? await this.emailAddressService.getId(email)
+            : await this.emailAddressService.getId(website.fromEmail);
         const to = await this.emailAddressService.getId(website.supportEmail);
         const dateCreated = DateTime.now;
         const dateUpdated = dateCreated;
         const dateSent = dateCreated;
         this.db.verifyFilters = false;
         this.db.raiseEvents = true;
-        let replyTo = void 0;
-        const { email } = model;
-        if (email?.includes("@")) {
-            replyTo = email;
+        const recipients = [
+            this.db.emailRecipients.add({
+                type: "to",
+                emailAddressID: to,
+                replyTo
+            })
+        ];
+        const { emailBCC } = website;
+        if (emailBCC) {
+            const cc = await this.emailAddressService.getId(emailBCC);
+            this.db.emailRecipients.add({
+                type: "bcc",
+                emailAddressID: cc
+            });
         }
+        this.db.verifyFilters = false;
         this.db.emails.add({
             senderID,
-            recipients: [
-                this.db.emailRecipients.add({
-                    type: "to",
-                    emailAddressID: to,
-                    replyTo
-                })
-            ],
+            recipients,
             dateCreated,
             dateUpdated,
             dateSent,

package/dist/wwwroot/routes/social-mail/site/contact/post.js.map

@@ -1 +1 @@
-{"version":3,"file":"post.js","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/social-mail/site/contact/post.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,wDAAwD,CAAC;AACjF,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,cAAc,MAAM,0DAA0D,CAAC;AACtF,OAAO,iBAAiB,MAAM,kDAAkD,CAAC;AACjF,OAAO,mBAAmB,MAAM,uDAAuD,CAAC;AACxF,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,qBAAqB,MAAM,+DAA+D,CAAC;AAGnF,gBAAA,KAAM,SAAQ,IAAI;IAc7B,KAAK,CAAC,GAAG;QAEL,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC;QAExB,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEhD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,iBAAiB,EAAE,CAAC,CAAC;QAEjG,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAEzE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAEtE,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC;QACjC,MAAM,WAAW,GAAG,WAAW,CAAC;QAChC,MAAM,QAAQ,GAAG,WAAW,CAAC;QAE7B,IAAI,CAAC,EAAE,CAAC,aAAa,GAAG,KAAK,CAAC;QAC9B,IAAI,CAAC,EAAE,CAAC,WAAW,GAAG,IAAI,CAAC;QAE3B,IAAI,OAAO,GAAG,KAAK,CAAC,CAAC;QAErB,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;QACxB,IAAI,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,OAAO,GAAG,KAAK,CAAC;QACpB,CAAC;QAED,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC;YACf,QAAQ;YACR,UAAU,EAAE;gBACR,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC;oBACxB,IAAI,EAAE,IAAI;oBACV,cAAc,EAAE,EAAE;oBAClB,OAAO;iBACV,CAAC;aACL;YACD,WAAW;YACX,WAAW;YACX,QAAQ;YACR,MAAM,EAAE,WAAW;YACnB,QAAQ,EAAE,KAAK;YACf,OAAO,EAAE,mBAAmB,GAAG,KAAK,CAAC,IAAI;YACzC,QAAQ,EAAE;;;;;8BAKQ,KAAK,CAAC,IAAI;;;;8BAIV,KAAK,CAAC,KAAK;;;;;;;8BAOX,KAAK,CAAC,WAAW;;;;mBAI5B;SACV,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC;QAE5B,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEhD,OAAO,IAAI,CAAC,IAAI,CAAC;YACb,IAAI,EAAE,IAAI;SACb,CAAC,CAAC;IAEP,CAAC;CACJ,CAAA;AApFG;IADC,MAAM;8BACS,qBAAqB;iDAAC;AAGtC;IADC,MAAM;8BACS,cAAc;iDAAC;AAG/B;IADC,MAAM;8BACH,iBAAiB;qCAAC;AAGtB;IADC,MAAM;8BACc,mBAAmB;sDAAC;AAZ9B;IADd,OAAO,CAAC,aAAa;aAwFrB"}
+{"version":3,"file":"post.js","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/social-mail/site/contact/post.tsx"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.8.499",
+  "version": "1.8.501",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",
@@ -20,7 +20,7 @@
   "author": "",
   "license": "UNLICENSED",
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.913.0",
+    "@aws-sdk/client-s3": "^3.962.0",
     "@azure/storage-blob": "^12.29.1",
     "@entity-access/entity-access": "^1.0.532",
     "@entity-access/server-pages": "^1.1.578",

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

@@ -158,6 +158,9 @@ export default class WebSite {
     @Column({ dataType:"Char", length: 200, nullable: true})
     public fromEmail: string;
 
+    @Column({ dataType: "Char", length: 200, nullable: true})
+    public emailBCC: string;
+
     @Column({ dataType:"Char", length: 10, default: () => "USD"})
     public currency: string;
 

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

@@ -51,6 +51,8 @@ export default class EmailEvents extends AuthenticatedEvents<Email> {
     filter(query: IEntityQuery<Email>): IEntityQuery<Email> {
         if (this.verify) {
             this.sessionUser.ensureLoggedIn();
+        } else {
+            return query;
         }
         if (this.sessionUser.isAdmin) {
             return query;

package/src/server/seed/ui/seed-ui.ts

@@ -17,7 +17,7 @@ export default async function seedUI(config: DBConfig) {
     await config.saveVersion(UIPackageConfig, {
         package: "@social-mail/social-mail-client",
         view: "dist/web/AppIndex",
-        version: "1.9.126"
+        version: "1.9.127"
     });
 
     await config.saveVersion(WebComponentsPackageConfig, {

package/src/server/services/files/WebSiteContentService.ts

@@ -133,8 +133,8 @@ export default class WebSiteContentService
         if (!folder) {
             return null;
         }
-        const { folderID, currency, fromEmail, supportEmail } = folder;
-        return { folderID, currency, fromEmail, supportEmail };
+        const { folderID, currency, fromEmail, supportEmail, emailBCC } = folder;
+        return { folderID, currency, fromEmail, supportEmail, emailBCC };
     }
 
     async getFile(folderID, ... path: string[]) {

package/src/wwwroot/routes/social-mail/site/contact/post.tsx

@@ -30,7 +30,16 @@ export default class extends Page {
 
         const website = await this.websiteService.getWebSite(this.request.hostName?.toLocaleLowerCase());
 
-        const senderID = await this.emailAddressService.getId(website.fromEmail);
+        let replyTo = void 0;
+
+        const { email } = model;
+        if (email?.includes("@")) {
+            replyTo = email;
+        }
+
+        const senderID = replyTo
+            ? await this.emailAddressService.getId(email)
+            : await this.emailAddressService.getId(website.fromEmail);
 
         const to = await this.emailAddressService.getId(website.supportEmail);
 
@@ -41,22 +50,29 @@ export default class extends Page {
         this.db.verifyFilters = false;
         this.db.raiseEvents = true;
 
-        let replyTo = void 0;
-
-        const { email } = model;
-        if (email?.includes("@")) {
-            replyTo = email;
-        }
-
-        this.db.emails.add({
-            senderID,
-            recipients: [
+        const recipients = [
                 this.db.emailRecipients.add({
                     type: "to",
                     emailAddressID: to,
                     replyTo
                 })
-            ],
+            ];
+
+        const { emailBCC } = website;
+        if (emailBCC) {
+
+            const cc = await this.emailAddressService.getId(emailBCC);
+
+            this.db.emailRecipients.add({
+                type: "bcc",
+                emailAddressID: cc
+            });
+        }
+
+        this.db.verifyFilters = false;
+        this.db.emails.add({
+            senderID,
+            recipients,
             dateCreated,
             dateUpdated,
             dateSent,