Fallback to defaultSender when editing draft whose sender is not enabled

Close #10035

Author: hrb-hub

src/common/api/common/utils/GroupUtils.ts

@@ -1,13 +1,19 @@
 import type { GroupInfo, GroupMembership, User } from "../../entities/sys/TypeRefs.js"
 import { GroupType } from "../TutanotaConstants"
-import { lang, Translation } from "../../../misc/LanguageViewModel.js"
 
 export function getEnabledMailAddressesForGroupInfo(groupInfo: GroupInfo): string[] {
 	let aliases = groupInfo.mailAddressAliases.filter((alias) => alias.enabled).map((alias) => alias.mailAddress)
 	if (groupInfo.mailAddress) aliases.unshift(groupInfo.mailAddress)
 	return aliases
 }
 
+export function isAliasEnabledForGroupInfo(groupInfo: GroupInfo, aliasAddress: string): boolean {
+	return (
+		(groupInfo.mailAddress && groupInfo.mailAddress === aliasAddress) ||
+		(groupInfo.mailAddressAliases.find((alias) => alias.mailAddress === aliasAddress)?.enabled ?? false)
+	)
+}
+
 /**
  * Provides the memberships of the user with the given type. In case of area groups all groups are returned.
  */

src/common/api/worker/facades/lazy/MailFacade.ts

