Changeset 49276 for trunk/tests/phpunit/tests/rest-api/rest-application-passwords-controller.php

Timestamp:

10/22/2020 03:04:23 PM (4 years ago)

Author:

TimothyBlynJacobs

Message:

App Passwords: Support an app_id to uniquely identify instances of an app.

Apps may now optionally include an app_id parameter when directing the user to the Authorize Application screen. This allows for instances of an application to be identified and potentially revoked or blocked.

Props TimothyBlynJacobs, georgestephanis.
Fixes #51583.

File:

• trunk/tests/phpunit/tests/rest-api/rest-application-passwords-controller.php (modified) (7 diffs)

trunk/tests/phpunit/tests/rest-api/rest-application-passwords-controller.php

@@ -309 +309 @@
         wp_set_current_user( self::$admin );
 
+        $app_id  = wp_generate_uuid4();
         $request = new WP_REST_Request( 'POST', '/wp/v2/users/me/application-passwords' );
-        $request->set_body_params( array( 'name' => 'App' ) );
+        $request->set_body_params(
+            array(
+                'name'   => 'App',
+                'app_id' => $app_id,
+            )
+        );
         $response = rest_do_request( $request );
 
@@ -319 +325 @@
         $this->check_response( $response->get_data(), $passwords[0], true );
         $this->assertEquals( 'App', $response->get_data()['name'] );
+        $this->assertEquals( $app_id, $response->get_data()['app_id'] );
         $this->assertNull( $response->get_data()['last_used'] );
         $this->assertNull( $response->get_data()['last_ip'] );
@@ -512 +519 @@
         $response = rest_do_request( $request );
         $this->assertErrorResponse( 'rest_application_password_not_found', $response, 404 );
+    }
+
+    /**
+     * @ticket 51583
+     */
+    public function test_update_item_cannot_overwrite_app_id() {
+        wp_set_current_user( self::$admin );
+        list( , $item ) = WP_Application_Passwords::create_new_application_password( self::$admin, array( 'name' => 'App' ) );
+
+        $uuid    = $item['uuid'];
+        $request = new WP_REST_Request( 'PUT', '/wp/v2/users/me/application-passwords/' . $uuid );
+        $request->set_body_params( array( 'app_id' => wp_generate_uuid4() ) );
+        $response = rest_do_request( $request );
+        $this->assertEquals( '', $response->get_data()['app_id'] );
+
+        $app_id = wp_generate_uuid4();
+
+        list( , $item ) = WP_Application_Passwords::create_new_application_password(
+            self::$admin,
+            array(
+                'name'   => 'App',
+                'app_id' => $app_id,
+            )
+        );
+
+        $uuid    = $item['uuid'];
+        $request = new WP_REST_Request( 'PUT', '/wp/v2/users/me/application-passwords/' . $uuid );
+        $request->set_body_params( array( 'app_id' => wp_generate_uuid4() ) );
+        $response = rest_do_request( $request );
+        $this->assertEquals( $app_id, $response->get_data()['app_id'] );
     }
 
@@ -776 +813 @@
     protected function check_response( $response, $item, $password = false ) {
         $this->assertArrayHasKey( 'uuid', $response );
+        $this->assertArrayHasKey( 'app_id', $response );
         $this->assertArrayHasKey( 'name', $response );
         $this->assertArrayHasKey( 'created', $response );
@@ -782 +820 @@
 
         $this->assertEquals( $item['uuid'], $response['uuid'] );
+        $this->assertEquals( $item['app_id'], $response['app_id'] );
         $this->assertEquals( $item['name'], $response['name'] );
         $this->assertEquals( gmdate( 'Y-m-d\TH:i:s', $item['created'] ), $response['created'] );
@@ -813 +852 @@
         $properties = $data['schema']['properties'];
 
-        $this->assertCount( 6, $properties );
         $this->assertArrayHasKey( 'uuid', $properties );
+        $this->assertArrayHasKey( 'app_id', $properties );
         $this->assertArrayHasKey( 'name', $properties );
         $this->assertArrayHasKey( 'password', $properties );
@@ -820 +859 @@
         $this->assertArrayHasKey( 'last_used', $properties );
         $this->assertArrayHasKey( 'last_ip', $properties );
+        $this->assertCount( 7, $properties );
     }
 }