Changeset 44172

Timestamp:

12/14/2018 06:01:24 AM (8 years ago)

Author:

pento

Message:

Block Editor: Preload wp/v2/media with OPTIONS for caps check.

Also introduces a block_editor_preload_paths filter for plugins and themes to preload additional data.

Merges [43833] from the 5.0 branch to trunk.

Props imath, mattheu, danielbachhuber.
Fixes #45194.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/wp-admin/edit-form-blocks.php (modified) (1 diff)
• src/wp-includes/rest-api.php (modified) (3 diffs)
• tests/phpunit/tests/rest-api.php (modified) (1 diff)

trunk/src/wp-admin/edit-form-blocks.php

@@ -50 +50 @@
         sprintf( '/wp/v2/types/%s?context=edit', $post_type ),
         sprintf( '/wp/v2/users/me?post_type=%s&context=edit', $post_type ),
-);
+        array( '/wp/v2/media', 'OPTIONS' ),
+);
+
+/**
+ * Preload common data by specifying an array of REST API paths that will be preloaded.
+ *
+ * Filters the array of paths that will be preloaded.
+ *
+ * @since 5.0.0
+ *
+ * @param array  $preload_paths Array of paths to preload.
+ * @param object $post          The post resource data.
+ */
+$preload_paths = apply_filters( 'block_editor_preload_paths', $preload_paths, $post );
 
 /*

trunk/src/wp-includes/rest-api.php

@@ -1343 +1343 @@
         }
 
+        $method = 'GET';
+        if ( is_array( $path ) && 2 === count( $path ) ) {
+                $method = end( $path );
+                $path   = reset( $path );
+
+                if ( ! in_array( $method, array( 'GET', 'OPTIONS' ), true ) ) {
+                        $method = 'GET';
+                }
+        }
+
         $path_parts = parse_url( $path );
         if ( false === $path_parts ) {
@@ -1348 +1358 @@
         }
 
-        $request = new WP_REST_Request( 'GET', $path_parts['path'] );
+        $request = new WP_REST_Request( $method, $path_parts['path'] );
         if ( ! empty( $path_parts['query'] ) ) {
                 parse_str( $path_parts['query'], $query_params );
@@ -1367 +1377 @@
                 }
 
-                $memo[ $path ] = array(
-                        'body'    => $data,
-                        'headers' => $response->headers,
-                );
+                if ( 'OPTIONS' === $method ) {
+                        $response = rest_send_allow_header( $response, $server, $request );
+
+                        $memo[ $method ][ $path ] = array(
+                                'body'    => $data,
+                                'headers' => $response->headers,
+                        );
+                } else {
+                        $memo[ $path ] = array(
+                                'body'    => $data,
+                                'headers' => $response->headers,
+                        );
+                }
         }
 

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

@@ -722 +722 @@
                 $this->assertTrue( is_array( rest_preload_api_request( 0, '/' ) ) );
         }
+
+        function test_rest_preload_api_request_with_method() {
+                $rest_server               = $GLOBALS['wp_rest_server'];
+                $GLOBALS['wp_rest_server'] = null;
+
+                $preload_paths = array(
+                        '/wp/v2/types',
+                        array( '/wp/v2/media', 'OPTIONS' ),
+                );
+
+                $preload_data = array_reduce(
+                        $preload_paths,
+                        'rest_preload_api_request',
+                        array()
+                );
+
+                $this->assertSame( array_keys( $preload_data ), array( '/wp/v2/types', 'OPTIONS' ) );
+                $this->assertTrue( isset( $preload_data['OPTIONS']['/wp/v2/media'] ) );
+
+                $GLOBALS['wp_rest_server'] = $rest_server;
+        }
 }