Fix/error when non admin user disconnects site

projects/js-packages/connection/changelog/fix-error-when-non-admin-user-disconnects-site

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fix error when non-admin disconnects

projects/js-packages/connection/components/disconnect-dialog/steps/step-disconnect.jsx

@@ -173,7 +173,7 @@ const StepDisconnect = props => {
 					</div>
 				</div>
 				{ disconnectError && (
-					<p className="jp-connection__disconnect-dialog__error">{ disconnectError }</p>
+					<p className="jp-connection__disconnect-dialog__error">{ disconnectError.toString() }</p>
 				) }
 			</div>
 		</React.Fragment>
@@ -188,7 +188,7 @@ StepDisconnect.propTypes = {
 	/** Callback function that is triggered by clicking the "Disconnect" button. */
 	onDisconnect: PropTypes.func,
 	/** An error that occurred during a request to disconnect. */
-	disconnectError: PropTypes.bool,
+	disconnectError: PropTypes.oneOfType( [ PropTypes.object, PropTypes.bool ] ),
 	/** A component to be rendered as part of this step */
 	disconnectStepComponent: PropTypes.element,
 	/** Plugins that are using the Jetpack connection. */

projects/packages/connection/changelog/fix-error-when-non-admin-user-disconnects-site

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fix error when non-admin tries to disconnect user account

projects/packages/connection/src/class-rest-connector.php

@@ -549,7 +549,7 @@ public static function connection_plugins_permission_check() {
 	 * @return bool|WP_Error True if user is able to disconnect the site or the request is signed with a blog token (aka a direct request from WPCOM).
 	 */
 	public static function disconnect_site_permission_check() {
-		if ( current_user_can( 'jetpack_disconnect' ) ) {
+		if ( current_user_can( 'jetpack_disconnect' ) || current_user_can( 'jetpack_connect_user' ) ) {
 			return true;
 		}
 
@@ -918,6 +918,11 @@ public static function update_user_token( $request ) {
 	public static function disconnect_site() {
 		$connection = new Manager();
 
+		if ( ! current_user_can( 'jetpack_disconnect' ) ) {
+			$connection->disconnect_user();
+			return rest_ensure_response( array( 'code' => 'success' ) );
+		}
+
 		if ( $connection->is_connected() ) {
 			$connection->disconnect_site();
 			return rest_ensure_response( array( 'code' => 'success' ) );