Changeset 43939 for branches/5.0

Timestamp:

11/22/2018 07:39:02 PM (8 years ago)

Author:

youknowriad

Message:

Block Editor: Refresh nonces used by wp.apiFetch.

Adds heartbeat nonces refreshing support to wp.apiFetch requests.

Props pento, adamsilverstein, dd32, desrosj.
Fixes #45113.

Location:

branches/5.0/src

Files:

• wp-admin/includes/admin-filters.php (modified) (1 diff)
• wp-admin/includes/misc.php (modified) (1 diff)
• wp-includes/js/heartbeat.js (modified) (6 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

branches/5.0/src/wp-admin/includes/admin-filters.php

@@ -69 +69 @@
 add_filter( 'heartbeat_received', 'wp_check_locked_posts',  10,  3 );
 add_filter( 'heartbeat_received', 'wp_refresh_post_lock',   10,  3 );
-add_filter( 'wp_refresh_nonces', 'wp_refresh_post_nonces', 10,  3 );
 add_filter( 'heartbeat_received', 'heartbeat_autosave',     500, 2 );
+
+add_filter( 'wp_refresh_nonces', 'wp_refresh_post_nonces', 10, 3 );
+add_filter( 'wp_refresh_nonces', 'wp_refresh_heartbeat_nonces' );
 
 add_filter( 'heartbeat_settings', 'wp_heartbeat_set_suspension' );

branches/5.0/src/wp-admin/includes/misc.php

@@ -1021 +1021 @@
                                 '_wpnonce' => wp_create_nonce( 'update-post_' . $post_id ),
                         ),
-                        'heartbeatNonce' => wp_create_nonce( 'heartbeat-nonce' ),
                 );
         }
 
+        return $response;
+}
+
+/**
+ * Add the latest Heartbeat and REST-API nonce to the Heartbeat response.
+ *
+ * @since 5.0.0
+ *
+ * @param array  $response  The Heartbeat response.
+ * @return array The Heartbeat response.
+ */
+function wp_refresh_heartbeat_nonces( $response ) {
+        // Refresh the Rest API nonce.
+        $response['rest_nonce'] = wp_create_nonce( 'wp_rest' );
+        // TEMPORARY: Compat with api-fetch library
+        $response['rest-nonce'] = $response['rest_nonce'];
+
+        // Refresh the Heartbeat nonce.
+        $response['heartbeat_nonce'] = wp_create_nonce( 'heartbeat-nonce' );
         return $response;
 }

branches/5.0/src/wp-includes/js/heartbeat.js

@@ -313 +313 @@
                                         settings.connectionError = true;
                                         $document.trigger( 'heartbeat-connection-lost', [error, status] );
+                                        wp.hooks.doAction( 'heartbeat.connection-lost', error, status );
                                 }
                         }
@@ -332 +333 @@
                                 settings.connectionError = false;
                                 $document.trigger( 'heartbeat-connection-restored' );
+                                wp.hooks.doAction( 'heartbeat.connection-restored' );
                         }
                 }
@@ -358 +360 @@
 
                         $document.trigger( 'heartbeat-send', [ heartbeatData ] );
+                        wp.hooks.doAction( 'heartbeat.send', heartbeatData );
 
                         ajaxData = {
@@ -394 +397 @@
                                 if ( response.nonces_expired ) {
                                         $document.trigger( 'heartbeat-nonces-expired' );
+                                        wp.hooks.doAction( 'heartbeat.nonces-expired' );
                                 }
 
@@ -402 +406 @@
                                 }
 
+                                // Update the heartbeat nonce if set.
+                                if ( response.heartbeat_nonce && typeof window.heartbeatSettings === 'object' ) {
+                                        window.heartbeatSettings.nonce = response.heartbeat_nonce;
+                                        delete response.heartbeat_nonce;
+                                }
+
+                                // Update the Rest API nonce if set and wp-api loaded.
+                                if ( response.rest_nonce && typeof window.wpApiSettings === 'object' ) {
+                                        window.wpApiSettings.nonce = response.rest_nonce;
+                                        // This nonce is required for api-fetch through heartbeat.tick.
+                                        // delete response.rest_nonce;
+                                }
+
                                 $document.trigger( 'heartbeat-tick', [response, textStatus, jqXHR] );
+                                wp.hooks.doAction( 'heartbeat.tick', response, textStatus, jqXHR );
 
                                 // Do this last, can trigger the next XHR if connection time > 5 sec. and newInterval == 'fast'
@@ -411 +429 @@
                                 setErrorState( textStatus || 'unknown', jqXHR.status );
                                 $document.trigger( 'heartbeat-error', [jqXHR, textStatus, error] );
+                                wp.hooks.doAction( 'heartbeat.error', jqXHR, textStatus, error );
                         });
                 }

branches/5.0/src/wp-includes/script-loader.php

@@ -870 +870 @@
         $scripts->add( 'autosave', "/wp-includes/js/autosave$suffix.js", array('heartbeat'), false, 1 );
 
-        $scripts->add( 'heartbeat', "/wp-includes/js/heartbeat$suffix.js", array('jquery'), false, 1 );
+        $scripts->add( 'heartbeat', "/wp-includes/js/heartbeat$suffix.js", array( 'jquery', 'wp-hooks' ), false, 1 );
         did_action( 'init' ) && $scripts->localize( 'heartbeat', 'heartbeatSettings',
                 /**