@@ -110,7 +110,6 @@ import {
 	addressDomain,
 	assertNotNull,
 	byteLength,
-	contains,
 	defer,
 	freshVersioned,
 	getUrlDomain,
@@ -128,7 +127,7 @@ import {
 import { BlobFacade } from "./BlobFacade.js"
 import { assertWorkerOrNode, isApp, isDesktop } from "../../../common/Env.js"
 import { EntityClient } from "../../../common/EntityClient.js"
-import { getEnabledMailAddressesForGroupInfo, getUserGroupMemberships } from "../../../common/utils/GroupUtils.js"
+import { getUserGroupMemberships, isAliasEnabledForGroupInfo } from "../../../common/utils/GroupUtils.js"
 import { containsId, elementIdPart, getElementId, getLetId, isSameId, listIdPart, stringToCustomId } from "../../../common/utils/EntityUtils.js"
 import { htmlToText } from "../../../common/utils/IndexUtils.js"
 import { MailBodyTooLargeError } from "../../../common/error/MailBodyTooLargeError.js"
@@ -1027,13 +1026,13 @@ export class MailFacade {
 		return promiseFilter(getUserGroupMemberships(user, GroupType.Mail), (groupMembership) => {
 			return this.entityClient.load(GroupTypeRef, groupMembership.group).then((mailGroup) => {
 				if (mailGroup.user == null) {
-					return this.entityClient.load(GroupInfoTypeRef, groupMembership.groupInfo).then((mailGroupInfo) => {
-						return contains(getEnabledMailAddressesForGroupInfo(mailGroupInfo), mailAddress)
-					})
+					return this.entityClient
+						.load(GroupInfoTypeRef, groupMembership.groupInfo)
+						.then((mailGroupInfo) => isAliasEnabledForGroupInfo(mailGroupInfo, mailAddress))
 				} else if (isSameId(mailGroup.user, user._id)) {
-					return this.entityClient.load(GroupInfoTypeRef, user.userGroup.groupInfo).then((userGroupInfo) => {
-						return contains(getEnabledMailAddressesForGroupInfo(userGroupInfo), mailAddress)
-					})
+					return this.entityClient
+						.load(GroupInfoTypeRef, user.userGroup.groupInfo)
+						.then((userGroupInfo) => isAliasEnabledForGroupInfo(userGroupInfo, mailAddress))
 				} else {
 					// not supported
 					return false

src/common/mailFunctionality/SendMailModel.ts

@@ -44,7 +44,7 @@ import {
 import Stream from "mithril/stream"
 import stream from "mithril/stream"
 import type { File as TutanotaFile } from "../../common/api/entities/tutanota/TypeRefs.js"
-import { checkAttachmentSize, getDefaultSender, getTemplateLanguages, isUserEmail, RecipientField } from "./SharedMailUtils.js"
+import { checkAttachmentSize, getDefaultSender, getTemplateLanguages, isAliasEnabledWithUser, isUserEmail, RecipientField } from "./SharedMailUtils.js"
 import { cloneInlineImages, InlineImages, revokeInlineImages } from "./inlineImagesUtils.js"
 import { RecipientsModel, ResolvableRecipient } from "../api/main/RecipientsModel.js"
 import { getAvailableLanguageCode, getSubstitutedLanguageCode, lang, Language, languages, MaybeTranslation, TranslationKey } from "../misc/LanguageViewModel.js"
@@ -590,7 +590,10 @@ export class SendMailModel {
 		this.recipientsResolved.getAsync()
 
 		// .toLowerCase because all our aliases and accounts are lowercased on creation
-		this.senderAddress = senderMailAddress?.toLowerCase() || this.getDefaultSender()
+		this.senderAddress =
+			senderMailAddress != null && isAliasEnabledWithUser(this.mailboxDetails, this.user().userGroupInfo, senderMailAddress)
+				? senderMailAddress.toLowerCase()
+				: this.getDefaultSender()
 		this.confidential = confidential ?? !this.user().props.defaultUnconfidential
 		this.attachments = []
 

src/common/mailFunctionality/SharedMailUtils.ts

@@ -2,7 +2,7 @@ import { assertMainOrNode } from "../api/common/Env.js"
 import { CustomerPropertiesTypeRef, GroupInfo, User } from "../api/entities/sys/TypeRefs.js"
 import { Contact, createContact, createContactMailAddress, Mail } from "../api/entities/tutanota/TypeRefs.js"
 import { fullNameToFirstAndLastName, mailAddressToFirstAndLastName } from "../misc/parsing/MailAddressParser.js"
-import { assertNotNull, contains, neverNull, uint8ArrayToBase64 } from "@tutao/tutanota-utils"
+import { assertNotNull, neverNull, uint8ArrayToBase64 } from "@tutao/tutanota-utils"
 import {
 	ALLOWED_IMAGE_FORMATS,
 	ContactAddressType,
@@ -16,7 +16,7 @@ import {
 	TUTA_MAIL_ADDRESS_DOMAINS,
 } from "../api/common/TutanotaConstants.js"
 import { UserController } from "../api/main/UserController.js"
-import { getEnabledMailAddressesForGroupInfo, getGroupInfoDisplayName } from "../api/common/utils/GroupUtils.js"
+import { getEnabledMailAddressesForGroupInfo, getGroupInfoDisplayName, isAliasEnabledForGroupInfo } from "../api/common/utils/GroupUtils.js"
 import { lang, Language, TranslationKey } from "../misc/LanguageViewModel.js"
 import { MailboxDetail } from "./MailboxModel.js"
 import { LoginController } from "../api/main/LoginController.js"
@@ -99,13 +99,19 @@ export function getEnabledMailAddressesWithUser(mailboxDetail: MailboxDetail, us
 	}
 }
 
+export function isAliasEnabledWithUser(mailboxDetail: MailboxDetail, userGroupInfo: GroupInfo, aliasAddress: string): boolean {
+	if (isUserMailbox(mailboxDetail)) {
+		return isAliasEnabledForGroupInfo(userGroupInfo, aliasAddress)
+	} else {
+		return isAliasEnabledForGroupInfo(mailboxDetail.mailGroupInfo, aliasAddress)
+	}
+}
+
 /**
  * @return {string} default mail address
  */
 export function getDefaultSenderFromUser({ props, userGroupInfo }: UserController): string {
-	return props.defaultSender && contains(getEnabledMailAddressesForGroupInfo(userGroupInfo), props.defaultSender)
-		? props.defaultSender
-		: neverNull(userGroupInfo.mailAddress)
+	return props.defaultSender && isAliasEnabledForGroupInfo(userGroupInfo, props.defaultSender) ? props.defaultSender : neverNull(userGroupInfo.mailAddress)
 }
 
 export function isUserMailbox(mailboxDetails: MailboxDetail): boolean {
@@ -123,7 +129,7 @@ export function getDefaultSender(logins: LoginController, mailboxDetails: Mailbo
 export function isUserEmail(logins: LoginController, mailboxDetails: MailboxDetail, address: string): boolean {
 	if (isUserMailbox(mailboxDetails)) {
 		return (
-			contains(getEnabledMailAddressesWithUser(mailboxDetails, logins.getUserController().userGroupInfo), address) ||
+			isAliasEnabledWithUser(mailboxDetails, logins.getUserController().userGroupInfo, address) ||
 			logins.getUserController().userGroupInfo.mailAddress === address
 		)
 	} else {

src/common/sharing/GroupSharingUtils.ts

@@ -5,7 +5,7 @@ import { showProgressDialog } from "../gui/dialogs/ProgressDialog"
 import type { GroupSharingTexts } from "./GroupGuiUtils"
 import { getDefaultGroupName, getInvitationGroupType, getSharedGroupName } from "./GroupUtils"
 import { PartialRecipient, Recipients } from "../api/common/recipients/Recipient"
-import { getDefaultSender, getEnabledMailAddressesWithUser, getSenderNameForUser } from "../mailFunctionality/SharedMailUtils.js"
+import { getDefaultSender, getSenderNameForUser, isAliasEnabledWithUser } from "../mailFunctionality/SharedMailUtils.js"
 
 export function sendShareNotificationEmail(sharedGroupInfo: GroupInfo, recipients: Array<PartialRecipient>, texts: GroupSharingTexts) {
 	locator.mailboxModel.getUserMailboxDetails().then((mailboxDetails) => {
@@ -89,7 +89,7 @@ function _sendNotificationEmail(recipients: Recipients, subject: string, body: s
 			usePlaceholderForInlineImages: false,
 		}).html
 		locator.mailboxModel.getUserMailboxDetails().then(async (mailboxDetails) => {
-			const sender = getEnabledMailAddressesWithUser(mailboxDetails, locator.logins.getUserController().userGroupInfo).includes(senderMailAddress)
+			const sender = isAliasEnabledWithUser(mailboxDetails, locator.logins.getUserController().userGroupInfo, senderMailAddress)
 				? senderMailAddress
 				: getDefaultSender(locator.logins, mailboxDetails)