From 83fcea883f693eb82d5d6b5b274b6073db72e4bf Mon Sep 17 00:00:00 2001 From: Anthony Grullon Date: Fri, 10 May 2024 05:58:10 -0400 Subject: [PATCH] SSO: Log error message from user invite response (#37144) * Log error message from user invite response * changelog * Check for wp_error * Retrieve error message * Copy changes to connection package * changelog * Connection package version update * Display user invite error message * update query param key * Update logic to display error message on users screen * Sync latest sso user admin changes in Connection package * Update connection package version * Remove duplicate changelogs * Update projects/packages/connection/src/sso/class-user-admin.php Co-authored-by: Jeremy Herve * Update projects/packages/connection/src/sso/class-user-admin.php Co-authored-by: Jeremy Herve * Update projects/plugins/jetpack/modules/sso/class.jetpack-sso-user-admin.php Co-authored-by: Jeremy Herve * Update projects/plugins/jetpack/modules/sso/class.jetpack-sso-user-admin.php Co-authored-by: Jeremy Herve * Display api error response for invite revoke * Update revoke user invite error tracking * Bump version --------- Co-authored-by: mindbuc Co-authored-by: Jeremy Herve --- .../update-invite-user-error-response-logging | 4 ++ projects/packages/connection/composer.json | 2 +- .../connection/src/class-package-version.php | 2 +- .../connection/src/sso/class-user-admin.php | 55 ++++++++++++++----- .../update-invite-user-error-response-logging | 5 ++ .../composer.lock | 4 +- .../update-invite-user-error-response-logging | 5 ++ projects/plugins/backup/composer.json | 2 +- projects/plugins/backup/composer.lock | 4 +- projects/plugins/backup/jetpack-backup.php | 2 +- .../update-invite-user-error-response-logging | 5 ++ projects/plugins/boost/composer.lock | 4 +- .../update-invite-user-error-response-logging | 5 ++ projects/plugins/inspect/composer.lock | 4 +- .../update-invite-user-error-response-logging | 4 ++ projects/plugins/jetpack/composer.lock | 4 +- .../sso/class.jetpack-sso-user-admin.php | 55 ++++++++++++++----- .../update-invite-user-error-response-logging | 5 ++ projects/plugins/migration/composer.lock | 4 +- .../update-invite-user-error-response-logging | 5 ++ .../plugins/mu-wpcom-plugin/composer.json | 2 +- .../plugins/mu-wpcom-plugin/composer.lock | 4 +- .../mu-wpcom-plugin/mu-wpcom-plugin.php | 2 +- projects/plugins/mu-wpcom-plugin/package.json | 2 +- .../update-invite-user-error-response-logging | 5 ++ projects/plugins/protect/composer.lock | 4 +- .../update-invite-user-error-response-logging | 5 ++ projects/plugins/search/composer.lock | 4 +- .../update-invite-user-error-response-logging | 5 ++ projects/plugins/social/composer.lock | 4 +- .../update-invite-user-error-response-logging | 5 ++ projects/plugins/starter-plugin/composer.lock | 4 +- .../update-invite-user-error-response-logging | 5 ++ projects/plugins/videopress/composer.lock | 4 +- 34 files changed, 176 insertions(+), 59 deletions(-) create mode 100644 projects/packages/connection/changelog/update-invite-user-error-response-logging create mode 100644 projects/plugins/automattic-for-agencies-client/changelog/update-invite-user-error-response-logging create mode 100644 projects/plugins/backup/changelog/update-invite-user-error-response-logging create mode 100644 projects/plugins/boost/changelog/update-invite-user-error-response-logging create mode 100644 projects/plugins/inspect/changelog/update-invite-user-error-response-logging create mode 100644 projects/plugins/jetpack/changelog/update-invite-user-error-response-logging create mode 100644 projects/plugins/migration/changelog/update-invite-user-error-response-logging create mode 100644 projects/plugins/mu-wpcom-plugin/changelog/update-invite-user-error-response-logging create mode 100644 projects/plugins/protect/changelog/update-invite-user-error-response-logging create mode 100644 projects/plugins/search/changelog/update-invite-user-error-response-logging create mode 100644 projects/plugins/social/changelog/update-invite-user-error-response-logging create mode 100644 projects/plugins/starter-plugin/changelog/update-invite-user-error-response-logging create mode 100644 projects/plugins/videopress/changelog/update-invite-user-error-response-logging diff --git a/projects/packages/connection/changelog/update-invite-user-error-response-logging b/projects/packages/connection/changelog/update-invite-user-error-response-logging new file mode 100644 index 0000000000000..5644052da63e4 --- /dev/null +++ b/projects/packages/connection/changelog/update-invite-user-error-response-logging @@ -0,0 +1,4 @@ +Significance: minor +Type: changed + +SSO: Improve user invite error logging diff --git a/projects/packages/connection/composer.json b/projects/packages/connection/composer.json index 759d822b9cc7a..355b6bafd0e82 100644 --- a/projects/packages/connection/composer.json +++ b/projects/packages/connection/composer.json @@ -69,7 +69,7 @@ "link-template": "https://github.com/Automattic/jetpack-connection/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.7.x-dev" + "dev-trunk": "2.8.x-dev" }, "dependencies": { "test-only": [ diff --git a/projects/packages/connection/src/class-package-version.php b/projects/packages/connection/src/class-package-version.php index d97274214cb1e..702bd661d3734 100644 --- a/projects/packages/connection/src/class-package-version.php +++ b/projects/packages/connection/src/class-package-version.php @@ -12,7 +12,7 @@ */ class Package_Version { - const PACKAGE_VERSION = '2.7.7'; + const PACKAGE_VERSION = '2.8.0-alpha'; const PACKAGE_SLUG = 'connection'; diff --git a/projects/packages/connection/src/sso/class-user-admin.php b/projects/packages/connection/src/sso/class-user-admin.php index c11ac814ad778..0bbdbf019c036 100644 --- a/projects/packages/connection/src/sso/class-user-admin.php +++ b/projects/packages/connection/src/sso/class-user-admin.php @@ -112,12 +112,18 @@ public function revoke_user_invite( $user_id ) { $event = 'sso_user_invite_revoked'; if ( 200 !== wp_remote_retrieve_response_code( $response ) ) { + $body = json_decode( wp_remote_retrieve_body( $response ) ); + $tracking_event_data = array( + 'success' => 'false', + 'error_code' => 'invalid-revoke-api-error', + ); + + if ( ! empty( $body ) && ! empty( $body->message ) ) { + $tracking_event_data['error_message'] = $body->message; + } self::$tracking->record_user_event( $event, - array( - 'success' => 'false', - 'error_message' => 'invalid-revoke-api-error', - ) + $tracking_event_data ); return $response; } @@ -171,6 +177,10 @@ public function handle_invitation_results() { return wp_admin_notice( __( 'User invite revoked successfully.', 'jetpack-connection' ), array( 'type' => 'success' ) ); } + if ( $_GET['jetpack-sso-invite-user'] === 'failed' && isset( $_GET['jetpack-sso-api-error-message'] ) ) { + return wp_admin_notice( wp_kses( wp_unslash( $_GET['jetpack-sso-api-error-message'] ), array() ), array( 'type' => 'error' ) ); + } + if ( $_GET['jetpack-sso-invite-user'] === 'failed' && isset( $_GET['jetpack-sso-invite-error'] ) ) { switch ( $_GET['jetpack-sso-invite-error'] ) { case 'invalid-user': @@ -261,19 +271,27 @@ public function invite_user_to_wpcom() { ); if ( 200 !== wp_remote_retrieve_response_code( $response ) ) { - $error = 'invalid-invite-api-error'; + $error_code = 'invalid-invite-api-error'; $query_params = array( 'jetpack-sso-invite-user' => 'failed', - 'jetpack-sso-invite-error' => $error, + 'jetpack-sso-invite-error' => $error_code, '_wpnonce' => $nonce, ); + $tracking_event_data = array( + 'success' => 'false', + 'error_code' => $error_code, + ); + + $body = json_decode( wp_remote_retrieve_body( $response ) ); + if ( ! empty( $body ) && ! empty( $body->message ) ) { + $query_params['jetpack-sso-api-error-message'] = $body->message; + $tracking_event_data['error_message'] = $body->message; + } + self::$tracking->record_user_event( $event, - array( - 'success' => 'false', - 'error_message' => $error, - ) + $tracking_event_data ); return self::create_error_notice_and_redirect( $query_params ); } @@ -410,12 +428,21 @@ public function handle_request_revoke_invite() { 'jetpack-sso-invite-error' => $error, // general error message '_wpnonce' => $nonce, ); + + $tracking_event_data = array( + 'success' => 'false', + 'error_code' => $error, + ); + + $body = json_decode( wp_remote_retrieve_body( $response ) ); + if ( ! empty( $body ) && ! empty( $body->message ) ) { + $query_params['jetpack-sso-api-error-message'] = $body->message; + $tracking_event_data['error_message'] = $body->message; + } + self::$tracking->record_user_event( $event, - array( - 'success' => 'false', - 'error_message' => $error, - ) + $tracking_event_data ); return self::create_error_notice_and_redirect( $query_params ); } diff --git a/projects/plugins/automattic-for-agencies-client/changelog/update-invite-user-error-response-logging b/projects/plugins/automattic-for-agencies-client/changelog/update-invite-user-error-response-logging new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/automattic-for-agencies-client/changelog/update-invite-user-error-response-logging @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/automattic-for-agencies-client/composer.lock b/projects/plugins/automattic-for-agencies-client/composer.lock index 5ad8e0bfb8dfa..02e82942e0c7e 100644 --- a/projects/plugins/automattic-for-agencies-client/composer.lock +++ b/projects/plugins/automattic-for-agencies-client/composer.lock @@ -385,7 +385,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "ef847deea958cb05bab52cbc11f924f5b8eab365" + "reference": "bba49ffca10ebb3868ca3db25ddbf34c5eb72120" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -420,7 +420,7 @@ "link-template": "https://github.com/Automattic/jetpack-connection/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.7.x-dev" + "dev-trunk": "2.8.x-dev" }, "dependencies": { "test-only": [ diff --git a/projects/plugins/backup/changelog/update-invite-user-error-response-logging b/projects/plugins/backup/changelog/update-invite-user-error-response-logging new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/backup/changelog/update-invite-user-error-response-logging @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/backup/composer.json b/projects/plugins/backup/composer.json index 05e80add9414d..92608fd0b08ef 100644 --- a/projects/plugins/backup/composer.json +++ b/projects/plugins/backup/composer.json @@ -34,7 +34,7 @@ "minimum-stability": "dev", "prefer-stable": true, "config": { - "autoloader-suffix": "9559eef123208b7d1b9c15b978567267_backupⓥ2_6", + "autoloader-suffix": "9559eef123208b7d1b9c15b978567267_backupⓥ2_7_alpha", "allow-plugins": { "automattic/jetpack-autoloader": true, "automattic/jetpack-composer-plugin": true diff --git a/projects/plugins/backup/composer.lock b/projects/plugins/backup/composer.lock index a3d9e0a269ad2..07b7820237b7e 100644 --- a/projects/plugins/backup/composer.lock +++ b/projects/plugins/backup/composer.lock @@ -668,7 +668,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "ef847deea958cb05bab52cbc11f924f5b8eab365" + "reference": "bba49ffca10ebb3868ca3db25ddbf34c5eb72120" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -703,7 +703,7 @@ "link-template": "https://github.com/Automattic/jetpack-connection/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.7.x-dev" + "dev-trunk": "2.8.x-dev" }, "dependencies": { "test-only": [ diff --git a/projects/plugins/backup/jetpack-backup.php b/projects/plugins/backup/jetpack-backup.php index 0fa9eb7d0a173..580efc5669c08 100644 --- a/projects/plugins/backup/jetpack-backup.php +++ b/projects/plugins/backup/jetpack-backup.php @@ -4,7 +4,7 @@ * Plugin Name: Jetpack VaultPress Backup * Plugin URI: https://jetpack.com/jetpack-backup * Description: Easily restore or download a backup of your site from a specific moment in time. - * Version: 2.6 + * Version: 2.7-alpha * Author: Automattic - Jetpack Backup team * Author URI: https://jetpack.com/ * License: GPLv2 or later diff --git a/projects/plugins/boost/changelog/update-invite-user-error-response-logging b/projects/plugins/boost/changelog/update-invite-user-error-response-logging new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/boost/changelog/update-invite-user-error-response-logging @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/boost/composer.lock b/projects/plugins/boost/composer.lock index 7ba8b422e7391..8f458dcd320c0 100644 --- a/projects/plugins/boost/composer.lock +++ b/projects/plugins/boost/composer.lock @@ -523,7 +523,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "ef847deea958cb05bab52cbc11f924f5b8eab365" + "reference": "bba49ffca10ebb3868ca3db25ddbf34c5eb72120" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -558,7 +558,7 @@ "link-template": "https://github.com/Automattic/jetpack-connection/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.7.x-dev" + "dev-trunk": "2.8.x-dev" }, "dependencies": { "test-only": [ diff --git a/projects/plugins/inspect/changelog/update-invite-user-error-response-logging b/projects/plugins/inspect/changelog/update-invite-user-error-response-logging new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/inspect/changelog/update-invite-user-error-response-logging @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/inspect/composer.lock b/projects/plugins/inspect/composer.lock index 90dabf6c074f9..fa058a3fc64e2 100644 --- a/projects/plugins/inspect/composer.lock +++ b/projects/plugins/inspect/composer.lock @@ -385,7 +385,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "ef847deea958cb05bab52cbc11f924f5b8eab365" + "reference": "bba49ffca10ebb3868ca3db25ddbf34c5eb72120" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -420,7 +420,7 @@ "link-template": "https://github.com/Automattic/jetpack-connection/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.7.x-dev" + "dev-trunk": "2.8.x-dev" }, "dependencies": { "test-only": [ diff --git a/projects/plugins/jetpack/changelog/update-invite-user-error-response-logging b/projects/plugins/jetpack/changelog/update-invite-user-error-response-logging new file mode 100644 index 0000000000000..87881bbd97ce0 --- /dev/null +++ b/projects/plugins/jetpack/changelog/update-invite-user-error-response-logging @@ -0,0 +1,4 @@ +Significance: minor +Type: other + +Update invite user error response logging diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock index c87328e51a73e..22fb1d9bf220c 100644 --- a/projects/plugins/jetpack/composer.lock +++ b/projects/plugins/jetpack/composer.lock @@ -901,7 +901,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "ef847deea958cb05bab52cbc11f924f5b8eab365" + "reference": "bba49ffca10ebb3868ca3db25ddbf34c5eb72120" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -936,7 +936,7 @@ "link-template": "https://github.com/Automattic/jetpack-connection/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.7.x-dev" + "dev-trunk": "2.8.x-dev" }, "dependencies": { "test-only": [ diff --git a/projects/plugins/jetpack/modules/sso/class.jetpack-sso-user-admin.php b/projects/plugins/jetpack/modules/sso/class.jetpack-sso-user-admin.php index c48fc12dd8652..865fc066b80af 100644 --- a/projects/plugins/jetpack/modules/sso/class.jetpack-sso-user-admin.php +++ b/projects/plugins/jetpack/modules/sso/class.jetpack-sso-user-admin.php @@ -103,12 +103,18 @@ public function revoke_user_invite( $user_id ) { $event = 'sso_user_invite_revoked'; if ( 200 !== wp_remote_retrieve_response_code( $response ) ) { + $body = json_decode( wp_remote_retrieve_body( $response ) ); + $tracking_event_data = array( + 'success' => 'false', + 'error_code' => 'invalid-revoke-api-error', + ); + + if ( ! empty( $body ) && ! empty( $body->message ) ) { + $tracking_event_data['error_message'] = $body->message; + } self::$tracking->record_user_event( $event, - array( - 'success' => 'false', - 'error_message' => 'invalid-revoke-api-error', - ) + $tracking_event_data ); return $response; } @@ -162,6 +168,10 @@ public function handle_invitation_results() { return wp_admin_notice( __( 'User invite revoked successfully.', 'jetpack' ), array( 'type' => 'success' ) ); } + if ( $_GET['jetpack-sso-invite-user'] === 'failed' && isset( $_GET['jetpack-sso-api-error-message'] ) ) { + return wp_admin_notice( wp_kses( wp_unslash( $_GET['jetpack-sso-api-error-message'] ), array() ), array( 'type' => 'error' ) ); + } + if ( $_GET['jetpack-sso-invite-user'] === 'failed' && isset( $_GET['jetpack-sso-invite-error'] ) ) { switch ( $_GET['jetpack-sso-invite-error'] ) { case 'invalid-user': @@ -252,19 +262,27 @@ public function invite_user_to_wpcom() { ); if ( 200 !== wp_remote_retrieve_response_code( $response ) ) { - $error = 'invalid-invite-api-error'; + $error_code = 'invalid-invite-api-error'; $query_params = array( 'jetpack-sso-invite-user' => 'failed', - 'jetpack-sso-invite-error' => $error, + 'jetpack-sso-invite-error' => $error_code, '_wpnonce' => $nonce, ); + $tracking_event_data = array( + 'success' => 'false', + 'error_code' => $error_code, + ); + + $body = json_decode( wp_remote_retrieve_body( $response ) ); + if ( ! empty( $body ) && ! empty( $body->message ) ) { + $query_params['jetpack-sso-api-error-message'] = $body->message; + $tracking_event_data['error_message'] = $body->message; + } + self::$tracking->record_user_event( $event, - array( - 'success' => 'false', - 'error_message' => $error, - ) + $tracking_event_data ); return self::create_error_notice_and_redirect( $query_params ); } @@ -397,12 +415,21 @@ public function handle_request_revoke_invite() { 'jetpack-sso-invite-error' => $error, // general error message '_wpnonce' => $nonce, ); + + $tracking_event_data = array( + 'success' => 'false', + 'error_code' => $error, + ); + + $body = json_decode( wp_remote_retrieve_body( $response ) ); + if ( ! empty( $body ) && ! empty( $body->message ) ) { + $query_params['jetpack-sso-api-error-message'] = $body->message; + $tracking_event_data['error_message'] = $body->message; + } + self::$tracking->record_user_event( $event, - array( - 'success' => 'false', - 'error_message' => $error, - ) + $tracking_event_data ); return self::create_error_notice_and_redirect( $query_params ); } diff --git a/projects/plugins/migration/changelog/update-invite-user-error-response-logging b/projects/plugins/migration/changelog/update-invite-user-error-response-logging new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/migration/changelog/update-invite-user-error-response-logging @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/migration/composer.lock b/projects/plugins/migration/composer.lock index 65c35c742db1c..50ae25a6da253 100644 --- a/projects/plugins/migration/composer.lock +++ b/projects/plugins/migration/composer.lock @@ -668,7 +668,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "ef847deea958cb05bab52cbc11f924f5b8eab365" + "reference": "bba49ffca10ebb3868ca3db25ddbf34c5eb72120" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -703,7 +703,7 @@ "link-template": "https://github.com/Automattic/jetpack-connection/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.7.x-dev" + "dev-trunk": "2.8.x-dev" }, "dependencies": { "test-only": [ diff --git a/projects/plugins/mu-wpcom-plugin/changelog/update-invite-user-error-response-logging b/projects/plugins/mu-wpcom-plugin/changelog/update-invite-user-error-response-logging new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/mu-wpcom-plugin/changelog/update-invite-user-error-response-logging @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/mu-wpcom-plugin/composer.json b/projects/plugins/mu-wpcom-plugin/composer.json index e55d773d5b597..6adcff2372999 100644 --- a/projects/plugins/mu-wpcom-plugin/composer.json +++ b/projects/plugins/mu-wpcom-plugin/composer.json @@ -46,6 +46,6 @@ ] }, "config": { - "autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_1_22" + "autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_1_23_alpha" } } diff --git a/projects/plugins/mu-wpcom-plugin/composer.lock b/projects/plugins/mu-wpcom-plugin/composer.lock index 6ea8a15873f06..c957e065e6139 100644 --- a/projects/plugins/mu-wpcom-plugin/composer.lock +++ b/projects/plugins/mu-wpcom-plugin/composer.lock @@ -316,7 +316,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "ef847deea958cb05bab52cbc11f924f5b8eab365" + "reference": "bba49ffca10ebb3868ca3db25ddbf34c5eb72120" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -351,7 +351,7 @@ "link-template": "https://github.com/Automattic/jetpack-connection/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.7.x-dev" + "dev-trunk": "2.8.x-dev" }, "dependencies": { "test-only": [ diff --git a/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php b/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php index 9e6d47be78cea..efc46337cd188 100644 --- a/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php +++ b/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php @@ -3,7 +3,7 @@ * * Plugin Name: WordPress.com Features * Description: Test plugin for the jetpack-mu-wpcom package - * Version: 2.1.22 + * Version: 2.1.23-alpha * Author: Automattic * License: GPLv2 or later * Text Domain: jetpack-mu-wpcom-plugin diff --git a/projects/plugins/mu-wpcom-plugin/package.json b/projects/plugins/mu-wpcom-plugin/package.json index f7a0eaadb9c8b..d524ec0868504 100644 --- a/projects/plugins/mu-wpcom-plugin/package.json +++ b/projects/plugins/mu-wpcom-plugin/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-mu-wpcom-plugin", - "version": "2.1.22", + "version": "2.1.23-alpha", "description": "Test plugin for the jetpack-mu-wpcom package", "homepage": "https://jetpack.com", "bugs": { diff --git a/projects/plugins/protect/changelog/update-invite-user-error-response-logging b/projects/plugins/protect/changelog/update-invite-user-error-response-logging new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/protect/changelog/update-invite-user-error-response-logging @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/protect/composer.lock b/projects/plugins/protect/composer.lock index 60e9ee8409622..b0156239345a3 100644 --- a/projects/plugins/protect/composer.lock +++ b/projects/plugins/protect/composer.lock @@ -580,7 +580,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "ef847deea958cb05bab52cbc11f924f5b8eab365" + "reference": "bba49ffca10ebb3868ca3db25ddbf34c5eb72120" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -615,7 +615,7 @@ "link-template": "https://github.com/Automattic/jetpack-connection/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.7.x-dev" + "dev-trunk": "2.8.x-dev" }, "dependencies": { "test-only": [ diff --git a/projects/plugins/search/changelog/update-invite-user-error-response-logging b/projects/plugins/search/changelog/update-invite-user-error-response-logging new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/search/changelog/update-invite-user-error-response-logging @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/search/composer.lock b/projects/plugins/search/composer.lock index 4f4c36760997c..177f60c9f9b60 100644 --- a/projects/plugins/search/composer.lock +++ b/projects/plugins/search/composer.lock @@ -523,7 +523,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "ef847deea958cb05bab52cbc11f924f5b8eab365" + "reference": "bba49ffca10ebb3868ca3db25ddbf34c5eb72120" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -558,7 +558,7 @@ "link-template": "https://github.com/Automattic/jetpack-connection/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.7.x-dev" + "dev-trunk": "2.8.x-dev" }, "dependencies": { "test-only": [ diff --git a/projects/plugins/social/changelog/update-invite-user-error-response-logging b/projects/plugins/social/changelog/update-invite-user-error-response-logging new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/social/changelog/update-invite-user-error-response-logging @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/social/composer.lock b/projects/plugins/social/composer.lock index b8aab0e664dc1..7a7c5efb0e350 100644 --- a/projects/plugins/social/composer.lock +++ b/projects/plugins/social/composer.lock @@ -523,7 +523,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "ef847deea958cb05bab52cbc11f924f5b8eab365" + "reference": "bba49ffca10ebb3868ca3db25ddbf34c5eb72120" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -558,7 +558,7 @@ "link-template": "https://github.com/Automattic/jetpack-connection/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.7.x-dev" + "dev-trunk": "2.8.x-dev" }, "dependencies": { "test-only": [ diff --git a/projects/plugins/starter-plugin/changelog/update-invite-user-error-response-logging b/projects/plugins/starter-plugin/changelog/update-invite-user-error-response-logging new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/starter-plugin/changelog/update-invite-user-error-response-logging @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/starter-plugin/composer.lock b/projects/plugins/starter-plugin/composer.lock index d4450e8980e09..58d2bf5a76d1d 100644 --- a/projects/plugins/starter-plugin/composer.lock +++ b/projects/plugins/starter-plugin/composer.lock @@ -523,7 +523,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "ef847deea958cb05bab52cbc11f924f5b8eab365" + "reference": "bba49ffca10ebb3868ca3db25ddbf34c5eb72120" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -558,7 +558,7 @@ "link-template": "https://github.com/Automattic/jetpack-connection/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.7.x-dev" + "dev-trunk": "2.8.x-dev" }, "dependencies": { "test-only": [ diff --git a/projects/plugins/videopress/changelog/update-invite-user-error-response-logging b/projects/plugins/videopress/changelog/update-invite-user-error-response-logging new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/videopress/changelog/update-invite-user-error-response-logging @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/videopress/composer.lock b/projects/plugins/videopress/composer.lock index 3444cfdedc1c9..18911dcf207d5 100644 --- a/projects/plugins/videopress/composer.lock +++ b/projects/plugins/videopress/composer.lock @@ -523,7 +523,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "ef847deea958cb05bab52cbc11f924f5b8eab365" + "reference": "bba49ffca10ebb3868ca3db25ddbf34c5eb72120" }, "require": { "automattic/jetpack-a8c-mc-stats": "@dev", @@ -558,7 +558,7 @@ "link-template": "https://github.com/Automattic/jetpack-connection/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "2.7.x-dev" + "dev-trunk": "2.8.x-dev" }, "dependencies": { "test-only": [