Connector: improve connection and disconnection flows (#47902)

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/23938692821

Upstream-Ref: Automattic/jetpack@3db4980

Author: coder-karen

jetpack_vendor/automattic/jetpack-connection/src/connectors/class-wpcom-connector.php

@@ -35,6 +35,20 @@ class Wpcom_Connector {
 	 */
 	const MODULE_ID = '@automattic/jetpack-connection-connectors';
 
+	/**
+	 * Screen ID assigned by WordPress to the Gutenberg plugin's connectors submenu page.
+	 *
+	 * @var string
+	 */
+	const GUTENBERG_CONNECTORS_SCREEN_ID = 'settings_page_options-connectors-wp-admin';
+
+	/**
+	 * Page slug registered by the Gutenberg plugin for the connectors submenu page.
+	 *
+	 * @var string
+	 */
+	const GUTENBERG_CONNECTORS_PAGE_SLUG = 'options-connectors-wp-admin';
+
 	/**
 	 * Initialize the connector.
 	 */
@@ -277,7 +291,7 @@ private static function resolve_user_fields( $wp_user, $wpcom_user_data ) {
 	 */
 	private static function is_connectors_screen( $screen ) {
 		return 'options-connectors' === $screen->id
-			|| 'settings_page_options-connectors-wp-admin' === $screen->id;
+			|| static::GUTENBERG_CONNECTORS_SCREEN_ID === $screen->id;
 	}
 
 	/**
@@ -289,6 +303,11 @@ private static function is_connectors_screen( $screen ) {
 	 * `options-general.php` for menu highlighting, so we distinguish them by
 	 * checking the actual script filename being served.
 	 *
+	 * Note: for the Gutenberg case we use the registered page slug directly,
+	 * not `$screen->id`. WordPress auto-prefixes screen IDs for submenu pages
+	 * (e.g. `settings_page_options-connectors-wp-admin`), so using `$screen->id`
+	 * as the `page=` parameter produces an invalid URL.
+	 *
 	 * The result is suitable for the `redirect_uri` parameter accepted by the
 	 * `jetpack/v4/connection/register` REST endpoint (which wraps it in `admin_url()`).
 	 *
@@ -304,8 +323,8 @@ private static function get_connectors_page_path() {
 
 		// Gutenberg plugin registers the page under options-general.php.
 		$screen = get_current_screen();
-		if ( $screen ) {
-			return 'options-general.php?page=' . rawurlencode( $screen->id );
+		if ( $screen && static::GUTENBERG_CONNECTORS_SCREEN_ID === $screen->id ) {
+			return 'options-general.php?page=' . static::GUTENBERG_CONNECTORS_PAGE_SLUG;
 		}
 
 		return 'options-connectors.php';

jetpack_vendor/automattic/jetpack-connection/src/connectors/js/connectors-card.js

@@ -519,18 +519,22 @@ function ExpandedDetails( { isConnecting = false, onConnect = null } ) {
 	};
 
 	const handleUnlinkUser = () => {
-		if ( currentUser?.isOwner && currentUser?.hasOtherConnectedUsers ) {
-			setPendingConfirm( {
-				title: __( 'Disconnect user account', 'jetpack-connection' ),
-				message: __(
-					'Disconnecting the owner account will remove the WordPress.com account connection for all users on this site. The site will remain connected to WordPress.com.',
-					'jetpack-connection'
-				),
-				onConfirm: executeUnlinkUser,
-			} );
-		} else {
-			executeUnlinkUser();
-		}
+		const message =
+			currentUser?.isOwner && currentUser?.hasOtherConnectedUsers
+				? __(
+						'Disconnecting the owner account will remove the WordPress.com account connection for all users on this site. The site will remain connected to WordPress.com.',
+						'jetpack-connection'
+				  )
+				: __(
+						'Are you sure you want to disconnect your WordPress.com account? The site will remain connected to WordPress.com.',
+						'jetpack-connection'
+				  );
+
+		setPendingConfirm( {
+			title: __( 'Disconnect user account', 'jetpack-connection' ),
+			message,
+			onConfirm: executeUnlinkUser,
+		} );
 	};
 
 	return createElement(

jetpack_vendor/i18n-map.php

@@ -34,7 +34,7 @@
     ),
     'jetpack-connection' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-connection',
-      'ver' => '8.2.0-alpha1775120614',
+      'ver' => '8.2.0-alpha1775202404',
     ),
     'jetpack-explat' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-explat',