Changeset 39177

Timestamp:

11/09/2016 01:34:56 AM (8 years ago)

Author:

rmccue

Message:

REST API: Fire correct hooks when creating users on multiste.

add_user_to_blog() is now called, ensuring the correct hooks are called, along with setting the primary blog and clearing relevant caches.

Props jeremyfelt.
Fixes #38526.

Location:

trunk

Files:

• src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php (modified) (2 diffs)
• tests/phpunit/includes/testcase-rest-controller.php (modified) (1 diff)
• tests/phpunit/tests/rest-api/rest-users-controller.php (modified) (4 diffs)

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php

@@ -435 +435 @@
                 return $user_id;
             }
+
+            add_user_to_blog( get_site()->id, $user_id, '' );
         } else {
             $user_id = wp_insert_user( $user );
@@ -558 +560 @@
 
         $user = get_user_by( 'id', $id );
+
+        if ( is_multisite() && ! is_user_member_of_blog( $id ) ) {
+            add_user_to_blog( get_current_blog_id(), $id, '' );
+        }
 
         if ( ! empty( $request['roles'] ) ) {

trunk/tests/phpunit/includes/testcase-rest-controller.php

@@ -41 +41 @@
 
     public function filter_rest_url_for_leading_slash( $url, $path ) {
+        if ( is_multisite() ) {
+            return $url;
+        }
+
         // Make sure path for rest_url has a leading slash for proper resolution.
-        $this->assertTrue( 0 === strpos( $path, '/' ) );
+        $this->assertTrue( 0 === strpos( $path, '/' ), 'REST API URL should have a leading slash.' );
 
         return $url;

trunk/tests/phpunit/tests/rest-api/rest-users-controller.php

@@ -13 +13 @@
     protected static $user;
     protected static $editor;
+    protected static $site;
 
     public static function wpSetUpBeforeClass( $factory ) {
@@ -22 +23 @@
             'user_email' => 'editor@example.com',
         ) );
+
+        if ( is_multisite() ) {
+            self::$site = $factory->blog->create( array( 'domain' => 'rest.wordpress.org', 'path' => '/' ) );
+        }
     }
 
@@ -27 +32 @@
         self::delete_user( self::$user );
         self::delete_user( self::$editor );
+
+        if ( is_multisite() ) {
+            wpmu_delete_blog( self::$site, true );
+        }
     }
 
@@ -705 +714 @@
         $this->assertEquals( array( 'editor' ), $data['roles'] );
         $this->check_add_edit_user_response( $response );
+    }
+
+    public function test_create_new_network_user_on_site_does_not_add_user_to_sub_site() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( 'Test requires multisite.' );
+        }
+
+        $this->allow_user_to_manage_multisite();
+
+        $params = array(
+            'username' => 'testuser123',
+            'password' => 'testpassword',
+            'email'    => 'test@example.com',
+            'name'     => 'Test User 123',
+            'roles'    => array( 'editor' ),
+        );
+
+        $request = new WP_REST_Request( 'POST', '/wp/v2/users' );
+        $request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+        $request->set_body_params( $params );
+        $response = $this->server->dispatch( $request );
+        $data = $response->get_data();
+        $user_id = $data['id'];
+
+        $user_is_member = is_user_member_of_blog( $user_id, self::$site );
+
+        wpmu_delete_user( $user_id );
+
+        $this->assertFalse( $user_is_member );
+    }
+
+    public function test_create_new_network_user_on_sub_site_adds_user_to_site() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( 'Test requires multisite.' );
+        }
+
+        $this->allow_user_to_manage_multisite();
+
+        $params = array(
+            'username' => 'testuser123',
+            'password' => 'testpassword',
+            'email'    => 'test@example.com',
+            'name'     => 'Test User 123',
+            'roles'    => array( 'editor' ),
+        );
+
+        switch_to_blog( self::$site );
+
+        $request = new WP_REST_Request( 'POST', '/wp/v2/users' );
+        $request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+        $request->set_body_params( $params );
+        $response = $this->server->dispatch( $request );
+        $data = $response->get_data();
+        $user_id = $data['id'];
+
+        restore_current_blog();
+
+        $user_is_member = is_user_member_of_blog( $user_id, self::$site );
+
+        wpmu_delete_user( $user_id );
+
+        $this->assertTrue( $user_is_member );
+    }
+
+    public function test_create_existing_network_user_on_sub_site_has_error() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( 'Test requires multisite.' );
+        }
+
+        $this->allow_user_to_manage_multisite();
+
+        $params = array(
+            'username' => 'testuser123',
+            'password' => 'testpassword',
+            'email'    => 'test@example.com',
+            'name'     => 'Test User 123',
+            'roles'    => array( 'editor' ),
+        );
+
+        $request = new WP_REST_Request( 'POST', '/wp/v2/users' );
+        $request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+        $request->set_body_params( $params );
+        $response = $this->server->dispatch( $request );
+        $data = $response->get_data();
+        $user_id = $data['id'];
+
+        switch_to_blog( self::$site );
+
+        $request = new WP_REST_Request( 'POST', '/wp/v2/users' );
+        $request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+        $request->set_body_params( $params );
+        $switched_response = $this->server->dispatch( $request );
+
+        restore_current_blog();
+
+        wpmu_delete_user( $user_id );
+
+        $this->assertErrorResponse( 'user_name', $switched_response );
+    }
+
+    public function test_update_existing_network_user_on_sub_site_adds_user_to_site() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( 'Test requires multisite.' );
+        }
+
+        $this->allow_user_to_manage_multisite();
+
+        $params = array(
+            'username' => 'testuser123',
+            'password' => 'testpassword',
+            'email'    => 'test@example.com',
+            'name'     => 'Test User 123',
+            'roles'    => array( 'editor' ),
+        );
+
+        $request = new WP_REST_Request( 'POST', '/wp/v2/users' );
+        $request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+        $request->set_body_params( $params );
+        $response = $this->server->dispatch( $request );
+        $data = $response->get_data();
+        $user_id = $data['id'];
+
+        switch_to_blog( self::$site );
+
+        $request = new WP_REST_Request( 'PUT', '/wp/v2/users/' . $user_id );
+        $request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+        $request->set_body_params( $params );
+        $this->server->dispatch( $request );
+
+        restore_current_blog();
+
+        $user_is_member = is_user_member_of_blog( $user_id, self::$site );
+
+        wpmu_delete_user( $user_id );
+
+        $this->assertTrue( $user_is_member );
     }