Add user connection check

Author: simison

projects/packages/admin-ui/src/class-admin-menu.php

@@ -279,8 +279,8 @@ private static function should_show_upgrade_menu() {
 			}
 		}
 
-		// Only show after the site is connected.
-		if ( ! self::is_site_connected() ) {
+		// Only show after the site and current user are connected.
+		if ( ! self::is_site_and_user_connected() ) {
 			return false;
 		}
 
@@ -289,25 +289,30 @@ private static function should_show_upgrade_menu() {
 	}
 
 	/**
-	 * Checks whether the site is connected to WordPress.com.
+	 * Checks whether the site and current user are connected to WordPress.com.
 	 *
-	 * @return bool True if the site has a connected blog ID.
+	 * @return bool True if site and current user are connected.
 	 */
-	private static function is_site_connected() {
+	private static function is_site_and_user_connected() {
 		$connection_manager = self::$connection_manager;
 		if ( ! $connection_manager && class_exists( '\Automattic\Jetpack\Connection\Manager' ) ) {
 			$connection_manager = new \Automattic\Jetpack\Connection\Manager();
 		}
 
-		if ( $connection_manager && is_callable( array( $connection_manager, 'is_connected' ) ) ) {
-			return (bool) $connection_manager->is_connected();
+		if (
+			$connection_manager
+			&& is_callable( array( $connection_manager, 'is_connected' ) )
+			&& is_callable( array( $connection_manager, 'is_user_connected' ) )
+		) {
+			return (bool) $connection_manager->is_connected()
+				&& (bool) $connection_manager->is_user_connected( get_current_user_id() );
 		}
 
 		return false;
 	}
 
 	/**
-	 * Sets the connection manager dependency.
+	 * Sets the connection manager dependency; used by tests.
 	 *
 	 * @param object|null $connection_manager Connection manager object.
 	 * @return void

projects/packages/admin-ui/tests/php/Admin_Menu_Test.php

@@ -96,6 +96,7 @@ public function setUp(): void {
 			->disableOriginalConstructor()
 			->getMock();
 		$connection->method( 'is_connected' )->willReturn( true );
+		$connection->method( 'is_user_connected' )->willReturn( true );
 		Admin_Menu::set_connection_manager( $connection );
 		wp_dequeue_style( 'jetpack-admin-ui-upgrade-menu' );
 		wp_deregister_style( 'jetpack-admin-ui-upgrade-menu' );
@@ -219,6 +220,10 @@ public function test_upgrade_menu_item_shown_for_free_plan_admin() {
 		$connection->expects( $this->once() )
 			->method( 'is_connected' )
 			->willReturn( true );
+		$connection->expects( $this->once() )
+			->method( 'is_user_connected' )
+			->with( self::$admin_user_id )
+			->willReturn( true );
 		Admin_Menu::set_connection_manager( $connection );
 
 		Admin_Menu::init();