Changeset 48315

Timestamp:

07/05/2020 11:19:35 AM (4 years ago)

Author:

ocean90

Message:

Multisite: Delete the signup entry when a user is deleted from the database.

When a user has registered with incorrect data and got the account deleted immediately, it currently wasn't possible to register with the same login or email address again due to the existing signup entry. They had to wait for two days until the entry gets automatically deleted. Now the associated signup entry gets deleted as part of the account deletion.

Fixes #43232.

Location:

trunk

Files:

• src/wp-includes/ms-default-filters.php (modified) (1 diff)
• src/wp-includes/ms-functions.php (modified) (1 diff)
• tests/phpunit/tests/multisite/wpmuValidateUserSignup.php (modified) (5 diffs)

trunk/src/wp-includes/ms-default-filters.php

@@ -32 +32 @@
 add_action( 'network_user_new_created_user', 'wp_send_new_user_notifications' );
 add_filter( 'sanitize_user', 'strtolower' );
+add_action( 'deleted_user', 'wp_delete_signup_on_user_delete', 10, 3 );
 
 // Roles.

trunk/src/wp-includes/ms-functions.php

@@ -1275 +1275 @@
         'meta'     => $meta,
     );
+}
+
+/**
+ * Deletes am associated signup entry when a user is deleted from the database.
+ *
+ * @since 5.5.0
+ *
+ * @param int      $id       ID of the user to delete.
+ * @param int|null $reassign ID of the user to reassign posts and links to.
+ * @param WP_User  $user     User object.
+ */
+function wp_delete_signup_on_user_delete( $id, $reassign, $user ) {
+    global $wpdb;
+
+    $wpdb->delete( $wpdb->signups, array( 'user_login' => $user->user_login ) );
 }
 

trunk/tests/phpunit/tests/multisite/wpmuValidateUserSignup.php

@@ -85 +85 @@
         public function test_should_fail_for_existing_signup_with_same_username() {
             // Don't send notifications.
-            add_filter( 'wpmu_signup_user_notification', '__return_true' );
-            wpmu_signup_user( 'foo123', 'foo@example.com' );
-            remove_filter( 'wpmu_signup_user_notification', '__return_true' );
+            add_filter( 'wpmu_signup_user_notification', '__return_false' );
+            wpmu_signup_user( 'foo123', 'foo@example.com' );
+            remove_filter( 'wpmu_signup_user_notification', '__return_false' );
 
             $v = wpmu_validate_user_signup( 'foo123', 'foo2@example.com' );
@@ -95 +95 @@
         public function test_should_not_fail_for_existing_signup_with_same_username_if_signup_is_old() {
             // Don't send notifications.
-            add_filter( 'wpmu_signup_user_notification', '__return_true' );
-            wpmu_signup_user( 'foo123', 'foo@example.com' );
-            remove_filter( 'wpmu_signup_user_notification', '__return_true' );
+            add_filter( 'wpmu_signup_user_notification', '__return_false' );
+            wpmu_signup_user( 'foo123', 'foo@example.com' );
+            remove_filter( 'wpmu_signup_user_notification', '__return_false' );
 
             global $wpdb;
@@ -109 +109 @@
         public function test_should_fail_for_existing_signup_with_same_email() {
             // Don't send notifications.
-            add_filter( 'wpmu_signup_user_notification', '__return_true' );
-            wpmu_signup_user( 'foo123', 'foo@example.com' );
-            remove_filter( 'wpmu_signup_user_notification', '__return_true' );
+            add_filter( 'wpmu_signup_user_notification', '__return_false' );
+            wpmu_signup_user( 'foo123', 'foo@example.com' );
+            remove_filter( 'wpmu_signup_user_notification', '__return_false' );
 
             $v = wpmu_validate_user_signup( 'foo2', 'foo@example.com' );
@@ -119 +119 @@
         public function test_should_not_fail_for_existing_signup_with_same_email_if_signup_is_old() {
             // Don't send notifications.
-            add_filter( 'wpmu_signup_user_notification', '__return_true' );
-            wpmu_signup_user( 'foo123', 'foo@example.com' );
-            remove_filter( 'wpmu_signup_user_notification', '__return_true' );
+            add_filter( 'wpmu_signup_user_notification', '__return_false' );
+            wpmu_signup_user( 'foo123', 'foo@example.com' );
+            remove_filter( 'wpmu_signup_user_notification', '__return_false' );
 
             global $wpdb;
@@ -129 +129 @@
             $v = wpmu_validate_user_signup( 'foo2', 'foo2@example.com' );
             $this->assertNotContains( 'user_email', $v['errors']->get_error_codes() );
+        }
+
+        /**
+         * @ticket 43232
+         */
+        public function test_should_not_fail_for_data_used_by_a_deleted_user() {
+            global $wpdb;
+
+            // Don't send notifications.
+            add_filter( 'wpmu_signup_user_notification', '__return_false' );
+            add_filter( 'wpmu_welcome_user_notification', '__return_false' );
+
+            // Signup, activate and delete new user.
+            wpmu_signup_user( 'foo123', 'foo@example.com' );
+            $key  = $wpdb->get_var( "SELECT activation_key FROM $wpdb->signups WHERE user_login = 'foo123'" );
+            $user = wpmu_activate_signup( $key );
+            wpmu_delete_user( $user['user_id'] );
+
+            $valid = wpmu_validate_user_signup( 'foo123', 'foo2@example.com' );
+
+            remove_filter( 'wpmu_signup_user_notification', '__return_false' );
+            remove_filter( 'wpmu_signup_user_notification', '__return_false' );
+
+            $this->assertNotContains( 'user_name', $valid['errors']->get_error_codes() );
+            $this->assertNotContains( 'user_email', $valid['errors']->get_error_codes() );
         }