@social-mail/social-mail-web-server 1.7.293 → 1.7.295
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/events/WebSiteEvents.js +1 -1
- package/dist/server/model/events/WebSiteEvents.js.map +1 -1
- package/dist/server/smtp/services/WebSiteChannelService.d.ts.map +1 -1
- package/dist/server/smtp/services/WebSiteChannelService.js +5 -2
- package/dist/server/smtp/services/WebSiteChannelService.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/server/model/events/WebSiteEvents.ts +1 -1
- package/src/server/smtp/services/WebSiteChannelService.ts +7 -3
|
@@ -25,7 +25,7 @@ export default class WebSiteEvents extends AuthenticatedEvents {
|
|
|
25
25
|
templates() {
|
|
26
26
|
const { db } = this;
|
|
27
27
|
return db.websiteFolders
|
|
28
|
-
.where(void 0, (p) => (x) => x.isTemplate === true);
|
|
28
|
+
.where(void 0, (p) => (x) => x.isTemplate === true).limit(10);
|
|
29
29
|
}
|
|
30
30
|
async deleteSite(entity, password) {
|
|
31
31
|
this.sessionUser.ensureIsAdmin();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebSiteEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/WebSiteEvents.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,OAAO,MAAM,wBAAwB,CAAC;AAC7C,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAC/D,OAAO,MAA2B,MAAM,4CAA4C,CAAC;AACrF,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AACxD,OAAO,aAAa,MAAM,8DAA8D,CAAC;AACzF,OAAO,eAAe,MAAM,8DAA8D,CAAC;AAC3F,OAAO,cAAc,MAAM,+DAA+D,CAAC;AAE3F,OAAO,iBAAiB,MAAM,gDAAgD,CAAC;AAC/E,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAK/D,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAC9F,OAAO,eAAe,MAAM,gEAAgE,CAAC;AAC7F,OAAO,oBAAoB,MAAM,8CAA8C,CAAC;AAChF,OAAO,qBAAqB,MAAM,mDAAmD,CAAC;AAEtF,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,mBAA4B;IAkBnE,SAAS;QACL,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;QACpB,OAAO,EAAE,CAAC,cAAc;aACnB,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"WebSiteEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/WebSiteEvents.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebSiteChannelService.d.ts","sourceRoot":"","sources":["../../../../src/server/smtp/services/WebSiteChannelService.ts"],"names":[],"mappings":"AACA,OAAe,
|
|
1
|
+
{"version":3,"file":"WebSiteChannelService.d.ts","sourceRoot":"","sources":["../../../../src/server/smtp/services/WebSiteChannelService.ts"],"names":[],"mappings":"AACA,OAAe,EAAqB,aAAa,EAAmB,MAAM,4CAA4C,CAAC;AAEvH,OAAO,EAAY,eAAe,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAIrF,MAAM,CAAC,OAAO,OAAO,qBACjB,SAAQ,aACR,YAAW,eAAe,CAAC,qBAAqB,CAAC;IAEjD,KAAK,EAAE,WAAW,CAAC,qBAAqB,CAAC,CAAC;IAG1C,OAAO,CAAC,EAAE,CAAmB;IAGvB,sBAAsB,CAAC,IAAI,EAAE,MAAM;;;;IAgCzC,KAAK;IAIL,QAAQ;CAIX"}
|
|
@@ -65,15 +65,18 @@ let WebSiteChannelService = class WebSiteChannelService extends ServiceObject {
|
|
|
65
65
|
const scope = __addDisposableResource(env_1, ServiceProvider.createScope(this), false);
|
|
66
66
|
const db = scope.resolve(SocialMailContext);
|
|
67
67
|
host = host?.toLocaleLowerCase() ?? "localhost";
|
|
68
|
-
const
|
|
68
|
+
const mailboxList = await db.mailboxes.where({ host }, (p) => (x) => x.websiteChannels
|
|
69
69
|
.some((w) => w.website.hosts
|
|
70
70
|
.some((h) => h.host === p.host)))
|
|
71
71
|
.toArray();
|
|
72
|
-
const mailboxes =
|
|
72
|
+
const mailboxes = mailboxList.map((x) => x.mailboxID);
|
|
73
73
|
const domainList = await db.hostedDomains.where({ host }, (p) => (x) => x.websiteChannelDomains
|
|
74
74
|
.some((w) => w.website.hosts
|
|
75
75
|
.some((h) => h.host === p.host))).toArray();
|
|
76
76
|
const domains = domainList.map((x) => x.domainID);
|
|
77
|
+
if (domains.length === 0 && mailboxes.length === 0) {
|
|
78
|
+
domains.push(0);
|
|
79
|
+
}
|
|
77
80
|
return {
|
|
78
81
|
mailboxes: mailboxes.length ? mailboxes : void 0,
|
|
79
82
|
domains
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebSiteChannelService.js","sourceRoot":"","sources":["../../../../src/server/smtp/services/WebSiteChannelService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,OAAO,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"WebSiteChannelService.js","sourceRoot":"","sources":["../../../../src/server/smtp/services/WebSiteChannelService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,OAAO,MAAM,EAAE,EAAE,iBAAiB,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AACvH,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAgC,MAAM,6BAA6B,CAAC;AACrF,OAAO,gBAAgB,MAAM,mDAAmD,CAAC;AAGlE,IAAM,qBAAqB,GAA3B,MAAM,qBACjB,SAAQ,aAAa;IASf,AAAN,KAAK,CAAC,sBAAsB,CAAC,IAAY;;;YACrC,MAAM,KAAK,kCAAG,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,QAAA,CAAC;YAChD,MAAM,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YAE5C,IAAI,GAAG,IAAI,EAAE,iBAAiB,EAAE,IAAI,WAAW,CAAC;YAEhD,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,IAAI,EAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAC3D,CAAC,CAAC,eAAe;iBACZ,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK;iBACvB,IAAI,CAAC,CAAC,CAAC,EAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;iBAC3C,OAAO,EAAE,CAAC;YAEf,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;YAEtD,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAC/D,CAAC,CAAC,qBAAqB;iBAClB,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK;iBACvB,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAC3C,CAAC,OAAO,EAAE,CAAC;YAEhB,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YAElD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACjD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACpB,CAAC;YAED,OAAO;gBACH,SAAS,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;gBAChD,OAAO;aACV,CAAC;;;;;;;;;KACL;IAED,KAAK;QACD,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED,QAAQ;QACJ,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,wBAAwB,CAAC,CAAE,CAAC;IAClF,CAAC;CAEJ,CAAA;AA3CW;IADP,MAAM;8BACK,gBAAgB;iDAAC;AAGvB;IADL,QAAQ,EAAE;;;;mEA+BV;AAxCgB,qBAAqB;IADzC,iBAAiB;GACG,qBAAqB,CAkDzC;eAlDoB,qBAAqB"}
|