Connection: My Jetpack - Ensure that token related errors are clearly attributable and actionable (#51034)

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

Upstream-Ref: Automattic/jetpack@3d85c2b

Author: coder-karen

composer.json

@@ -7,8 +7,8 @@
 		"automattic/jetpack-autoloader": "^5.0.23",
 		"automattic/jetpack-composer-plugin": "^4.0.9",
 		"automattic/jetpack-config": "^3.1.3",
-		"automattic/jetpack-connection": "^8.10.1",
-		"automattic/jetpack-my-jetpack": "^5.42.3",
+		"automattic/jetpack-connection": "^8.10.2-alpha",
+		"automattic/jetpack-my-jetpack": "^5.43.0-alpha",
 		"automattic/jetpack-search": "^7.4.0-alpha",
 		"automattic/jetpack-stats": "^0.20.2-alpha",
 		"automattic/jetpack-status": "^6.3.1-alpha",

jetpack_vendor/automattic/jetpack-connection/CHANGELOG.md

@@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [8.10.2-alpha] - unreleased
+
+This is an alpha version! The changes listed here are not final.
+
+### Security
+- Connection: Leave another user's broken-token error out of the connection error data, so the reconnect CTA is no longer offered against a token it cannot restore.
+
+### Changed
+- Connection: Warn a secondary admin that reconnecting on the connection owner's behalf transfers ownership and disconnects every other user.
+
+### Fixed
+- Connection: Stop displaying connection owner errors that refer to a previous owner.
+
 ## [8.10.1] - 2026-08-12
 ### Fixed
 - Report connection errors that happen while signing an outgoing request, record the specific reason the token could not be loaded, and store the request body hash with them. [#51116]
@@ -1990,6 +2003,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Separate the connection library into its own package.
 
+[8.10.2-alpha]: https://github.com/Automattic/jetpack-connection/compare/v8.10.1...v8.10.2-alpha
 [8.10.1]: https://github.com/Automattic/jetpack-connection/compare/v8.10.0...v8.10.1
 [8.10.0]: https://github.com/Automattic/jetpack-connection/compare/v8.9.0...v8.10.0
 [8.9.0]: https://github.com/Automattic/jetpack-connection/compare/v8.8.2...v8.9.0

jetpack_vendor/automattic/jetpack-connection/dist/jetpack-connection.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('jetpack-script-data', 'react', 'react-jsx-runtime', 'wp-a11y', 'wp-api-fetch', 'wp-components', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '2a34b42acafaa72e8fd6');
+<?php return array('dependencies' => array('jetpack-script-data', 'react', 'react-jsx-runtime', 'wp-a11y', 'wp-api-fetch', 'wp-components', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '4b984610682285071677');

jetpack_vendor/automattic/jetpack-connection/dist/jetpack-connection.js

@@ -341,8 +341,28 @@ public function get_displayable_errors() {
 						continue;
 					}
 
+					// An owner error attributed to someone who is no longer the connection
+					// owner describes a previous owner's token. Nobody can act on it.
+					// Only skip when there is a current owner to compare against.
+					if ( 'invalid_connection_owner' === $error_code
+						&& $owner_id > 0
+						&& (int) $user_id !== $owner_id ) {
+						continue;
+					}
+
 					$audience = $this->classify_error_audience( $user_id, $owner_id );
 
+					// A viewer is only ever shown errors for: their own user connection, the
+					// site connection, or the connection owner. Another (non-owner) user's
+					// broken token is invisible to everyone else, not just non-actionable.
+					// `invalid_connection_owner` is exempt: when there's no current owner to
+					// compare against, it falls back to 'user' audience by ID alone.
+					if ( 'user' === $audience
+						&& (int) $user_id !== $viewer_id
+						&& 'invalid_connection_owner' !== $error_code ) {
+						continue;
+					}
+
 					$message = __( "Your connection with WordPress.com seems to be broken. If you're experiencing issues, please try reconnecting.", 'jetpack-connection' );
 					$action  = null;
 
@@ -351,31 +371,43 @@ public function get_displayable_errors() {
 						$message = call_user_func( $display_config['message_callback'], $error );
 					}
 
-					// A secondary admin looking at the connection owner's token error, on a
-					// site where ownership is locked (a consumer declared it non-transferable).
-					// This admin cannot resolve the error themselves, so surface an
-					// informational notice naming the owner and offer no reconnect CTA.
-					if ( 'owner' === $audience && ! $viewer_is_owner && ! $is_transferable ) {
-						// Only name the owner for viewers who can act on connection issues:
-						// this output is also printed into the initial state for
-						// lower-capability users (e.g. contributors in the editor), who
-						// shouldn't learn who owns the connection. The name is resolved from
-						// the local user rather than get_connection_owner(), which
-						// re-reports the error and fails exactly when the token is broken.
-						$owner_name = '';
-						if ( current_user_can( 'jetpack_connect' ) ) {
+					// A secondary admin looking at the connection owner's token error. What
+					// they can usefully be told depends on whether ownership is transferable.
+					if ( 'owner' === $audience && ! $viewer_is_owner ) {
+						// Only name the owner, or describe what reconnecting would do, for
+						// viewers who can act on connection issues.
+						$viewer_can_connect = current_user_can( 'jetpack_connect' );
+						$owner_name         = '';
+						if ( $viewer_can_connect ) {
 							$owner      = get_userdata( $owner_id );
 							$owner_name = $owner instanceof \WP_User ? $owner->display_name : '';
 						}
 
-						$message = $owner_name
-							? sprintf(
-								/* translators: %s is the display name of the Jetpack connection owner. */
-								__( 'The connection owner (%s) needs to reconnect their WordPress.com account to restore the connection.', 'jetpack-connection' ),
-								$owner_name
-							)
-							: __( 'The connection owner needs to reconnect their WordPress.com account to restore the connection.', 'jetpack-connection' );
-						$action = 'none';
+						if ( ! $is_transferable ) {
+							// Ownership is locked (a consumer declared it non-transferable).
+							// This admin cannot resolve the error themselves, so surface an
+							// informational notice naming the owner and offer no reconnect CTA.
+							$message = $owner_name
+								? sprintf(
+									/* translators: %s is the display name of the Jetpack connection owner. */
+									__( 'The connection owner (%s) needs to reconnect their WordPress.com account to restore the connection.', 'jetpack-connection' ),
+									$owner_name
+								)
+								: __( 'The connection owner needs to reconnect their WordPress.com account to restore the connection.', 'jetpack-connection' );
+							$action = 'none';
+						} elseif ( $viewer_can_connect ) {
+							// Ownership is transferable, so the reconnect CTA stays available
+							// to this admin — but it is destructive in a way the generic copy
+							// doesn't convey. Manager::restore() branches on the *clicking*
+							// user's tokens, not on whose token the error describes.
+							$message = $owner_name
+								? sprintf(
+									/* translators: %s is the display name of the Jetpack connection owner. */
+									__( 'The connection owner (%s) needs to reconnect their WordPress.com account to restore the connection. If you reconnect instead, you will become the new connection owner and every other user will be disconnected from WordPress.com.', 'jetpack-connection' ),
+									$owner_name
+								)
+								: __( 'The connection owner needs to reconnect their WordPress.com account to restore the connection. If you reconnect instead, you will become the new connection owner and every other user will be disconnected from WordPress.com.', 'jetpack-connection' );
+						}
 					}
 
 					$error['audience']      = $audience;

jetpack_vendor/automattic/jetpack-connection/src/class-error-handler.php

@@ -12,7 +12,7 @@
  */
 class Package_Version {
 
-	const PACKAGE_VERSION = '8.10.1';
+	const PACKAGE_VERSION = '8.10.2-alpha';
 
 	const PACKAGE_SLUG = 'connection';
 

jetpack_vendor/automattic/jetpack-connection/src/class-package-version.php

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [5.43.0-alpha] - unreleased
+
+This is an alpha version! The changes listed here are not final.
+
+### Changed
+- Connection: Leave another user's broken token out of the connection error notice, since only that user can restore it.
+- Connection: Show the scope and error code of each connection error in the notice, instead of only the first error's message.
+
 ## [5.42.3] - 2026-08-12
 ### Changed
 - Protect: Test the site protection data endpoint against the real firewall configuration. [#51184]
@@ -2840,6 +2848,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Created package
 
+[5.43.0-alpha]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.42.3...5.43.0-alpha
 [5.42.3]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.42.2...5.42.3
 [5.42.2]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.42.1...5.42.2
 [5.42.1]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.42.0...5.42.1

jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md

@@ -1 +1 @@
-<?php return array('dependencies' => array('jetpack-connection', 'jetpack-script-data', 'jetpack-shared-stores', 'react', 'react-dom', 'react-jsx-runtime', 'wp-a11y', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-keycodes', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-private-apis', 'wp-rich-text', 'wp-theme', 'wp-url', 'wp-warning'), 'version' => '2380d233324a43dd20a4');
+<?php return array('dependencies' => array('jetpack-connection', 'jetpack-script-data', 'jetpack-shared-stores', 'react', 'react-dom', 'react-jsx-runtime', 'wp-a11y', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-keycodes', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-private-apis', 'wp-rich-text', 'wp-theme', 'wp-url', 'wp-warning'), 'version' => '527818c8c3a69e58d41d');