@social-mail/social-mail-web-server 1.4.860 → 1.4.862
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/common/Hashtags.js +2 -2
- package/dist/common/Hashtags.js.map +1 -1
- package/dist/common/globalEnv.js +1 -1
- package/dist/common/globalEnv.js.map +1 -1
- package/dist/common/spawnPromise.d.ts +1 -0
- package/dist/common/spawnPromise.d.ts.map +1 -1
- package/dist/common/spawnPromise.js +4 -2
- package/dist/common/spawnPromise.js.map +1 -1
- package/dist/server/model/entities/Contact.d.ts +1 -1
- package/dist/server/model/entities/Contact.d.ts.map +1 -1
- package/dist/server/model/entities/Contact.js +1 -1
- package/dist/server/model/entities/Contact.js.map +1 -1
- package/dist/server/model/entities/Domain.d.ts +2 -0
- package/dist/server/model/entities/Domain.d.ts.map +1 -1
- package/dist/server/model/entities/Domain.js.map +1 -1
- package/dist/server/model/entities/DomainKey.d.ts +1 -1
- package/dist/server/model/entities/DomainKey.d.ts.map +1 -1
- package/dist/server/model/entities/DomainKey.js +1 -1
- package/dist/server/model/entities/DomainKey.js.map +1 -1
- package/dist/server/model/entities/EmailTemplate.d.ts +1 -1
- package/dist/server/model/entities/EmailTemplate.d.ts.map +1 -1
- package/dist/server/model/entities/EmailTemplate.js +1 -1
- package/dist/server/model/entities/EmailTemplate.js.map +1 -1
- package/dist/server/model/entities/HostedDomain.d.ts +0 -3
- package/dist/server/model/entities/HostedDomain.d.ts.map +1 -1
- package/dist/server/model/entities/HostedDomain.js +0 -4
- package/dist/server/model/entities/HostedDomain.js.map +1 -1
- package/dist/server/model/entities/Mailbox.d.ts +6 -2
- package/dist/server/model/entities/Mailbox.d.ts.map +1 -1
- package/dist/server/model/entities/Mailbox.js +6 -2
- package/dist/server/model/entities/Mailbox.js.map +1 -1
- package/dist/server/model/entities/Tag.d.ts +1 -0
- package/dist/server/model/entities/Tag.d.ts.map +1 -1
- package/dist/server/model/entities/Tag.js +4 -0
- package/dist/server/model/entities/Tag.js.map +1 -1
- package/dist/server/model/events/AppFileEvents.js +2 -2
- package/dist/server/model/events/AppFileEvents.js.map +1 -1
- package/dist/server/model/events/AppFileTagEvents.js +1 -1
- package/dist/server/model/events/AppFileTagEvents.js.map +1 -1
- package/dist/server/model/events/ChannelConfigEvents.js +1 -1
- package/dist/server/model/events/ChannelConfigEvents.js.map +1 -1
- package/dist/server/model/events/ContactEvents.js +4 -4
- package/dist/server/model/events/ContactEvents.js.map +1 -1
- package/dist/server/model/events/DomainKeyEvents.js +1 -1
- package/dist/server/model/events/DomainKeyEvents.js.map +1 -1
- package/dist/server/model/events/EmailAddressEvents.js +2 -2
- package/dist/server/model/events/EmailAddressEvents.js.map +1 -1
- package/dist/server/model/events/EmailEngagementEvents.js +1 -1
- package/dist/server/model/events/EmailEngagementEvents.js.map +1 -1
- package/dist/server/model/events/EmailEvents.js +1 -1
- package/dist/server/model/events/EmailEvents.js.map +1 -1
- package/dist/server/model/events/EmailLogEvents.js +1 -1
- package/dist/server/model/events/EmailLogEvents.js.map +1 -1
- package/dist/server/model/events/EmailRecipientEvents.js +1 -1
- package/dist/server/model/events/EmailRecipientEvents.js.map +1 -1
- package/dist/server/model/events/EmailTagEvents.js +1 -1
- package/dist/server/model/events/EmailTagEvents.js.map +1 -1
- package/dist/server/model/events/EmailTemplateEvents.js +2 -2
- package/dist/server/model/events/EmailTemplateEvents.js.map +1 -1
- package/dist/server/model/events/FileContentEvents.js +3 -3
- package/dist/server/model/events/FileContentEvents.js.map +1 -1
- package/dist/server/model/events/HostedDomainEvents.d.ts.map +1 -1
- package/dist/server/model/events/HostedDomainEvents.js +6 -12
- package/dist/server/model/events/HostedDomainEvents.js.map +1 -1
- package/dist/server/model/events/MailboxContactEmailEvents.js +1 -1
- package/dist/server/model/events/MailboxContactEmailEvents.js.map +1 -1
- package/dist/server/model/events/MailboxContactEvents.js +1 -1
- package/dist/server/model/events/MailboxContactEvents.js.map +1 -1
- package/dist/server/model/events/MailboxEmailEvents.js +1 -1
- package/dist/server/model/events/MailboxEmailEvents.js.map +1 -1
- package/dist/server/model/events/MailboxEvents.d.ts +1 -0
- package/dist/server/model/events/MailboxEvents.d.ts.map +1 -1
- package/dist/server/model/events/MailboxEvents.js +30 -5
- package/dist/server/model/events/MailboxEvents.js.map +1 -1
- package/dist/server/model/events/MailboxSyncTargetEvents.js +1 -1
- package/dist/server/model/events/MailboxSyncTargetEvents.js.map +1 -1
- package/dist/server/model/events/StoreItemTagEvents.js +6 -6
- package/dist/server/model/events/StoreItemTagEvents.js.map +1 -1
- package/dist/server/model/events/TagEvents.d.ts.map +1 -1
- package/dist/server/model/events/TagEvents.js +14 -15
- package/dist/server/model/events/TagEvents.js.map +1 -1
- package/dist/server/model/events/TextDocumentEvents.js +3 -3
- package/dist/server/model/events/TextDocumentEvents.js.map +1 -1
- package/dist/server/model/events/UserAuthFactorEvents.d.ts +2 -0
- package/dist/server/model/events/UserAuthFactorEvents.d.ts.map +1 -1
- package/dist/server/model/events/UserAuthFactorEvents.js +5 -0
- package/dist/server/model/events/UserAuthFactorEvents.js.map +1 -1
- package/dist/server/services/EmailAddressService.d.ts.map +1 -1
- package/dist/server/services/EmailAddressService.js +2 -4
- package/dist/server/services/EmailAddressService.js.map +1 -1
- package/dist/server/services/domain-keys/DomainKeyService.d.ts.map +1 -1
- package/dist/server/services/domain-keys/DomainKeyService.js +2 -3
- package/dist/server/services/domain-keys/DomainKeyService.js.map +1 -1
- package/dist/server/smtp/services/MailAuthService.js +2 -2
- package/dist/server/smtp/services/MailAuthService.js.map +1 -1
- package/dist/server/smtp/services/MailReceiverService.js +3 -3
- package/dist/server/smtp/services/MailReceiverService.js.map +1 -1
- package/dist/server/workflows/smtp/MailDispatcherService.js +1 -1
- package/dist/server/workflows/smtp/MailDispatcherService.js.map +1 -1
- package/dist/server/workflows/smtp/PrepareEmailToSend.js +2 -2
- package/dist/server/workflows/smtp/PrepareEmailToSend.js.map +1 -1
- package/dist/tests/core/tags/tag-parser.d.ts +2 -0
- package/dist/tests/core/tags/tag-parser.d.ts.map +1 -0
- package/dist/tests/core/tags/tag-parser.js +17 -0
- package/dist/tests/core/tags/tag-parser.js.map +1 -0
- package/dist/tests/createTest.d.ts.map +1 -1
- package/dist/tests/createTest.js +4 -1
- package/dist/tests/createTest.js.map +1 -1
- package/dist/tests/services/smtp/auth.d.ts +1 -1
- package/dist/tests/services/smtp/auth.d.ts.map +1 -1
- package/dist/tests/services/smtp/auth.js +13 -71
- package/dist/tests/services/smtp/auth.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/wwwroot/routes/social-mail/public/dns/hosts/index.d.ts.map +1 -1
- package/dist/wwwroot/routes/social-mail/public/dns/hosts/index.js +0 -1
- package/dist/wwwroot/routes/social-mail/public/dns/hosts/index.js.map +1 -1
- package/package.json +1 -1
- package/run-test.js +20 -0
- package/src/common/Hashtags.ts +2 -2
- package/src/common/globalEnv.ts +1 -1
- package/src/common/spawnPromise.ts +5 -3
- package/src/server/model/entities/Contact.ts +2 -2
- package/src/server/model/entities/Domain.ts +2 -0
- package/src/server/model/entities/DomainKey.ts +2 -2
- package/src/server/model/entities/EmailTemplate.ts +2 -2
- package/src/server/model/entities/HostedDomain.ts +0 -5
- package/src/server/model/entities/Mailbox.ts +9 -2
- package/src/server/model/entities/Tag.ts +3 -0
- package/src/server/model/events/AppFileEvents.ts +2 -2
- package/src/server/model/events/AppFileTagEvents.ts +1 -1
- package/src/server/model/events/ChannelConfigEvents.ts +1 -1
- package/src/server/model/events/ContactEvents.ts +4 -4
- package/src/server/model/events/DomainKeyEvents.ts +1 -1
- package/src/server/model/events/EmailAddressEvents.ts +2 -2
- package/src/server/model/events/EmailEngagementEvents.ts +1 -1
- package/src/server/model/events/EmailEvents.ts +1 -1
- package/src/server/model/events/EmailLogEvents.ts +1 -1
- package/src/server/model/events/EmailRecipientEvents.ts +1 -1
- package/src/server/model/events/EmailTagEvents.ts +1 -1
- package/src/server/model/events/EmailTemplateEvents.ts +2 -2
- package/src/server/model/events/FileContentEvents.ts +3 -3
- package/src/server/model/events/HostedDomainEvents.ts +6 -13
- package/src/server/model/events/MailboxContactEmailEvents.ts +1 -1
- package/src/server/model/events/MailboxContactEvents.ts +1 -1
- package/src/server/model/events/MailboxEmailEvents.ts +1 -1
- package/src/server/model/events/MailboxEvents.ts +32 -5
- package/src/server/model/events/MailboxSyncTargetEvents.ts +1 -1
- package/src/server/model/events/StoreItemTagEvents.ts +6 -6
- package/src/server/model/events/TagEvents.ts +13 -14
- package/src/server/model/events/TextDocumentEvents.ts +3 -3
- package/src/server/model/events/UserAuthFactorEvents.ts +6 -0
- package/src/server/services/EmailAddressService.ts +2 -4
- package/src/server/services/domain-keys/DomainKeyService.ts +2 -3
- package/src/server/smtp/services/MailAuthService.ts +2 -2
- package/src/server/smtp/services/MailReceiverService.ts +3 -3
- package/src/server/workflows/smtp/MailDispatcherService.ts +1 -1
- package/src/server/workflows/smtp/PrepareEmailToSend.ts +2 -2
- package/src/tests/core/tags/tag-parser.ts +20 -0
- package/src/tests/core/tags/test-tags.ts +1 -1
- package/src/tests/createTest.ts +4 -1
- package/src/tests/services/smtp/auth.ts +13 -13
- package/src/wwwroot/routes/social-mail/public/dns/hosts/index.ts +0 -1
- package/test.js +44 -1
|
@@ -10,7 +10,7 @@ export default class ContactEvent extends AuthenticatedEvents {
|
|
|
10
10
|
const { userID } = this.sessionUser;
|
|
11
11
|
return query.where({ userID }, (p) => (x) => x.userID === p.userID
|
|
12
12
|
|| x.mailbox.userMailboxes.some((m) => m.userID === p.userID)
|
|
13
|
-
|| x.
|
|
13
|
+
|| x.hostedDomain.domainUsers.some((d) => d.userID === p.userID)
|
|
14
14
|
|| (x.userID === null && x.domainID === null && x.mailboxID === null));
|
|
15
15
|
}
|
|
16
16
|
modify(query) {
|
|
@@ -20,7 +20,7 @@ export default class ContactEvent extends AuthenticatedEvents {
|
|
|
20
20
|
const { userID } = this.sessionUser;
|
|
21
21
|
return query.where({ userID }, (p) => (x) => x.userID === p.userID
|
|
22
22
|
|| x.mailbox.userMailboxes.some((m) => m.userID === p.userID)
|
|
23
|
-
|| x.
|
|
23
|
+
|| x.hostedDomain.domainUsers.some((d) => d.userID === p.userID));
|
|
24
24
|
}
|
|
25
25
|
beforeInsert(entity, entry) {
|
|
26
26
|
if (!entity.name) {
|
|
@@ -51,7 +51,7 @@ export class ContactItemEvent extends AuthenticatedEvents {
|
|
|
51
51
|
const { userID } = this.sessionUser;
|
|
52
52
|
return query.where({ userID }, (p) => (x) => x.contact.userID === p.userID
|
|
53
53
|
|| x.contact.mailbox.userMailboxes.some((m) => m.userID === p.userID)
|
|
54
|
-
|| x.contact.
|
|
54
|
+
|| x.contact.hostedDomain.domainUsers.some((d) => d.userID === p.userID)
|
|
55
55
|
|| (x.contact.userID === null && x.contact.domainID === null && x.contact.mailboxID === null));
|
|
56
56
|
}
|
|
57
57
|
modify(query) {
|
|
@@ -61,7 +61,7 @@ export class ContactItemEvent extends AuthenticatedEvents {
|
|
|
61
61
|
const { userID } = this.sessionUser;
|
|
62
62
|
return query.where({ userID }, (p) => (x) => x.contact.userID === p.userID
|
|
63
63
|
|| x.contact.mailbox.userMailboxes.some((m) => m.userID === p.userID)
|
|
64
|
-
|| x.contact.
|
|
64
|
+
|| x.contact.hostedDomain.domainUsers.some((d) => d.userID === p.userID));
|
|
65
65
|
}
|
|
66
66
|
beforeInsert(entity, entry) {
|
|
67
67
|
if (this.verify) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ContactEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/ContactEvents.ts"],"names":[],"mappings":"AAEA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,OAAe,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AACrF,OAAO,mBAAmB,MAAM,uCAAuC,CAAC;AACxE,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAE9F,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,mBAA4B;IAElE,MAAM,CAAC,KAA4B;QAC/B,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM;eAC3D,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC;eAC1D,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"ContactEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/ContactEvents.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,7 @@ export default class DomainKeyEvents extends AuthenticatedEvents {
|
|
|
24
24
|
return query;
|
|
25
25
|
}
|
|
26
26
|
const { userID } = this.sessionUser;
|
|
27
|
-
return query.where({ userID }, (p) => (x) => x.
|
|
27
|
+
return query.where({ userID }, (p) => (x) => x.hostedDomain.domainUsers.some((du) => du.userID === p.userID));
|
|
28
28
|
}
|
|
29
29
|
async beforeInsert(entity, entry) {
|
|
30
30
|
if (this.verify) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DomainKeyEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/DomainKeyEvents.ts"],"names":[],"mappings":";;;;;;;;;AAEA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,aAAa,MAAM,iCAAiC,CAAC;AAC5D,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAC9F,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AACxD,OAAO,YAAY,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,mBAA8B;IAWvE,MAAM,CAAC,KAA8B;QACjC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;QACtC,CAAC;QAED,8BAA8B;QAC9B,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,EAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"DomainKeyEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/DomainKeyEvents.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,9 +9,9 @@ export default class EmailAddressEvents extends AuthenticatedEvents {
|
|
|
9
9
|
}
|
|
10
10
|
const { userID } = this.sessionUser;
|
|
11
11
|
return query.where({ userID }, (p) => (x) => x.mailbox.userMailboxes.some((um) => um.userID === p.userID)
|
|
12
|
-
|| x.mailbox.domain.domainUsers.some((du) => du.userID === p.userID && du.isAdmin === true)
|
|
12
|
+
|| x.mailbox.domain.hostedDomain.domainUsers.some((du) => du.userID === p.userID && du.isAdmin === true)
|
|
13
13
|
|| x.senders.some((us) => us.mailboxes.some((mb) => mb.mailbox.userMailboxes.some((du) => du.userID === p.userID)
|
|
14
|
-
|| mb.mailbox.domain.domainUsers.some((du) => du.userID === p.userID && du.isAdmin === true))));
|
|
14
|
+
|| mb.mailbox.domain.hostedDomain.domainUsers.some((du) => du.userID === p.userID && du.isAdmin === true))));
|
|
15
15
|
}
|
|
16
16
|
includeFilter(query, type, key) {
|
|
17
17
|
return query;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EmailAddressEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/EmailAddressEvents.ts"],"names":[],"mappings":"AAEA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,mBAAiC;IAE7E,MAAM,CAAC,KAAiC;QACpC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;QACtC,CAAC;QACD,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CACxC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC;eACrD,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,OAAO,KAAK,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"EmailAddressEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/EmailAddressEvents.ts"],"names":[],"mappings":"AAEA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,mBAAiC;IAE7E,MAAM,CAAC,KAAiC;QACpC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;QACtC,CAAC;QACD,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CACxC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC;eACrD,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,OAAO,KAAK,IAAI,CAAC;eACrG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CACrB,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CACrB,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC;mBAC1D,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,OAAO,KAAK,IAAI,CAAC,CAC5G,CACR,CAAC,CAAC;IACX,CAAC;IAED,aAAa,CAAC,KAAiC,EAAE,IAAU,EAAE,GAAY;QACrE,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ"}
|
|
@@ -10,7 +10,7 @@ export default class EmailEngagementEvents extends AuthenticatedEvents {
|
|
|
10
10
|
}
|
|
11
11
|
const { userID } = sessionUser;
|
|
12
12
|
return query.where({ userID }, (p) => (x) => x.email.mailboxes.some((m) => m.mailbox.userMailboxes.some((mu) => mu.userID === p.userID)
|
|
13
|
-
|| m.mailbox.domain.domainUsers.some((du) => du.userID === p.userID && du.isAdmin === true)));
|
|
13
|
+
|| m.mailbox.domain.hostedDomain.domainUsers.some((du) => du.userID === p.userID && du.isAdmin === true)));
|
|
14
14
|
}
|
|
15
15
|
includeFilter(query, type, key) {
|
|
16
16
|
return query;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EmailEngagementEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/EmailEngagementEvents.ts"],"names":[],"mappings":"AAEA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,mBAAoC;IAEnF,MAAM,CAAC,KAAoC;QACvC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;QAC7B,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YACtB,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;QAC/B,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CACxC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CACzB,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC;eACzD,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,OAAO,KAAK,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"EmailEngagementEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/EmailEngagementEvents.ts"],"names":[],"mappings":"AAEA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,mBAAoC;IAEnF,MAAM,CAAC,KAAoC;QACvC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;QAC7B,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YACtB,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;QAC/B,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CACxC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CACzB,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC;eACzD,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,OAAO,KAAK,IAAI,CAAC,CAC3G,CACJ,CAAC;IACN,CAAC;IAED,aAAa,CAAC,KAAoC,EAAE,IAAU,EAAE,GAAY;QACxE,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ"}
|
|
@@ -34,7 +34,7 @@ export default class EmailEvents extends AuthenticatedEvents {
|
|
|
34
34
|
}
|
|
35
35
|
const { userID } = this.sessionUser;
|
|
36
36
|
return query.where({ userID }, (p) => (x) => x.mailboxes.some((m) => m.mailbox.userMailboxes.some((mu) => mu.userID === p.userID)
|
|
37
|
-
|| m.mailbox.domain.domainUsers.some((du) => du.userID === p.userID && du.isAdmin === true)));
|
|
37
|
+
|| m.mailbox.domain.hostedDomain.domainUsers.some((du) => du.userID === p.userID && du.isAdmin === true)));
|
|
38
38
|
}
|
|
39
39
|
channelEmails(channelID) {
|
|
40
40
|
// get current host
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EmailEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/EmailEvents.ts"],"names":[],"mappings":";;;;;;;;;AAEA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,MAAM,EAAE,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AACrF,OAAO,eAAe,MAAM,0CAA0C,CAAC;AACvE,OAAO,kBAAkB,MAAM,4CAA4C,CAAC;AAE5E,OAAO,aAAa,MAAM,qCAAqC,CAAC;AAChE,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,qBAAqB,MAAM,mDAAmD,CAAC;AACtF,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAE9F,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACnD,OAAO,mBAAmB,MAAM,uCAAuC,CAAC;AACxE,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAC/D,OAAO,QAAQ,MAAM,yDAAyD,CAAC;AAC/E,OAAO,SAAS,MAAM,8BAA8B,CAAC;AACrD,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,mBAA0B;IAc/D,MAAM,CAAC,KAA0B;QAC7B,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;QACtC,CAAC;QACD,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CACxC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CACnB,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC;eACzD,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,OAAO,KAAK,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"EmailEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/EmailEvents.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,7 @@ export default class EmailLogEvents extends BaseEvents {
|
|
|
21
21
|
}
|
|
22
22
|
const { userID } = this.sessionUser;
|
|
23
23
|
return query.where({ userID }, (p) => (x) => x.email.mailboxes.some((m) => m.mailbox.userMailboxes.some((mu) => mu.userID === p.userID)
|
|
24
|
-
|| m.mailbox.domain.domainUsers.some((du) => du.userID === p.userID && du.isAdmin === true)));
|
|
24
|
+
|| m.mailbox.domain.hostedDomain.domainUsers.some((du) => du.userID === p.userID && du.isAdmin === true)));
|
|
25
25
|
}
|
|
26
26
|
includeFilter(query, type, key) {
|
|
27
27
|
return query;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EmailLogEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/EmailLogEvents.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,UAAU,MAAM,iBAAiB,CAAC;AACzC,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,WAAW,MAAM,8BAA8B,CAAC;AACvD,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAI/D,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,UAAoB;IAQ5D,MAAM,CAAC,KAA6B;QAChC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;QACtC,CAAC;QACD,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CACxC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CACzB,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC;eACzD,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,OAAO,KAAK,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"EmailLogEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/EmailLogEvents.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,UAAU,MAAM,iBAAiB,CAAC;AACzC,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,WAAW,MAAM,8BAA8B,CAAC;AACvD,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAI/D,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,UAAoB;IAQ5D,MAAM,CAAC,KAA6B;QAChC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;QACtC,CAAC;QACD,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CACxC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CACzB,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC;eACzD,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,OAAO,KAAK,IAAI,CAAC,CAC3G,CACJ,CAAC;IACN,CAAC;IAGD,aAAa,CAAC,KAA6B,EAAE,IAAU,EAAE,GAAY;QACjE,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ;AAzBG;IADC,MAAM;8BACE,WAAW;+CAAC;AAGrB;IADC,MAAM;8BACU,eAAe;uDAAC"}
|
|
@@ -22,7 +22,7 @@ export default class EmailRecipientEvents extends AuthenticatedEvents {
|
|
|
22
22
|
}
|
|
23
23
|
const { userID } = this.sessionUser;
|
|
24
24
|
return query.where({ userID }, (p) => (x) => x.email.mailboxes.some((m) => m.mailbox.userMailboxes.some((mu) => mu.userID === p.userID)
|
|
25
|
-
|| m.mailbox.domain.domainUsers.some((du) => du.userID === p.userID && du.isAdmin === true)));
|
|
25
|
+
|| m.mailbox.domain.hostedDomain.domainUsers.some((du) => du.userID === p.userID && du.isAdmin === true)));
|
|
26
26
|
}
|
|
27
27
|
modify(query) {
|
|
28
28
|
return this.filter(query);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EmailRecipientEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/EmailRecipientEvents.ts"],"names":[],"mappings":";;;;;;;;;AAEA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,OAAO,MAAM,EAAE,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AACrF,OAAO,mBAAmB,MAAM,uCAAuC,CAAC;AAExE,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AACxD,OAAO,cAAc,MAAM,uCAAuC,CAAC;AAKnE,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,mBAAmC;IAQjF,MAAM,CAAC,KAAmC;QACtC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;QACtC,CAAC;QACD,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CACxC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CACzB,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC;eACzD,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,OAAO,KAAK,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"EmailRecipientEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/EmailRecipientEvents.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ export default class EmailTagEvents extends AuthenticatedEvents {
|
|
|
9
9
|
}
|
|
10
10
|
const { userID } = this.sessionUser;
|
|
11
11
|
return query.where({ userID }, (p) => (x) => x.email.mailboxes.some((m) => m.mailbox.userMailboxes.some((mu) => mu.userID === p.userID)
|
|
12
|
-
|| m.mailbox.domain.domainUsers.some((du) => du.userID === p.userID && du.isAdmin === true)));
|
|
12
|
+
|| m.mailbox.domain.hostedDomain.domainUsers.some((du) => du.userID === p.userID && du.isAdmin === true)));
|
|
13
13
|
}
|
|
14
14
|
modify(query) {
|
|
15
15
|
return this.filter(query);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EmailTagEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/EmailTagEvents.ts"],"names":[],"mappings":"AAEA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,mBAA6B;IAErE,MAAM,CAAC,KAA6B;QAChC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;QACtC,CAAC;QACD,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CACxC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CACzB,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC;eACzD,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,OAAO,KAAK,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"EmailTagEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/EmailTagEvents.ts"],"names":[],"mappings":"AAEA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,mBAA6B;IAErE,MAAM,CAAC,KAA6B;QAChC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;QACtC,CAAC;QACD,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CACxC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CACzB,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC;eACzD,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,OAAO,KAAK,IAAI,CAAC,CAC3G,CACJ,CAAC;IACN,CAAC;IAED,MAAM,CAAC,KAA6B;QAChC,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAED,aAAa,CAAC,KAA6B,EAAE,IAAU,EAAE,GAAY;QACjE,OAAO,KAAK,CAAC;IACjB,CAAC;CAEJ"}
|
|
@@ -6,8 +6,8 @@ export default class EmailTemplateEvents extends AuthenticatedEvents {
|
|
|
6
6
|
}
|
|
7
7
|
const { userID } = this.sessionUser;
|
|
8
8
|
return query.where({ userID }, (p) => (x) => x.mailbox.userMailboxes.some((u) => u.userID === p.userID)
|
|
9
|
-
|| x.mailbox.domain.domainUsers.some((u) => u.userID === p.userID)
|
|
10
|
-
|| x.
|
|
9
|
+
|| x.mailbox.domain.hostedDomain.domainUsers.some((u) => u.userID === p.userID)
|
|
10
|
+
|| x.hostedDomain.domainUsers.some((u) => u.userID === p.userID));
|
|
11
11
|
}
|
|
12
12
|
}
|
|
13
13
|
//# sourceMappingURL=EmailTemplateEvents.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EmailTemplateEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/EmailTemplateEvents.ts"],"names":[],"mappings":"AAEA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,mBAAkC;IAE/E,MAAM,CAAC,KAAkC;QACrC,IAAG,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC1B,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CACxC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC;eACvD,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"EmailTemplateEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/EmailTemplateEvents.ts"],"names":[],"mappings":"AAEA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,mBAAkC;IAE/E,MAAM,CAAC,KAAkC;QACrC,IAAG,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC1B,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CACxC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC;eACvD,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC;eAC5E,CAAC,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC,CACnE,CAAC;IACN,CAAC;CAEJ"}
|
|
@@ -10,12 +10,12 @@ export default class FileContentEvents extends AuthenticatedEvents {
|
|
|
10
10
|
}
|
|
11
11
|
const { userID, readFileAccess } = this.sessionUser;
|
|
12
12
|
return query.where({ userID, readFileAccess }, (p) => (x) => x.appFiles.some((af) => Sql.text.likeAny(af.path, p.readFileAccess)
|
|
13
|
-
|| af.templates.some((t) => t.
|
|
13
|
+
|| af.templates.some((t) => t.hostedDomain.domainUsers.some((d) => d.userID === p.userID)
|
|
14
14
|
|| t.mailbox.userMailboxes.some((u) => u.userID === p.userID)
|
|
15
|
-
|| t.mailbox.domain.domainUsers.some((u) => u.userID === p.userID))
|
|
15
|
+
|| t.mailbox.domain.hostedDomain.domainUsers.some((u) => u.userID === p.userID))
|
|
16
16
|
||
|
|
17
17
|
af.email.mailboxes.some((um) => um.mailbox.userMailboxes.some((mu) => mu.userID === p.userID)
|
|
18
|
-
|| um.mailbox.domain.domainUsers.some((du) => du.userID === p.userID && du.isAdmin === true))));
|
|
18
|
+
|| um.mailbox.domain.hostedDomain.domainUsers.some((du) => du.userID === p.userID && du.isAdmin === true))));
|
|
19
19
|
}
|
|
20
20
|
modify(query) {
|
|
21
21
|
return this.filter(query);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileContentEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/FileContentEvents.ts"],"names":[],"mappings":"AAGA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAE/D,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,mBAAgC;IAE3E,MAAM,CAAC,KAAgC;QACnC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;QACtC,CAAC;QACD,IAAG,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC1B,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QACpD,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CACxD,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CACnB,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,cAAc,CAAC;eACxC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC3B,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"FileContentEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/FileContentEvents.ts"],"names":[],"mappings":"AAGA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAE/D,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,mBAAgC;IAE3E,MAAM,CAAC,KAAgC;QACnC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;QACtC,CAAC;QACD,IAAG,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC1B,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QACpD,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CACxD,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CACnB,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,cAAc,CAAC;eACxC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC3B,CAAC,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC;mBAC1D,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC;mBAC1D,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC;;gBAEhF,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAC3B,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC;uBAC1D,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,OAAO,KAAK,IAAI,CAAC,CAC5G,CACJ,CACJ,CAAC;IACN,CAAC;IAED,MAAM,CAAC,KAAgC;QACnC,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAED,aAAa,CAAC,KAAgC,EAAE,IAAU,EAAE,GAAY;QACpE,OAAO,KAAK,CAAC;IACjB,CAAC;CAEJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HostedDomainEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/HostedDomainEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAC/F,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gEAAgE,CAAC;AAClG,OAAO,WAAW,MAAM,gEAAgE,CAAC;AAMzF,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,mBAAmB,CAAC,YAAY,CAAC;IAG7E,OAAO,CAAC,mBAAmB,CAAsB;IAGjD,OAAO,CAAC,EAAE,CAAoB;IAE9B,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC,GAAG,YAAY,CAAC,YAAY,CAAC;IAWrE,kBAAkB,CAAC,MAAM,EAAE,gBAAgB,CAAC,YAAY,EAAE,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC;IAO5E,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"HostedDomainEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/HostedDomainEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAC/F,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gEAAgE,CAAC;AAClG,OAAO,WAAW,MAAM,gEAAgE,CAAC;AAMzF,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,mBAAmB,CAAC,YAAY,CAAC;IAG7E,OAAO,CAAC,mBAAmB,CAAsB;IAGjD,OAAO,CAAC,EAAE,CAAoB;IAE9B,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC,GAAG,YAAY,CAAC,YAAY,CAAC;IAWrE,kBAAkB,CAAC,MAAM,EAAE,gBAAgB,CAAC,YAAY,EAAE,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC;IAO5E,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC;IAmBzE,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC;CAGtE"}
|
|
@@ -21,7 +21,7 @@ export default class HostedDomainEvents extends AuthenticatedEvents {
|
|
|
21
21
|
return query;
|
|
22
22
|
}
|
|
23
23
|
const { userID } = this.sessionUser;
|
|
24
|
-
return query.where({ userID }, (p) => (x) => x.
|
|
24
|
+
return query.where({ userID }, (p) => (x) => x.domainUsers.some((d) => d.userID === p.userID));
|
|
25
25
|
}
|
|
26
26
|
onForeignKeyFilter(filter) {
|
|
27
27
|
if (filter.is((x) => x.domainID) || filter.is((x) => x.domain)) {
|
|
@@ -31,23 +31,17 @@ export default class HostedDomainEvents extends AuthenticatedEvents {
|
|
|
31
31
|
}
|
|
32
32
|
async beforeInsert(entity, entry) {
|
|
33
33
|
if (this.verify) {
|
|
34
|
-
this.sessionUser.ensureLoggedIn();
|
|
35
|
-
}
|
|
36
|
-
// only admin create can hosted domains
|
|
37
|
-
if (!entity.external) {
|
|
38
34
|
this.sessionUser.ensureIsAdmin();
|
|
39
35
|
}
|
|
40
36
|
if (entity.domainNameToCreate) {
|
|
41
37
|
entity.domainID = await this.emailAddressService.getOrCreateDomain(entity.domainNameToCreate);
|
|
42
38
|
}
|
|
43
39
|
// we will create default signing key...
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
entity.
|
|
48
|
-
|
|
49
|
-
}));
|
|
50
|
-
}
|
|
40
|
+
entity.domainKeys ??= [];
|
|
41
|
+
if (!entity.domainKeys.length) {
|
|
42
|
+
entity.domainKeys.push(this.db.domainKeys.add({
|
|
43
|
+
domainID: entity.domainID
|
|
44
|
+
}));
|
|
51
45
|
}
|
|
52
46
|
}
|
|
53
47
|
beforeDelete(entity, entry) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HostedDomainEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/HostedDomainEvents.ts"],"names":[],"mappings":";;;;;;;;;AAEA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAG3D,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,mBAAmB,MAAM,uCAAuC,CAAC;AACxE,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AACxD,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAE9F,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,mBAAiC;IAQ7E,MAAM,CAAC,KAAiC;QACpC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;QACtC,CAAC;QACD,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"HostedDomainEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/HostedDomainEvents.ts"],"names":[],"mappings":";;;;;;;;;AAEA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAG3D,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,mBAAmB,MAAM,uCAAuC,CAAC;AACxE,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AACxD,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAE9F,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,mBAAiC;IAQ7E,MAAM,CAAC,KAAiC;QACpC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;QACtC,CAAC;QACD,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IACnG,CAAC;IAED,kBAAkB,CAAC,MAA2C;QAC1D,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7D,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,MAAM,CAAC,MAAM,EAAE,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,MAAoB,EAAE,KAAgC;QAErE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC;QACrC,CAAC;QAED,IAAI,MAAM,CAAC,kBAAkB,EAAE,CAAC;YAC5B,MAAM,CAAC,QAAQ,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;QAClG,CAAC;QAED,wCAAwC;QACxC,MAAM,CAAC,UAAU,KAAK,EAAE,CAAC;QACzB,IAAG,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;YAC3B,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC;gBAC1C,QAAQ,EAAE,MAAM,CAAC,QAAQ;aAC5B,CAAC,CAAC,CAAC;QACR,CAAC;IACL,CAAC;IAED,YAAY,CAAC,MAAoB,EAAE,KAAgC;QAC/D,MAAM,IAAI,iBAAiB,CAAC,eAAe,CAAC,CAAC;IACjD,CAAC;CACJ;AA7CW;IADP,MAAM;8BACsB,mBAAmB;+DAAC;AAGzC;IADP,MAAM;8BACK,iBAAiB;8CAAC"}
|
|
@@ -9,7 +9,7 @@ export default class MailboxContactEmailEvents extends AuthenticatedEvents {
|
|
|
9
9
|
}
|
|
10
10
|
const { userID } = this.sessionUser;
|
|
11
11
|
return query.where({ userID }, (p) => (x) => x.mailbox.userMailboxes.some((u) => u.userID === p.userID)
|
|
12
|
-
|| x.mailbox.domain.domainUsers.some((u) => u.userID === p.userID && u.isAdmin === true));
|
|
12
|
+
|| x.mailbox.domain.hostedDomain.domainUsers.some((u) => u.userID === p.userID && u.isAdmin === true));
|
|
13
13
|
}
|
|
14
14
|
modify(query) {
|
|
15
15
|
return this.filter(query);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MailboxContactEmailEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/MailboxContactEmailEvents.ts"],"names":[],"mappings":"AAEA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAE7E,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AACxD,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAE/D,MAAM,CAAC,OAAO,OAAO,yBAA0B,SAAQ,mBAAwC;IAE3F,MAAM,CAAC,KAAwC;QAC3C,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC;eAChG,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,OAAO,KAAK,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"MailboxContactEmailEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/MailboxContactEmailEvents.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,7 +23,7 @@ export default class MailboxContactEvents extends AuthenticatedEvents {
|
|
|
23
23
|
}
|
|
24
24
|
const { userID } = this.sessionUser;
|
|
25
25
|
return query.where({ userID }, (p) => (x) => x.mailbox.userMailboxes.some((u) => u.userID === p.userID)
|
|
26
|
-
|| x.mailbox.domain.domainUsers.some((u) => u.userID === p.userID || u.isAdmin === true));
|
|
26
|
+
|| x.mailbox.domain.hostedDomain.domainUsers.some((u) => u.userID === p.userID || u.isAdmin === true));
|
|
27
27
|
}
|
|
28
28
|
modify(query) {
|
|
29
29
|
return this.filter(query);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MailboxContactEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/MailboxContactEvents.ts"],"names":[],"mappings":";;;;;;;;;AAEA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,OAAO,MAAM,EAAE,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AACrF,OAAO,mBAAmB,MAAM,uCAAuC,CAAC;AAExE,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AACxD,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAC/D,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAE3E,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,mBAAmC;IAKjF,MAAM,CAAC,KAAmC;QACtC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;QACtC,CAAC;QACD,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CACxC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC;eACvD,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"MailboxContactEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/MailboxContactEvents.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ export default class MailboxEmailEvents extends AuthenticatedEvents {
|
|
|
10
10
|
}
|
|
11
11
|
const { userID } = sessionUser;
|
|
12
12
|
return query.where({ userID }, (p) => (x) => x.mailbox.userMailboxes.some((mb) => mb.userID === p.userID)
|
|
13
|
-
|| x.mailbox.domain.domainUsers.some((d) => d.userID === p.userID));
|
|
13
|
+
|| x.mailbox.domain.hostedDomain.domainUsers.some((d) => d.userID === p.userID));
|
|
14
14
|
}
|
|
15
15
|
beforeInsert(entity, entry) {
|
|
16
16
|
if (this.verify) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MailboxEmailEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/MailboxEmailEvents.ts"],"names":[],"mappings":"AAEA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAG3D,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,mBAAiC;IAE7E,MAAM,CAAC,KAAiC;QACpC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAO,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;QAC9B,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YACtB,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;QAC/B,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CACxC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC;eACzD,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"MailboxEmailEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/MailboxEmailEvents.ts"],"names":[],"mappings":"AAEA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAG3D,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,mBAAiC;IAE7E,MAAM,CAAC,KAAiC;QACpC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAO,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;QAC9B,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YACtB,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;QAC/B,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CACxC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC;eACzD,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IACzF,CAAC;IAED,YAAY,CAAC,MAAoB,EAAE,KAAgC;QAC/D,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;QACtC,CAAC;IAEL,CAAC;CAEJ"}
|
|
@@ -11,6 +11,7 @@ export default class MailboxEvents extends AuthenticatedEvents<Mailbox> {
|
|
|
11
11
|
filter(query: IEntityQuery<Mailbox>): IEntityQuery<Mailbox>;
|
|
12
12
|
modify(query: IEntityQuery<Mailbox>): IEntityQuery<Mailbox>;
|
|
13
13
|
beforeInsert(entity: Mailbox, entry: ChangeEntry<Mailbox>): Promise<void>;
|
|
14
|
+
createExternalEmailAddress(entity: Mailbox, entry: ChangeEntry<Mailbox>): Promise<void>;
|
|
14
15
|
beforeUpdate(entity: Mailbox, entry: ChangeEntry<Mailbox>): void;
|
|
15
16
|
onForeignKeyFilter(filter: ForeignKeyFilter<Mailbox, any>): IEntityQuery<any>;
|
|
16
17
|
afterInsert(entity: Mailbox): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MailboxEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/MailboxEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAC/F,OAAO,OAAO,MAAM,wBAAwB,CAAC;AAC7C,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,WAAW,MAAM,gEAAgE,CAAC;AAIzF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gEAAgE,CAAC;AAUlG,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,mBAAmB,CAAC,OAAO,CAAC;IAGnE,OAAO,CAAC,EAAE,CAAoB;IAG9B,OAAO,CAAC,mBAAmB,CAAsB;IAGjD,OAAO,CAAC,eAAe,CAAkB;IAGnC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,KAAA,EAAE,QAAQ,KAAA;IA0CzC,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC,OAAO,CAAC;IAa3D,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC,OAAO,CAAC;IAarD,YAAY,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"MailboxEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/MailboxEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAC/F,OAAO,OAAO,MAAM,wBAAwB,CAAC;AAC7C,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,WAAW,MAAM,gEAAgE,CAAC;AAIzF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gEAAgE,CAAC;AAUlG,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,mBAAmB,CAAC,OAAO,CAAC;IAGnE,OAAO,CAAC,EAAE,CAAoB;IAG9B,OAAO,CAAC,mBAAmB,CAAsB;IAGjD,OAAO,CAAC,eAAe,CAAkB;IAGnC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,KAAA,EAAE,QAAQ,KAAA;IA0CzC,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC,OAAO,CAAC;IAa3D,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC,OAAO,CAAC;IAarD,YAAY,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC;IAgDzD,0BAA0B,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC;IAoB7E,YAAY,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC;IAIzD,kBAAkB,CAAC,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC;IAS7E,WAAW,CAAC,MAAM,EAAE,OAAO;IAI3B,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC;IAIlD,WAAW,CAAC,MAAM,EAAE,OAAO;IAW3B,YAAY,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC;CAuClE"}
|
|
@@ -17,6 +17,7 @@ import WorkflowContext from "@entity-access/entity-access/dist/workflows/Workflo
|
|
|
17
17
|
import External from "@entity-access/server-pages/dist/decorators/External.js";
|
|
18
18
|
import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
|
|
19
19
|
import Page from "@entity-access/server-pages/dist/Page.js";
|
|
20
|
+
import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
|
|
20
21
|
export default class MailboxEvents extends AuthenticatedEvents {
|
|
21
22
|
async channels(text, id, domainId) {
|
|
22
23
|
// get current host
|
|
@@ -28,7 +29,7 @@ export default class MailboxEvents extends AuthenticatedEvents {
|
|
|
28
29
|
text = text.toLocaleLowerCase();
|
|
29
30
|
if (text.startsWith("@")) {
|
|
30
31
|
text = text.substring(1);
|
|
31
|
-
q = q.where({ text }, (p) => (x) => x.domain.
|
|
32
|
+
q = q.where({ text }, (p) => (x) => x.domain.name === p.text);
|
|
32
33
|
}
|
|
33
34
|
else if (text.endsWith("@")) {
|
|
34
35
|
text = text.substring(0, text.length - 1) + "%";
|
|
@@ -62,7 +63,7 @@ export default class MailboxEvents extends AuthenticatedEvents {
|
|
|
62
63
|
}
|
|
63
64
|
const { userID } = this.sessionUser;
|
|
64
65
|
return query.where({ userID }, (p) => (x) => x.userMailboxes.some((um) => um.userID === p.userID)
|
|
65
|
-
|| x.domain.domainUsers.some((d) => d.userID === p.userID && d.isAdmin === true));
|
|
66
|
+
|| x.domain.hostedDomain.domainUsers.some((d) => d.userID === p.userID && d.isAdmin === true));
|
|
66
67
|
}
|
|
67
68
|
modify(query) {
|
|
68
69
|
if (this.verify) {
|
|
@@ -73,12 +74,16 @@ export default class MailboxEvents extends AuthenticatedEvents {
|
|
|
73
74
|
}
|
|
74
75
|
const { userID } = this.sessionUser;
|
|
75
76
|
return query.where({ userID }, (p) => (x) => x.userMailboxes.some((um) => um.userID === p.userID)
|
|
76
|
-
|| x.domain.domainUsers.some((d) => d.userID === p.userID && d.isAdmin === true));
|
|
77
|
+
|| x.domain.hostedDomain.domainUsers.some((d) => d.userID === p.userID && d.isAdmin === true));
|
|
77
78
|
}
|
|
78
79
|
async beforeInsert(entity, entry) {
|
|
79
80
|
if (this.verify) {
|
|
80
81
|
this.sessionUser.ensureLoggedIn();
|
|
81
82
|
}
|
|
83
|
+
if (entity.externalEmailAddress) {
|
|
84
|
+
await this.createExternalEmailAddress(entity, entry);
|
|
85
|
+
return;
|
|
86
|
+
}
|
|
82
87
|
const { domainID } = entity;
|
|
83
88
|
let q = this.db.domains.where({ domainID }, (p) => (x) => x.domainID === p.domainID);
|
|
84
89
|
let addUser = false;
|
|
@@ -86,8 +91,7 @@ export default class MailboxEvents extends AuthenticatedEvents {
|
|
|
86
91
|
const { userID } = this.sessionUser;
|
|
87
92
|
if (!this.sessionUser.isAdmin) {
|
|
88
93
|
if (this.verify) {
|
|
89
|
-
q = q.where({ userID }, (p) => (x) => x.hostedDomain.
|
|
90
|
-
|| x.hostedDomain.domainUsers.some((d) => d.userID === p.userID && d.isAdmin === true || d.allowCreateMailbox === true));
|
|
94
|
+
q = q.where({ userID }, (p) => (x) => x.hostedDomain.domainUsers.some((d) => d.userID === p.userID && d.isAdmin === true || d.allowCreateMailbox === true));
|
|
91
95
|
// get the prefix...
|
|
92
96
|
const du = await this.db.hostedDomainUsers.where({ domainID, userID }, (p) => (x) => x.userID === p.userID
|
|
93
97
|
&& x.domainID === p.domainID).firstOrFail();
|
|
@@ -114,6 +118,24 @@ export default class MailboxEvents extends AuthenticatedEvents {
|
|
|
114
118
|
}
|
|
115
119
|
entity.dateUpdated = DateTime.now;
|
|
116
120
|
}
|
|
121
|
+
async createExternalEmailAddress(entity, entry) {
|
|
122
|
+
const { userID } = this.sessionUser;
|
|
123
|
+
if (this.verify) {
|
|
124
|
+
if (!this.sessionUser.isAdmin) {
|
|
125
|
+
// check if user can create mailboxes..
|
|
126
|
+
const some = await this.db.users.where({ userID }, (p) => (x) => x.userID === p.userID
|
|
127
|
+
&& x.maxExternalInboxes > Sql.coll.sum(x.userMailboxes.map((u) => 1)))
|
|
128
|
+
.some();
|
|
129
|
+
if (!some) {
|
|
130
|
+
throw new EntityAccessError(`Max limit of mailboxes reached, Please upgrade your membership`);
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
const { emailAddressID: mailboxID, domainID } = await this.emailAddressService.getEmailAddressFrom(entity.externalEmailAddress);
|
|
135
|
+
entity.mailboxID = mailboxID;
|
|
136
|
+
entity.domainID = domainID;
|
|
137
|
+
await this.db.userMailboxes.statements.selectOrInsert({ mailboxID, userID }, { mailboxID, userID });
|
|
138
|
+
}
|
|
117
139
|
beforeUpdate(entity, entry) {
|
|
118
140
|
entity.dateUpdated = DateTime.now;
|
|
119
141
|
}
|
|
@@ -121,6 +143,9 @@ export default class MailboxEvents extends AuthenticatedEvents {
|
|
|
121
143
|
if (filter.is((x) => x.emailAddress)) {
|
|
122
144
|
return null;
|
|
123
145
|
}
|
|
146
|
+
if (filter.is((x) => x.domainID)) {
|
|
147
|
+
return null;
|
|
148
|
+
}
|
|
124
149
|
}
|
|
125
150
|
afterInsert(entity) {
|
|
126
151
|
return this.updateIndex(entity);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MailboxEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/MailboxEvents.ts"],"names":[],"mappings":";;;;;;;;;AAEA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,OAAO,MAAM,EAAE,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AACrF,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AACxD,OAAO,mBAAmB,MAAM,uCAAuC,CAAC;AAExE,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,eAAe,MAAM,gEAAgE,CAAC;AAC7F,OAAO,QAAQ,MAAM,yDAAyD,CAAC;AAC/E,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAC/D,OAAO,IAAI,MAAM,0CAA0C,CAAC;
|
|
1
|
+
{"version":3,"file":"MailboxEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/MailboxEvents.ts"],"names":[],"mappings":"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"}
|