Skip to content

Commit 0c11d69

Browse files
committed
Revert "[not verified] SSO: Validate the wpcom_user_id"
This reverts commit e98c3ba. This commit seemed to cause issues in some SSO environments.
1 parent e8f8268 commit 0c11d69

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

modules/sso.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -700,15 +700,6 @@ function handle_login() {
700700
$user_found_with = 'external_user_id';
701701
$user = get_user_by( 'id', intval( $user_data->external_user_id ) );
702702
if ( $user ) {
703-
$expected_id = get_user_meta( $user->ID, 'wpcom_user_id', true );
704-
if ( $expected_id && $expected_id !== $user_data->ID ) {
705-
$error = new WP_Error( 'expected_wpcom_user', __( 'Something got a little mixed up and an unexpected WordPress.com user logged in.', 'jetpack' ) );
706-
707-
/** This filter is documented in core/src/wp-includes/pluggable.php */
708-
do_action( 'wp_login_failed', $user_data->login, $error );
709-
add_filter( 'login_message', array( 'Jetpack_SSO_Notices', 'error_invalid_response_data' ) ); // @todo Need to have a better notice. This is only for the sake of testing the validation.
710-
return;
711-
}
712703
update_user_meta( $user->ID, 'wpcom_user_id', $user_data->ID );
713704
}
714705
}

0 commit comments

Comments
 (0)