Handle redirect for successful passwordless form signup

client/blocks/signup-form/index.jsx

@@ -1302,16 +1302,11 @@ class SignupForm extends Component {
 						onInputBlur={ this.handleBlur }
 						onInputChange={ this.handleChangeEvent }
 						onCreateAccountError={ ( error, email ) => {
-							if ( [ 'already_taken', 'already_active', 'email_exists' ].includes( error.error ) ) {
-								page(
-									addQueryArgs(
-										{
-											email_address: email,
-											is_signup_existing_account: true,
-										},
-										logInUrl
-									)
-								);
+							// TODO: Determine if there's a better way to handle a custom create account error
+							if ( this.props.onPasswordlessCreateAccountError ) {
+								this.props.onPasswordlessCreateAccountError( error, email );
+								this.setState( { disabled: false, submitting: false } );
+								return;
 							}
 						} }
 						{ ...formProps }

client/blocks/signup-form/passwordless.jsx

@@ -137,6 +137,11 @@ class PasswordlessSignupForm extends Component {
 				isSubmitting: false,
 			} );
 		}
+
+		// TODO: Figure out how to appropriately update submitting property
+		this.setState( {
+			isSubmitting: false,
+		} );
 		this.props.onCreateAccountError?.( error, this.state.email );
 	};
 

client/signup/config/flows-pure.js

@@ -44,7 +44,7 @@ const getEmailSubscriptionFlow = () => {
 				{
 					name: 'email-subscription',
 					steps: [ 'subscribing-email' ],
-					destination: ( dependencies ) => `${ dependencies.redirectUrl }`,
+					destination: ( dependencies ) => `${ dependencies.redirect }`,
 					description:
 						'Signup flow that subscripes user to guides appointments for email campaigns',
 					lastModified: '2024-06-17',

client/signup/config/steps-pure.js

@@ -437,7 +437,7 @@ export function generateSteps( {
 		'subscribing-email': {
 			stepName: 'subscribing-email',
 			dependencies: [ 'email', 'redirect_to', 'mailing_list' ],
-			providesDependencies: [ 'redirectUrl' ],
+			providesDependencies: [ 'redirect', 'username', 'marketing_price_group', 'bearer_token' ],
 		},
 		mailbox: {
 			stepName: 'mailbox',

client/signup/steps/subscribing-email/content.jsx

@@ -1,11 +1,23 @@
+import { addQueryArgs } from '@wordpress/url';
 import { localize } from 'i18n-calypso';
 import SignupForm from 'calypso/blocks/signup-form';
 import ReskinnedProcessingScreen from 'calypso/signup/reskinned-processing-screen';
 
 function SubscribingEmailStepContent( props ) {
-	const { flowName, handleSubmitSignup, isLoading, stepName, step, translate, queryParams } = props;
+	const {
+		flowName,
+		handleSubmitSignup,
+		isLoading,
+		stepName,
+		step,
+		translate,
+		queryParams,
+		goToNextStep,
+	} = props;
 
-	const redirectUrl = queryParams?.redirect_to || 'https://wordpress.com';
+	const redirect_to = queryParams?.redirect_to
+		? addQueryArgs( queryParams.redirect_to, { subscribed: true } )
+		: 'https://wordpress.com';
 	const email = queryParams?.email;
 
 	if ( isLoading ) {
@@ -19,11 +31,12 @@ function SubscribingEmailStepContent( props ) {
 				stepName={ stepName }
 				flowName={ flowName }
 				email={ email || '' }
-				redirectToAfterLoginUrl={ redirectUrl }
+				goToNextStep={ goToNextStep }
 				displayUsernameInput={ false }
+				redirectToAfterLoginUrl={ redirect_to }
 				suggestedUsername=""
 				isPasswordless
-				queryArgs={ { user_email: email } || {} }
+				queryArgs={ { user_email: email, redirect_to } || {} }
 				isSocialSignupEnabled={ false }
 				// recaptchaClientId={ this.state.recaptchaClientId }
 				isReskinned
@@ -32,6 +45,9 @@ function SubscribingEmailStepContent( props ) {
 				labelText={ translate( 'Your email' ) }
 				submitButtonText={ translate( 'Create an account' ) }
 				submitForm={ handleSubmitSignup }
+				onPasswordlessCreateAccountError={ () => {} }
+				// TODO: Do we need the save property?
+				save={ () => {} }
 			/>
 		</>
 	);

client/signup/steps/subscribing-email/index.jsx

@@ -39,7 +39,7 @@ const createNewAccount = async ( {
 		} );
 		submitSignupStep(
 			{ stepName: 'subscribing-email' },
-			{ redirectUrl: addQueryArgs( redirect_to, { subscribed: true } ) }
+			{ redirect: addQueryArgs( redirect_to, { subscribed: true } ) }
 		);
 		goToNextStep();
 		return;
@@ -53,7 +53,7 @@ const createNewAccount = async ( {
 
 			submitSignupStep(
 				{ stepName: 'subscribing-email' },
-				{ redirectUrl: addQueryArgs( redirect_to, { subscribed: true } ) }
+				{ redirect: addQueryArgs( redirect_to, { subscribed: true } ) }
 			);
 			goToNextStep();
 		}