@social-mail/social-mail-web-server 1.8.500 → 1.8.501
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/server/model/entities/WebSite.d.ts +1 -0
- package/dist/server/model/entities/WebSite.d.ts.map +1 -1
- package/dist/server/model/entities/WebSite.js +4 -0
- package/dist/server/model/entities/WebSite.js.map +1 -1
- package/dist/server/model/events/EmailEvents.d.ts.map +1 -1
- package/dist/server/model/events/EmailEvents.js +3 -0
- package/dist/server/model/events/EmailEvents.js.map +1 -1
- package/dist/server/seed/ui/seed-ui.js +1 -1
- package/dist/server/services/files/WebSiteContentService.d.ts +1 -0
- package/dist/server/services/files/WebSiteContentService.d.ts.map +1 -1
- package/dist/server/services/files/WebSiteContentService.js +2 -2
- package/dist/server/services/files/WebSiteContentService.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/wwwroot/routes/social-mail/site/contact/post.d.ts.map +1 -1
- package/dist/wwwroot/routes/social-mail/site/contact/post.js +24 -12
- package/dist/wwwroot/routes/social-mail/site/contact/post.js.map +1 -1
- package/package.json +1 -1
- package/src/server/model/entities/WebSite.ts +3 -0
- package/src/server/model/events/EmailEvents.ts +2 -0
- package/src/server/seed/ui/seed-ui.ts +1 -1
- package/src/server/services/files/WebSiteContentService.ts +2 -2
- package/src/wwwroot/routes/social-mail/site/contact/post.tsx +28 -12
|
@@ -1 +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;
|
|
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;CAyFZ"}
|
|
@@ -20,27 +20,39 @@ let default_1 = class extends Page {
|
|
|
20
20
|
const model = this.body;
|
|
21
21
|
await this.captchaService.verify(model.captcha);
|
|
22
22
|
const website = await this.websiteService.getWebSite(this.request.hostName?.toLocaleLowerCase());
|
|
23
|
-
|
|
23
|
+
let replyTo = void 0;
|
|
24
|
+
const { email } = model;
|
|
25
|
+
if (email?.includes("@")) {
|
|
26
|
+
replyTo = email;
|
|
27
|
+
}
|
|
28
|
+
const senderID = replyTo
|
|
29
|
+
? await this.emailAddressService.getId(email)
|
|
30
|
+
: await this.emailAddressService.getId(website.fromEmail);
|
|
24
31
|
const to = await this.emailAddressService.getId(website.supportEmail);
|
|
25
32
|
const dateCreated = DateTime.now;
|
|
26
33
|
const dateUpdated = dateCreated;
|
|
27
34
|
const dateSent = dateCreated;
|
|
28
35
|
this.db.verifyFilters = false;
|
|
29
36
|
this.db.raiseEvents = true;
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
37
|
+
const recipients = [
|
|
38
|
+
this.db.emailRecipients.add({
|
|
39
|
+
type: "to",
|
|
40
|
+
emailAddressID: to,
|
|
41
|
+
replyTo
|
|
42
|
+
})
|
|
43
|
+
];
|
|
44
|
+
const { emailBCC } = website;
|
|
45
|
+
if (emailBCC) {
|
|
46
|
+
const cc = await this.emailAddressService.getId(emailBCC);
|
|
47
|
+
this.db.emailRecipients.add({
|
|
48
|
+
type: "bcc",
|
|
49
|
+
emailAddressID: cc
|
|
50
|
+
});
|
|
34
51
|
}
|
|
52
|
+
this.db.verifyFilters = false;
|
|
35
53
|
this.db.emails.add({
|
|
36
54
|
senderID,
|
|
37
|
-
recipients
|
|
38
|
-
this.db.emailRecipients.add({
|
|
39
|
-
type: "to",
|
|
40
|
-
emailAddressID: to,
|
|
41
|
-
replyTo
|
|
42
|
-
})
|
|
43
|
-
],
|
|
55
|
+
recipients,
|
|
44
56
|
dateCreated,
|
|
45
57
|
dateUpdated,
|
|
46
58
|
dateSent,
|
|
@@ -1 +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;
|
|
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,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,MAAM,QAAQ,GAAG,OAAO;YACpB,CAAC,CAAC,MAAM,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,KAAK,CAAC;YAC7C,CAAC,CAAC,MAAM,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAE9D,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,MAAM,UAAU,GAAG;YACX,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC;gBACxB,IAAI,EAAE,IAAI;gBACV,cAAc,EAAE,EAAE;gBAClB,OAAO;aACV,CAAC;SACL,CAAC;QAEN,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;QAC7B,IAAI,QAAQ,EAAE,CAAC;YAEX,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAE1D,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC;gBACxB,IAAI,EAAE,KAAK;gBACX,cAAc,EAAE,EAAE;aACrB,CAAC,CAAC;QACP,CAAC;QAED,IAAI,CAAC,EAAE,CAAC,aAAa,GAAG,KAAK,CAAC;QAC9B,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC;YACf,QAAQ;YACR,UAAU;YACV,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;AApGG;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;aAwGrB"}
|
package/package.json
CHANGED
|
@@ -158,6 +158,9 @@ export default class WebSite {
|
|
|
158
158
|
@Column({ dataType:"Char", length: 200, nullable: true})
|
|
159
159
|
public fromEmail: string;
|
|
160
160
|
|
|
161
|
+
@Column({ dataType: "Char", length: 200, nullable: true})
|
|
162
|
+
public emailBCC: string;
|
|
163
|
+
|
|
161
164
|
@Column({ dataType:"Char", length: 10, default: () => "USD"})
|
|
162
165
|
public currency: string;
|
|
163
166
|
|
|
@@ -51,6 +51,8 @@ export default class EmailEvents extends AuthenticatedEvents<Email> {
|
|
|
51
51
|
filter(query: IEntityQuery<Email>): IEntityQuery<Email> {
|
|
52
52
|
if (this.verify) {
|
|
53
53
|
this.sessionUser.ensureLoggedIn();
|
|
54
|
+
} else {
|
|
55
|
+
return query;
|
|
54
56
|
}
|
|
55
57
|
if (this.sessionUser.isAdmin) {
|
|
56
58
|
return query;
|
|
@@ -17,7 +17,7 @@ export default async function seedUI(config: DBConfig) {
|
|
|
17
17
|
await config.saveVersion(UIPackageConfig, {
|
|
18
18
|
package: "@social-mail/social-mail-client",
|
|
19
19
|
view: "dist/web/AppIndex",
|
|
20
|
-
version: "1.9.
|
|
20
|
+
version: "1.9.127"
|
|
21
21
|
});
|
|
22
22
|
|
|
23
23
|
await config.saveVersion(WebComponentsPackageConfig, {
|
|
@@ -133,8 +133,8 @@ export default class WebSiteContentService
|
|
|
133
133
|
if (!folder) {
|
|
134
134
|
return null;
|
|
135
135
|
}
|
|
136
|
-
const { folderID, currency, fromEmail, supportEmail } = folder;
|
|
137
|
-
return { folderID, currency, fromEmail, supportEmail };
|
|
136
|
+
const { folderID, currency, fromEmail, supportEmail, emailBCC } = folder;
|
|
137
|
+
return { folderID, currency, fromEmail, supportEmail, emailBCC };
|
|
138
138
|
}
|
|
139
139
|
|
|
140
140
|
async getFile(folderID, ... path: string[]) {
|
|
@@ -30,7 +30,16 @@ export default class extends Page {
|
|
|
30
30
|
|
|
31
31
|
const website = await this.websiteService.getWebSite(this.request.hostName?.toLocaleLowerCase());
|
|
32
32
|
|
|
33
|
-
|
|
33
|
+
let replyTo = void 0;
|
|
34
|
+
|
|
35
|
+
const { email } = model;
|
|
36
|
+
if (email?.includes("@")) {
|
|
37
|
+
replyTo = email;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
const senderID = replyTo
|
|
41
|
+
? await this.emailAddressService.getId(email)
|
|
42
|
+
: await this.emailAddressService.getId(website.fromEmail);
|
|
34
43
|
|
|
35
44
|
const to = await this.emailAddressService.getId(website.supportEmail);
|
|
36
45
|
|
|
@@ -41,22 +50,29 @@ export default class extends Page {
|
|
|
41
50
|
this.db.verifyFilters = false;
|
|
42
51
|
this.db.raiseEvents = true;
|
|
43
52
|
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
const { email } = model;
|
|
47
|
-
if (email?.includes("@")) {
|
|
48
|
-
replyTo = email;
|
|
49
|
-
}
|
|
50
|
-
|
|
51
|
-
this.db.emails.add({
|
|
52
|
-
senderID,
|
|
53
|
-
recipients: [
|
|
53
|
+
const recipients = [
|
|
54
54
|
this.db.emailRecipients.add({
|
|
55
55
|
type: "to",
|
|
56
56
|
emailAddressID: to,
|
|
57
57
|
replyTo
|
|
58
58
|
})
|
|
59
|
-
]
|
|
59
|
+
];
|
|
60
|
+
|
|
61
|
+
const { emailBCC } = website;
|
|
62
|
+
if (emailBCC) {
|
|
63
|
+
|
|
64
|
+
const cc = await this.emailAddressService.getId(emailBCC);
|
|
65
|
+
|
|
66
|
+
this.db.emailRecipients.add({
|
|
67
|
+
type: "bcc",
|
|
68
|
+
emailAddressID: cc
|
|
69
|
+
});
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
this.db.verifyFilters = false;
|
|
73
|
+
this.db.emails.add({
|
|
74
|
+
senderID,
|
|
75
|
+
recipients,
|
|
60
76
|
dateCreated,
|
|
61
77
|
dateUpdated,
|
|
62
78
|
dateSent,
|