feat: if registering an email that already has an account, show different message

assets/blocks/reader-registration/block.json

@@ -39,7 +39,9 @@
 		"lists": {
 			"type": "array",
 			"default": [],
-			"items": { "type": "string" }
+			"items": {
+				"type": "string"
+			}
 		},
 		"haveAccountLabel": {
 			"type": "string",
@@ -48,6 +50,10 @@
 		"signInLabel": {
 			"type": "string",
 			"default": "Sign in"
+		},
+		"signedInLabel": {
+			"type": "string",
+			"default": "An account was already registered with this email. Please check your inbox for an authentication link."
 		}
 	},
 	"supports": {

assets/blocks/reader-registration/edit.js

@@ -34,7 +34,8 @@ import './editor.scss';
 
 const editedStateOptions = [
 	{ label: __( 'Initial', 'newspack' ), value: 'initial' },
-	{ label: __( 'Success', 'newspack' ), value: 'success' },
+	{ label: __( 'Registration Success', 'newspack' ), value: 'registration' },
+	{ label: __( 'Login Success', 'newspack' ), value: 'login' },
 ];
 export default function ReaderRegistrationEdit( {
 	setAttributes,
@@ -48,13 +49,13 @@ export default function ReaderRegistrationEdit( {
 		newsletterLabel,
 		haveAccountLabel,
 		signInLabel,
+		signedInLabel,
 		lists,
 		className,
 	},
 } ) {
 	const blockProps = useBlockProps();
 	const [ editedState, setEditedState ] = useState( editedStateOptions[ 0 ].value );
-	const isInitial = editedState === 'initial';
 
 	const innerBlocksProps = useInnerBlocksProps(
 		{},
@@ -176,12 +177,15 @@ export default function ReaderRegistrationEdit( {
 				<div className="newspack-registration__state-bar">
 					<span>{ __( 'Edited State', 'newspack' ) }</span>
 					<div>
-						<Button data-is-active={ isInitial } onClick={ () => setEditedState( 'initial' ) }>
-							{ __( 'Initial', 'newspack' ) }
-						</Button>
-						<Button data-is-active={ ! isInitial } onClick={ () => setEditedState( 'success' ) }>
-							{ __( 'Success', 'newspack' ) }
-						</Button>
+						{ editedStateOptions.map( option => (
+							<Button
+								key={ option.value }
+								data-is-active={ editedState === option.value }
+								onClick={ () => setEditedState( option.value ) }
+							>
+								{ option.label }
+							</Button>
+						) ) }
 					</div>
 				</div>
 				{ editedState === 'initial' && (
@@ -292,12 +296,24 @@ export default function ReaderRegistrationEdit( {
 						</form>
 					</div>
 				) }
-				{ editedState === 'success' && (
+				{ editedState === 'registration' && (
 					<>
 						<div className="newspack-registration__icon" />
 						<div { ...innerBlocksProps } />
 					</>
 				) }
+				{ editedState === 'login' && (
+					<>
+						<div className="newspack-registration__icon" />
+						<RichText
+							align="center"
+							onChange={ value => setAttributes( { signedInLabel: value } ) }
+							placeholder={ __( 'Logged in message…', 'newspack' ) }
+							value={ signedInLabel }
+							tagName="p"
+						/>
+					</>
+				) }
 			</div>
 		</>
 	);

assets/blocks/reader-registration/index.php

@@ -90,6 +90,7 @@ function render_block( $attrs, $content ) {
 		'newsletterLabel'  => __( 'Subscribe to our newsletter', 'newspack' ),
 		'haveAccountLabel' => __( 'Already have an account?', 'newspack' ),
 		'signInLabel'      => __( 'Sign in', 'newspack' ),
+		'signedInLabel'    => __( 'An account was already registered with this email. Please check your inbox for an authentication link.', 'newspack' ),
 	];
 	$attrs         = \wp_parse_args( $attrs, $default_attrs );
 	foreach ( $default_attrs as $key => $value ) {
@@ -190,6 +191,10 @@ function render_block( $attrs, $content ) {
 				<div class="newspack-registration__icon"></div>
 				<?php echo \wp_kses_post( $success_markup ); ?>
 			</div>
+			<div class="newspack-login__success newspack-registration--hidden">
+				<div class="newspack-registration__icon"></div>
+				<p class="has-text-align-center"><?php echo \wp_kses_post( $attrs['signedInLabel'] ); ?></p>
+			</div>
 		<?php endif; ?>
 	</div>
 	<?php
@@ -245,6 +250,7 @@ function send_form_response( $data, $message = '' ) {
 				[
 					'newspack_reader' => $is_error ? '0' : '1',
 					'message'         => $message,
+					'existing_user'   => isset( $data['existing_user'] ) && boolval( $data['existing_user'] ) ? 1 : 0,
 				],
 				\remove_query_arg( $args_to_remove )
 			)
@@ -297,6 +303,7 @@ function process_form() {
 		[
 			'email'         => $email,
 			'authenticated' => $user_logged_in,
+			'existing_user' => ! $user_logged_in,
 		]
 	);
 }

assets/blocks/reader-registration/view.js

@@ -38,7 +38,7 @@ function domReady( callback ) {
 
 			const messageElement = container.querySelector( '.newspack-registration__response' );
 			const submitElement = form.querySelector( 'input[type="submit"]' );
-			const successElement = container.querySelector( '.newspack-registration__success' );
+			let successElement = container.querySelector( '.newspack-registration__success' );
 
 			readerActivation.on( 'reader', ( { detail: { authenticated } } ) => {
 				if ( authenticated ) {
@@ -58,6 +58,10 @@ function domReady( callback ) {
 					messageNode = document.createElement( 'div' );
 					messageNode.textContent = message;
 				}
+				if ( data?.existing_user ) {
+					successElement = document.querySelector( '.newspack-login__success' );
+				}
+
 				const isSuccess = status === 200;
 				container.classList.add( `newspack-registration--${ isSuccess ? 'success' : 'error' }` );
 				if ( isSuccess ) {

includes/class-reader-activation.php

@@ -984,6 +984,7 @@ public static function register_reader( $email, $display_name = '', $authenticat
 		$user_id = false;
 
 		if ( $existing_user ) {
+			Logger::log( "User with $email already exists. Sending magic link." );
 			Magic_Link::send_email( $existing_user );
 		} else {
 			/**