Changeset 44275 for trunk

Timestamp:

12/17/2018 07:27:08 PM (6 years ago)

Author:

desrosj

Message:

Block Editor: Refresh nonces used by wp.apiFetch.

Adds heartbeat nonces refreshing support to wp.apiFetch requests.

Props pento, adamsilverstein, dd32, desrosj, youknowriad.

Merges [43939] into trunk.

Fixes #45113.

Location:

trunk

Files:

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

trunk/src/js/_enqueues/wp/heartbeat.js

@@ -352 +352 @@
                     settings.connectionError = true;
                     $document.trigger( 'heartbeat-connection-lost', [error, status] );
+                    wp.hooks.doAction( 'heartbeat.connection-lost', error, status );
                 }
             }
@@ -373 +374 @@
                 settings.connectionError = false;
                 $document.trigger( 'heartbeat-connection-restored' );
+                wp.hooks.doAction( 'heartbeat.connection-restored' );
             }
         }
@@ -401 +403 @@
 
             $document.trigger( 'heartbeat-send', [ heartbeatData ] );
+            wp.hooks.doAction( 'heartbeat.send', heartbeatData );
 
             ajaxData = {
@@ -437 +440 @@
                 if ( response.nonces_expired ) {
                     $document.trigger( 'heartbeat-nonces-expired' );
+                    wp.hooks.doAction( 'heartbeat.nonces-expired' );
                 }
 
@@ -445 +449 @@
                 }
 
+                // 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'.
@@ -454 +472 @@
                 setErrorState( textStatus || 'unknown', jqXHR.status );
                 $document.trigger( 'heartbeat-error', [jqXHR, textStatus, error] );
+                wp.hooks.doAction( 'heartbeat.error', jqXHR, textStatus, error );
             });
         }

trunk/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( 'heartbeat_received', 'heartbeat_autosave', 500, 2 );
+
 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_heartbeat_nonces' );
 
 add_filter( 'heartbeat_settings', 'wp_heartbeat_set_suspension' );

trunk/src/wp-admin/includes/misc.php

@@ -1055 +1055 @@
 
         $response['wp-refresh-post-nonces'] = array(
-            'replace'        => array(
+            'replace' => array(
                 'getpermalinknonce'    => wp_create_nonce( 'getpermalink' ),
                 'samplepermalinknonce' => wp_create_nonce( 'samplepermalink' ),
@@ -1062 +1062 @@
                 '_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;
 }

trunk/src/wp-includes/script-loader.php

@@ -894 +894 @@
     $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',