@social-mail/social-mail-web-server 1.4.898 → 1.4.899
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/Mailbox.d.ts +1 -1
- package/dist/server/model/entities/Mailbox.d.ts.map +1 -1
- package/dist/server/model/entities/Mailbox.js +1 -1
- package/dist/server/model/entities/Mailbox.js.map +1 -1
- package/dist/server/model/events/HostedDomainEvents.js +2 -2
- package/dist/server/model/events/HostedDomainEvents.js.map +1 -1
- package/dist/server/model/events/MailboxEvents.js +1 -1
- package/dist/server/model/events/MailboxEvents.js.map +1 -1
- package/dist/server/services/EmailAddressService.js +1 -1
- package/dist/server/services/EmailAddressService.js.map +1 -1
- package/dist/server/workflows/smtp/PrepareEmailToSend.js +1 -1
- package/dist/server/workflows/smtp/PrepareEmailToSend.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/server/model/entities/Mailbox.ts +1 -1
- package/src/server/model/events/HostedDomainEvents.ts +2 -2
- package/src/server/model/events/MailboxEvents.ts +1 -1
- package/src/server/services/EmailAddressService.ts +1 -1
- package/src/server/workflows/smtp/PrepareEmailToSend.ts +1 -1
package/package.json
CHANGED
|
@@ -109,7 +109,7 @@ export default class Mailbox {
|
|
|
109
109
|
public logoID: number;
|
|
110
110
|
|
|
111
111
|
@Column({ dataType: "BigInt", default: () => false })
|
|
112
|
-
public
|
|
112
|
+
public isExternal: boolean;
|
|
113
113
|
|
|
114
114
|
@Column({ dataType: "Char", nullable: true })
|
|
115
115
|
public description: string;
|
|
@@ -61,7 +61,7 @@ export default class HostedDomainEvents extends AuthenticatedEvents<HostedDomain
|
|
|
61
61
|
const db = ServiceProvider.resolve(this, SocialMailContext);
|
|
62
62
|
await db.mailboxes.where(entity, (p) => (x) => x.domainID === p.domainID)
|
|
63
63
|
.update(void 0, (p) => (x) => ({
|
|
64
|
-
|
|
64
|
+
isExternal: false
|
|
65
65
|
}));
|
|
66
66
|
}
|
|
67
67
|
|
|
@@ -69,7 +69,7 @@ export default class HostedDomainEvents extends AuthenticatedEvents<HostedDomain
|
|
|
69
69
|
const db = ServiceProvider.resolve(this, SocialMailContext);
|
|
70
70
|
await db.mailboxes.where(entity, (p) => (x) => x.domainID === p.domainID)
|
|
71
71
|
.update(void 0, (p) => (x) => ({
|
|
72
|
-
|
|
72
|
+
isExternal: true
|
|
73
73
|
}));
|
|
74
74
|
}
|
|
75
75
|
}
|
|
@@ -160,7 +160,7 @@ export default class MailboxEvents extends AuthenticatedEvents<Mailbox> {
|
|
|
160
160
|
const { emailAddressID: mailboxID, domainID } = await this.emailAddressService.getEmailAddressFrom(entity.externalEmailAddress);
|
|
161
161
|
entity.mailboxID = mailboxID;
|
|
162
162
|
entity.domainID = domainID;
|
|
163
|
-
entity.
|
|
163
|
+
entity.isExternal = true;
|
|
164
164
|
await this.db.userMailboxes.statements.selectOrInsert({ mailboxID, userID }, { mailboxID , userID });
|
|
165
165
|
}
|
|
166
166
|
|
|
@@ -78,7 +78,7 @@ export default class EmailAddressService {
|
|
|
78
78
|
using scope = globalServices.createScope();
|
|
79
79
|
const db = scope.resolve(SocialMailContext);
|
|
80
80
|
const mb = await db.mailboxes.where({ emailAddress }, (p) => (x) => x.emailAddress.emailAddress === p.emailAddress
|
|
81
|
-
&& x.
|
|
81
|
+
&& x.isExternal === false)
|
|
82
82
|
.first();
|
|
83
83
|
return mb?.mailboxID > 0 ? mb.mailboxID : void 0;
|
|
84
84
|
}
|
|
@@ -76,7 +76,7 @@ export default class PrepareEmailToSend extends Workflow<number, string> {
|
|
|
76
76
|
senderID: email.senderID,
|
|
77
77
|
emailID: x.emailID,
|
|
78
78
|
emailAddressID: x.emailAddressID,
|
|
79
|
-
external: email.senderEmail.mailbox.
|
|
79
|
+
external: email.senderEmail.mailbox.isExternal,
|
|
80
80
|
to: [ x.replyTo ?? x.emailAddress.emailAddress]
|
|
81
81
|
}));
|
|
82
82
|
return outsiders;
|