<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[44275] trunk/src: Block Editor: Refresh nonces used by `wp.apiFetch`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/44275">44275</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/44275","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>desrosj</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-12-17 19:27:08 +0000 (Mon, 17 Dec 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Block Editor: Refresh nonces used by `wp.apiFetch`.
Adds heartbeat nonces refreshing support to `wp.apiFetch` requests.
Props pento, adamsilverstein, dd32, desrosj, youknowriad.
Merges <a href="https://core.trac.wordpress.org/changeset/43939">[43939]</a> into trunk.
Fixes <a href="https://core.trac.wordpress.org/ticket/45113">#45113</a>. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueueswpheartbeatjs">trunk/src/js/_enqueues/wp/heartbeat.js</a></li>
<li><a href="#trunksrcwpadminincludesadminfiltersphp">trunk/src/wp-admin/includes/admin-filters.php</a></li>
<li><a href="#trunksrcwpadminincludesmiscphp">trunk/src/wp-admin/includes/misc.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunk">trunk/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: trunk
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- trunk 2018-12-17 19:07:35 UTC (rev 44274)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ trunk 2018-12-17 19:27:08 UTC (rev 44275)
</ins><a id="trunk"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: trunk</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/4.9:43557,43622
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43919,43921-43929,43934-43938,43946-43947,43949-43954,43956,43961-43963,43967-43969,44014,44017
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43919,43921-43929,43934-43939,43946-43947,43949-43954,43956,43961-43963,43967-43969,44014,44017
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcjs_enqueueswpheartbeatjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/heartbeat.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/heartbeat.js 2018-12-17 19:07:35 UTC (rev 44274)
+++ trunk/src/js/_enqueues/wp/heartbeat.js 2018-12-17 19:27:08 UTC (rev 44275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,6 +351,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( trigger && ! hasConnectionError() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> settings.connectionError = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $document.trigger( 'heartbeat-connection-lost', [error, status] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp.hooks.doAction( 'heartbeat.connection-lost', error, status );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -372,6 +373,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> settings.errorcount = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> settings.connectionError = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $document.trigger( 'heartbeat-connection-restored' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp.hooks.doAction( 'heartbeat.connection-restored' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -400,6 +402,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> settings.queue = {};
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $document.trigger( 'heartbeat-send', [ heartbeatData ] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp.hooks.doAction( 'heartbeat.send', heartbeatData );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ajaxData = {
</span><span class="cx" style="display: block; padding: 0 10px"> data: heartbeatData,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -436,6 +439,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( response.nonces_expired ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $document.trigger( 'heartbeat-nonces-expired' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp.hooks.doAction( 'heartbeat.nonces-expired' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Change the interval from PHP
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -444,7 +448,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> delete response.heartbeat_interval;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 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;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $document.trigger( 'heartbeat-tick', [response, textStatus, jqXHR] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp.hooks.doAction( 'heartbeat.tick', response, textStatus, jqXHR );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Do this last. Can trigger the next XHR if connection time > 5 sec. and newInterval == 'fast'.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( newInterval ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -453,6 +471,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }).fail( function( jqXHR, textStatus, error ) {
</span><span class="cx" style="display: block; padding: 0 10px"> setErrorState( textStatus || 'unknown', jqXHR.status );
</span><span class="cx" style="display: block; padding: 0 10px"> $document.trigger( 'heartbeat-error', [jqXHR, textStatus, error] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp.hooks.doAction( 'heartbeat.error', jqXHR, textStatus, error );
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesadminfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/admin-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/admin-filters.php 2018-12-17 19:07:35 UTC (rev 44274)
+++ trunk/src/wp-admin/includes/admin-filters.php 2018-12-17 19:27:08 UTC (rev 44275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,9 +68,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'heartbeat_received', 'wp_check_locked_posts', 10, 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'heartbeat_received', 'wp_refresh_post_lock', 10, 3 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_filter( 'wp_refresh_nonces', 'wp_refresh_post_nonces', 10, 3 );
</del><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'heartbeat_received', 'heartbeat_autosave', 500, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'wp_refresh_nonces', 'wp_refresh_post_nonces', 10, 3 );
+add_filter( 'wp_refresh_nonces', 'wp_refresh_heartbeat_nonces' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'heartbeat_settings', 'wp_heartbeat_set_suspension' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Nav Menu hooks.
</span></span></pre></div>
<a id="trunksrcwpadminincludesmiscphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/misc.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/misc.php 2018-12-17 19:07:35 UTC (rev 44274)
+++ trunk/src/wp-admin/includes/misc.php 2018-12-17 19:27:08 UTC (rev 44275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1054,7 +1054,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $response['wp-refresh-post-nonces'] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'replace' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'replace' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'getpermalinknonce' => wp_create_nonce( 'getpermalink' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'samplepermalinknonce' => wp_create_nonce( 'samplepermalink' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'closedpostboxesnonce' => wp_create_nonce( 'closedpostboxes' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1061,7 +1061,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '_ajax_linking_nonce' => wp_create_nonce( 'internal-linking' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '_wpnonce' => wp_create_nonce( 'update-post_' . $post_id ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'heartbeatNonce' => wp_create_nonce( 'heartbeat-nonce' ),
</del><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1069,6 +1068,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 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;
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Disable suspension of Heartbeat on the Add/Edit Post screens.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.8.0
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2018-12-17 19:07:35 UTC (rev 44274)
+++ trunk/src/wp-includes/script-loader.php 2018-12-17 19:27:08 UTC (rev 44275)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -893,7 +893,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'autosave', "/wp-includes/js/autosave$suffix.js", array( 'heartbeat' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $scripts->add( 'heartbeat', "/wp-includes/js/heartbeat$suffix.js", array( 'jquery' ), false, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $scripts->add( 'heartbeat', "/wp-includes/js/heartbeat$suffix.js", array( 'jquery', 'wp-hooks' ), false, 1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize(
</span><span class="cx" style="display: block; padding: 0 10px"> 'heartbeat',
</span><span class="cx" style="display: block; padding: 0 10px"> 'heartbeatSettings',
</span></span></pre>
</div>
</div>
</body>
</html>