Changeset 44949

Timestamp:

03/20/2019 08:52:08 PM (6 years ago)

Author:

aduth

Message:

Scripts: Assign api-fetch nonce with corrected rest_nonce.

As of @wordpress/api-fetch@3.0.0 (introduced in 44812), the apiFetch nonce middleware must have its nonce value assigned explicitly, and will no longer listen for heartbeat ticks automatically. This changeset adds an inline script for the default registration of the api-fetch script handle to assign the nonce value in response to the heartbeat action. In doing so, it removes the now-unused, misnamed rest-nonce property from the heartbeat response, whose original introduction served as temporary compatibility with earlier versions of @wordpress/api-fetch.

See ​https://github.com/WordPress/gutenberg/pull/13451
See #45113

Props adamsilverstein, nerrad .
Fixes #46107 .

Location:

trunk/src

Files:

• wp-admin/includes/misc.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

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

@@ -1083 +1083 @@
     // 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.

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

@@ -522 +522 @@
     global $wp_locale;
 
+    if ( isset( $scripts->registered['wp-api-fetch'] ) ) {
+        $scripts->registered['wp-api-fetch']->deps[] = 'wp-hooks';
+    }
     $scripts->add_inline_script(
         'wp-api-fetch',
         sprintf(
-            'wp.apiFetch.use( wp.apiFetch.createNonceMiddleware( "%s" ) );',
+            implode(
+                "\n",
+                array(
+                    '( function() {',
+                    '   var nonceMiddleware = wp.apiFetch.createNonceMiddleware( "%s" );',
+                    '   wp.apiFetch.use( nonceMiddleware );',
+                    '   wp.hooks.addAction(',
+                    '       "heartbeat.tick",',
+                    '       "core/api-fetch/create-nonce-middleware",',
+                    '       function( response ) {',
+                    '           if ( response[ "rest_nonce" ] ) {',
+                    '               nonceMiddleware.nonce = response[ "rest_nonce" ];',
+                    '           }',
+                    '       }',
+                    '   );',
+                    '} )();',
+                )
+            ),
             ( wp_installing() && ! is_multisite() ) ? '' : wp_create_nonce( 'wp_rest' )
         ),