Changeset 42851

Timestamp:

03/18/2018 05:03:20 PM (7 years ago)

Author:

ocean90

Message:

REST API JS Client: Extend custom nonce functionality to collections.

This brings the improved nonce handling from [41553] to collections to remove the direct wpApiSettings.nonce dependency.

Props adamsilverstein, ocean90, swissspidy.
Fixes #43265.

File:

• trunk/src/wp-includes/js/wp-api.js (modified) (3 diffs)

trunk/src/wp-includes/js/wp-api.js

@@ -991 +991 @@
                     self = this;
 
-                options    = options || {};
-                beforeSend = options.beforeSend;
-
-                // If we have a localized nonce, pass that along with each sync.
-                if ( 'undefined' !== typeof wpApiSettings.nonce ) {
+                options = options || {};
+
+                if ( _.isFunction( model.nonce ) && ! _.isUndefined( model.nonce() ) && ! _.isNull( model.nonce() ) ) {
+                    beforeSend = options.beforeSend;
+
+                    // Include the nonce with requests.
                     options.beforeSend = function( xhr ) {
-                        xhr.setRequestHeader( 'X-WP-Nonce', wpApiSettings.nonce );
+                        xhr.setRequestHeader( 'X-WP-Nonce', model.nonce() );
 
                         if ( beforeSend ) {
                             return beforeSend.apply( self, arguments );
+                        }
+                    };
+
+                    // Update the nonce when a new nonce is returned with the response.
+                    options.complete = function( xhr ) {
+                        var returnedNonce = xhr.getResponseHeader( 'X-WP-Nonce' );
+
+                        if ( returnedNonce && _.isFunction( model.nonce ) && model.nonce() !== returnedNonce ) {
+                            model.endpointModel.set( 'nonce', returnedNonce );
                         }
                     };
@@ -1406 +1416 @@
                         },
 
+                        // Track nonces at the Endpoint level.
+                        nonce: function() {
+                            return routeModel.get( 'nonce' );
+                        },
+
+                        endpointModel: routeModel,
+
                         // Include a reference to the original class name.
                         name: collectionClassName,
@@ -1432 +1449 @@
                             return new loadingObjects.models[ modelClassName ]( attrs, options );
                         },
+
+                        // Track nonces at the Endpoint level.
+                        nonce: function() {
+                            return routeModel.get( 'nonce' );
+                        },
+
+                        endpointModel: routeModel,
 
                         // Include a reference to the original class name.