Revert "Domains: Implement multi-target email forwards (#98837)"

This reverts commit a1abc2c.

client/data/emails/types.ts

@@ -9,36 +9,6 @@ export type EmailAccountEmail = {
 	warnings: Warning[];
 };
 
-export type ResponseError = {
-	error:
-		| 'destination_failed'
-		| 'invalid_input'
-		| 'not_valid_destination'
-		| 'destination_failed'
-		| 'too_many_destinations'
-		| 'exceeded_mailbox_forwards'
-		| 'mailbox_too_long'
-		| 'not_valid_mailbox'
-		| 'empty_destination'
-		| 'same_destination_domain'
-		| 'forward_exists';
-	message:
-		| string
-		| {
-				error_message: string;
-				/**
-				 * The index of the faulty email address in the `destinations` array
-				 */
-				index: number;
-		  };
-};
-
-export type AlterDestinationParams = {
-	mailbox: string;
-	destination: string;
-	domain: string;
-};
-
 type EmailAccountDomain = {
 	domain: string;
 	is_primary: boolean;
@@ -75,5 +45,4 @@ export type Mailbox = {
 	mailbox: string;
 	warnings?: Warning[];
 	temporary?: boolean;
-	target: string;
 };

client/data/emails/use-add-email-forward-mutation.tsx

@@ -8,13 +8,10 @@ import { useDispatch, useSelector } from 'calypso/state';
 import { errorNotice } from 'calypso/state/notices/actions';
 import { getSelectedSiteId } from 'calypso/state/ui/selectors';
 import { getCacheKey as getEmailAccountsQueryKey } from './use-get-email-accounts-query';
-import type { ResponseError } from './types';
 import type { UseMutationOptions } from '@tanstack/react-query';
 
-const ArrayOfFive = new Array( 5 );
-
 type AddMailboxFormData = {
-	destinations: typeof ArrayOfFive;
+	destination: string;
 	mailbox: string;
 };
 
@@ -41,7 +38,7 @@ export function useIsLoading() {
 export default function useAddEmailForwardMutation(
 	domainName: string,
 	mutationOptions: Omit<
-		UseMutationOptions< any, ResponseError, AddMailboxFormData, Context >,
+		UseMutationOptions< any, unknown, AddMailboxFormData, Context >,
 		'mutationFn'
 	> = {}
 ) {
@@ -68,7 +65,7 @@ export default function useAddEmailForwardMutation(
 	};
 
 	mutationOptions.onMutate = async ( variables ) => {
-		const { mailbox, destinations } = variables;
+		const { mailbox, destination } = variables;
 		suppliedOnMutate?.( variables );
 
 		await queryClient.cancelQueries( { queryKey: emailAccountsQueryKey } );
@@ -82,16 +79,16 @@ export default function useAddEmailForwardMutation(
 			const newEmailForwards = orderBy(
 				[
 					...emailForwards,
-					...destinations.map( ( d ) => ( {
+					{
 						domain: domainName,
 						email_type: 'email_forward',
 						is_verified: false,
 						mailbox,
 						role: 'standard',
-						target: d,
+						target: destination,
 						temporary: true,
 						warnings: [],
-					} ) ),
+					},
 				],
 				[ 'mailbox' ],
 				[ 'asc' ]
@@ -138,7 +135,7 @@ export default function useAddEmailForwardMutation(
 		};
 	};
 
-	mutationOptions.onError = ( error: ResponseError, variables, context ) => {
+	mutationOptions.onError = ( error, variables, context ) => {
 		suppliedOnError?.( error, variables, context );
 
 		if ( context ) {
@@ -166,14 +163,12 @@ export default function useAddEmailForwardMutation(
 		);
 
 		if ( error ) {
-			const message =
-				typeof error.message === 'object' ? error.message.error_message : error.message;
 			errorMessage = translate(
 				'Failed to add email forward for {{strong}}%(emailAddress)s{{/strong}} with message "%(message)s". Please try again or {{contactSupportLink}}contact support{{/contactSupportLink}}.',
 				{
 					args: {
 						emailAddress: variables.mailbox,
-						message,
+						message: error as string,
 					},
 					components: noticeComponents,
 				}
@@ -183,11 +178,11 @@ export default function useAddEmailForwardMutation(
 		dispatch( errorNotice( errorMessage ) );
 	};
 
-	return useMutation< any, ResponseError, AddMailboxFormData, Context >( {
-		mutationFn: ( { mailbox, destinations } ) =>
+	return useMutation< any, unknown, AddMailboxFormData, Context >( {
+		mutationFn: ( { mailbox, destination } ) =>
 			wp.req.post( `/domains/${ encodeURIComponent( domainName ) }/email/new`, {
 				mailbox,
-				destinations,
+				destination,
 			} ),
 		...mutationOptions,
 	} );

client/data/emails/use-remove-email-forward-mutation.tsx

@@ -8,7 +8,7 @@ import { useDispatch, useSelector } from 'calypso/state';
 import { errorNotice } from 'calypso/state/notices/actions';
 import { getSelectedSiteId } from 'calypso/state/ui/selectors';
 import { getCacheKey as getEmailAccountsQueryKey } from './use-get-email-accounts-query';
-import type { EmailAccountEmail, AlterDestinationParams, Mailbox } from './types';
+import type { EmailAccountEmail } from './types';
 import type { UseMutationOptions } from '@tanstack/react-query';
 
 type Context = {
@@ -26,7 +26,7 @@ const MUTATION_KEY = 'removeEmailForward';
 export default function useRemoveEmailForwardMutation(
 	domainName: string,
 	mutationOptions: Omit<
-		UseMutationOptions< any, unknown, AlterDestinationParams, Context >,
+		UseMutationOptions< any, unknown, EmailAccountEmail, Context >,
 		'mutationFn'
 	> = {}
 ) {
@@ -70,11 +70,7 @@ export default function useRemoveEmailForwardMutation(
 					{
 						...previousEmailAccountsQueryData.accounts[ 0 ],
 						emails: emailForwards.filter(
-							( forward: EmailAccountEmail ) =>
-								! (
-									forward.mailbox === emailForward.mailbox &&
-									forward.target === emailForward.destination
-								)
+							( forward: EmailAccountEmail ) => forward.mailbox !== emailForward.mailbox
 						),
 					},
 				],
@@ -144,14 +140,13 @@ export default function useRemoveEmailForwardMutation(
 		dispatch( errorMessage );
 	};
 
-	return useMutation< Mailbox, unknown, AlterDestinationParams, Context >( {
-		mutationFn: ( { mailbox, destination } ) => {
-			return wp.req.post(
+	return useMutation< any, unknown, EmailAccountEmail, Context >( {
+		mutationFn: ( { mailbox } ) =>
+			wp.req.post(
 				`/domains/${ encodeURIComponent( domainName ) }/email/${ encodeURIComponent(
 					mailbox
-				) }/${ encodeURIComponent( destination ) }/delete`
-			);
-		},
+				) }/delete`
+			),
 		...mutationOptions,
 	} );
 }

client/data/emails/use-resend-verify-email-forward-mutation.tsx

@@ -1,10 +1,11 @@
 import { CALYPSO_CONTACT } from '@automattic/urls';
 import { useMutation } from '@tanstack/react-query';
 import { useTranslate } from 'i18n-calypso';
+import { getEmailForwardAddress } from 'calypso/lib/emails';
 import wp from 'calypso/lib/wp';
 import { useDispatch } from 'calypso/state';
 import { errorNotice, successNotice } from 'calypso/state/notices/actions';
-import type { AlterDestinationParams } from './types';
+import type { EmailAccountEmail } from './types';
 import type { UseMutationOptions } from '@tanstack/react-query';
 
 const MUTATION_KEY = 'reverifyEmailForward';
@@ -17,10 +18,7 @@ const MUTATION_KEY = 'reverifyEmailForward';
  */
 export default function useResendVerifyEmailForwardMutation(
 	domainName: string,
-	mutationOptions: Omit<
-		UseMutationOptions< any, unknown, AlterDestinationParams >,
-		'mutationFn'
-	> = {}
+	mutationOptions: Omit< UseMutationOptions< any, unknown, EmailAccountEmail >, 'mutationFn' > = {}
 ) {
 	const dispatch = useDispatch();
 	const translate = useTranslate();
@@ -33,7 +31,7 @@ export default function useResendVerifyEmailForwardMutation(
 	mutationOptions.onSuccess = ( data, emailForward, context ) => {
 		suppliedOnSuccess?.( data, emailForward, context );
 
-		const { destination } = emailForward;
+		const destination = getEmailForwardAddress( emailForward );
 
 		const successMessage = translate(
 			'Successfully sent confirmation email for %(email)s to %(destination)s.',
@@ -71,12 +69,12 @@ export default function useResendVerifyEmailForwardMutation(
 		dispatch( errorNotice( failureMessage ) );
 	};
 
-	return useMutation< any, unknown, AlterDestinationParams >( {
-		mutationFn: ( { mailbox, destination } ) =>
+	return useMutation< any, unknown, EmailAccountEmail >( {
+		mutationFn: ( { mailbox } ) =>
 			wp.req.post(
 				`/domains/${ encodeURIComponent( domainName ) }/email/${ encodeURIComponent(
 					mailbox
-				) }/${ encodeURIComponent( destination ) }/resend-verification`
+				) }/resend-verification`
 			),
 		...mutationOptions,
 	} );

client/lib/domains/email-forwarding/has-duplicated-email-forwards.js

@@ -0,0 +1,7 @@
+/**
+ * @param newEmailForward a string representing a new email forward
+ * @returns { boolean } If the email forward is present in the existing email forwards collection
+ */
+export function hasDuplicatedEmailForwards( newEmailForward, existingEmailForwards ) {
+	return existingEmailForwards?.some( ( forward ) => forward.mailbox === newEmailForward );
+}

client/lib/domains/email-forwarding/index.js

@@ -1,3 +1,38 @@
+import emailValidator from 'email-validator';
+import { mapValues } from 'lodash';
+import { hasDuplicatedEmailForwards } from 'calypso/lib/domains/email-forwarding/has-duplicated-email-forwards';
+
+function validateAllFields( fieldValues, existingEmailForwards = [] ) {
+	return mapValues( fieldValues, ( value, fieldName ) => {
+		const isValid = validateField( {
+			value,
+			name: fieldName,
+		} );
+
+		if ( ! isValid ) {
+			return [ 'Invalid' ];
+		}
+
+		if ( fieldName !== 'mailbox' ) {
+			return [];
+		}
+
+		return hasDuplicatedEmailForwards( value, existingEmailForwards ) ? [ 'Duplicated' ] : [];
+	} );
+}
+
+function validateField( { name, value } ) {
+	switch ( name ) {
+		case 'mailbox':
+			return /^[a-z0-9._+-]{1,64}$/i.test( value ) && ! /(^\.)|(\.{2,})|(\.$)/.test( value );
+		case 'destination':
+			return emailValidator.validate( value );
+		default:
+			return true;
+	}
+}
+
 export { getEmailForwardsCount } from './get-email-forwards-count';
 export { hasEmailForwards } from './has-email-forwards';
 export { getDomainsWithEmailForwards } from './get-domains-with-email-forwards';
+export { validateAllFields };