=> {
const choices = view.sendBtnModule.popover.choices;
const recipientsEmails = getUniqueRecipientEmails(newMsgData.recipients);
if (!choices.encrypt && !choices.sign) { // plain
view.S.now('send_btn_text').text('Formatting...');
- return { senderKi: undefined, msg: await new PlainMsgMailFormatter(view).sendableMsg(newMsgData) };
+ const msg = await new PlainMsgMailFormatter(view).sendableMsg(newMsgData);
+ return { senderKi: undefined, msgs: [msg], renderSentMessage: { recipients: msg.recipients, attachments: msg.attachments } };
}
if (!choices.encrypt && choices.sign) { // sign only
view.S.now('send_btn_text').text('Signing...');
- const senderKis = await view.storageModule.getAccountKeys(newMsgData.from);
+ const senderKis = await view.storageModule.getAccountKeys(newMsgData.from.email);
const signingKey = await GeneralMailFormatter.chooseSigningKeyAndDecryptIt(view, senderKis);
if (!signingKey) {
throw new UnreportableError('Could not find account key usable for signing this plain text message');
}
- return { senderKi: signingKey!.keyInfo, msg: await new SignedMsgMailFormatter(view).sendableMsg(newMsgData, signingKey!.key) };
+ const msg = await new SignedMsgMailFormatter(view).sendableMsg(newMsgData, signingKey!.key);
+ return { senderKi: signingKey!.keyInfo, msgs: [msg], renderSentMessage: { recipients: msg.recipients, attachments: msg.attachments } };
}
// encrypt (optionally sign)
- const singleFamilyKeys = await view.storageModule.collectSingleFamilyKeys(recipientsEmails, newMsgData.from, choices.sign);
+ const singleFamilyKeys = await view.storageModule.collectSingleFamilyKeys(recipientsEmails, newMsgData.from.email, choices.sign);
if (singleFamilyKeys.emailsWithoutPubkeys.length) {
await view.errModule.throwIfEncryptionPasswordInvalid(newMsgData);
}
@@ -46,7 +56,7 @@ export class GeneralMailFormatter {
}
}
view.S.now('send_btn_text').text('Encrypting...');
- return { senderKi: signingKey?.keyInfo, msg: await new EncryptedMsgMailFormatter(view).sendableMsg(newMsgData, singleFamilyKeys.pubkeys, signingKey?.key) };
+ return await new EncryptedMsgMailFormatter(view).sendableMsgs(newMsgData, singleFamilyKeys.pubkeys, signingKey);
};
private static chooseSigningKeyAndDecryptIt = async (
diff --git a/extension/chrome/elements/compose.htm b/extension/chrome/elements/compose.htm
index c6c043ece48..8ff4144760c 100644
--- a/extension/chrome/elements/compose.htm
+++ b/extension/chrome/elements/compose.htm
@@ -166,9 +166,9 @@
|
- to:
- cc:
- bcc:
+ to:
+ cc:
+ bcc:
|
@@ -181,7 +181,7 @@
|
-
+
diff --git a/extension/js/common/api/account-server.ts b/extension/js/common/api/account-server.ts
index 3c28c2104a7..cf7ace7fb93 100644
--- a/extension/js/common/api/account-server.ts
+++ b/extension/js/common/api/account-server.ts
@@ -8,6 +8,12 @@ import { BackendRes, FcUuidAuth, FlowCryptComApi, ProfileUpdate } from './accoun
import { ParsedRecipients } from './email-provider/email-provider-api.js';
import { Api, ProgressCb } from './shared/api.js';
+export type UploadedMessageData = {
+ url: string, // both FES and FlowCryptComApi
+ externalId?: string, // legacy FES
+ emailToExternalIdAndUrl?: { [email: string]: { url: string, externalId: string } } // FES only
+};
+
/**
* This may be calling to FlowCryptComApi or Enterprise Server (FES, customer on-prem) depending on
* whether FES is deployed on the customer domain or not.
@@ -58,7 +64,7 @@ export class AccountServer extends Api {
from: string,
recipients: ParsedRecipients,
progressCb: ProgressCb
- ): Promise<{ url: string, externalId?: string }> => {
+ ): Promise => {
if (await this.isFesUsed()) {
const fes = new EnterpriseServer(this.acctEmail);
// Recipients are used to later cross-check replies from the web
diff --git a/extension/js/common/api/account-servers/enterprise-server.ts b/extension/js/common/api/account-servers/enterprise-server.ts
index 9ad068c124b..3ac53702658 100644
--- a/extension/js/common/api/account-servers/enterprise-server.ts
+++ b/extension/js/common/api/account-servers/enterprise-server.ts
@@ -23,7 +23,11 @@ type EventTag = 'compose' | 'decrypt' | 'setup' | 'settings' | 'import-pub' | 'i
export namespace FesRes {
export type ReplyToken = { replyToken: string };
- export type MessageUpload = { url: string; externalId: string };
+ export type MessageUpload = {
+ url: string, // LEGACY
+ externalId: string, // LEGACY
+ emailToExternalIdAndUrl?: { [email: string]: { url: string, externalId: string } }
+ };
export type ServiceInfo = { vendor: string, service: string, orgId: string, version: string, apiVersion: string };
export type ClientConfiguration = { clientConfiguration: ClientConfigurationJson };
}
diff --git a/extension/js/common/api/email-provider/sendable-msg.ts b/extension/js/common/api/email-provider/sendable-msg.ts
index 3db6e0ce1ec..445c07c8eae 100644
--- a/extension/js/common/api/email-provider/sendable-msg.ts
+++ b/extension/js/common/api/email-provider/sendable-msg.ts
@@ -13,6 +13,7 @@ import { ParsedRecipients } from './email-provider-api.js';
type SendableMsgHeaders = {
headers?: Dict;
from: string;
+ replyTo?: string;
recipients: ParsedRecipients;
subject: string;
thread?: string;
@@ -88,12 +89,15 @@ export class SendableMsg {
attachments: Attachment[],
options: SendableMsgOptions
): Promise => {
- const { from, recipients, subject, thread } = headers;
+ const { from, replyTo, recipients, subject, thread } = headers;
const { type, isDraft, externalId } = options;
- return await SendableMsg.create(acctEmail, { from, recipients, subject, thread, body, attachments, type, isDraft, externalId });
+ return await SendableMsg.create(acctEmail, { from, replyTo, recipients, subject, thread, body, attachments, type, isDraft, externalId });
};
- private static create = async (acctEmail: string, { from, recipients, subject, thread, body, attachments, type, isDraft, externalId }: SendableMsgDefinition): Promise => {
+ private static create = async (
+ acctEmail: string,
+ { from, replyTo, recipients, subject, thread, body, attachments, type, isDraft, externalId }: SendableMsgDefinition
+ ): Promise => {
const mostUsefulPrv = KeyStoreUtil.chooseMostUseful(
await KeyStoreUtil.parse(await KeyStore.getRequired(acctEmail)),
'EVEN-IF-UNUSABLE'
@@ -107,6 +111,7 @@ export class SendableMsg {
headers,
isDraft === true,
from,
+ replyTo,
recipients,
subject,
body || {},
@@ -122,6 +127,7 @@ export class SendableMsg {
public headers: Dict,
isDraft: boolean,
public from: string,
+ public replyTo: string | undefined,
public recipients: ParsedRecipients,
public subject: string,
public body: SendableMsgBody,
@@ -130,18 +136,24 @@ export class SendableMsg {
public type: MimeEncodeType,
public externalId?: string, // for binding a password-protected message
) {
- const allEmails = [...recipients.to || [], ...recipients.cc || [], ...recipients.bcc || []];
+ const allEmails = this.getAllRecipients();
if (!allEmails.length && !isDraft) {
- throw new Error('The To: field is empty. Please add recipients and try again');
+ throw new Error('The To:, Cc: and Bcc: fields are empty. Please add recipients and try again');
}
const invalidEmails = allEmails.filter(email => !Str.isEmailValid(email.email));
+ // todo: distinguish To:, Cc: and Bcc: in error report?
if (invalidEmails.length) {
throw new InvalidRecipientError(`The To: field contains invalid emails: ${invalidEmails.join(', ')}\n\nPlease check recipients and try again.`);
}
}
+ public getAllRecipients = () => [...this.recipients.to || [], ...this.recipients.cc || [], ...this.recipients.bcc || []];
+
public toMime = async () => {
this.headers.From = this.from;
+ if (this.replyTo) {
+ this.headers['Reply-To'] = this.replyTo;
+ }
for (const [recipientType, value] of Object.entries(this.recipients)) {
if (value && value!.length) {
// todo - properly escape/encode this header using emailjs
diff --git a/extension/js/common/api/shared/api.ts b/extension/js/common/api/shared/api.ts
index 4eb3a70c044..64d085b481e 100644
--- a/extension/js/common/api/shared/api.ts
+++ b/extension/js/common/api/shared/api.ts
@@ -143,6 +143,10 @@ export class Api {
return bytes.map(b => ('0' + (b & 0xFF).toString(16)).slice(-2)).join('');
};
+ public static isRecipientHeaderNameType = (value: string): value is "to" | "cc" | "bcc" => {
+ return ['to', 'cc', 'bcc'].includes(value);
+ };
+
protected static apiCall = async