REST API: JS Client - Enable connecting to multiple endpoints.

Enable connecting to multiple wp-api `endpoints`. Calling `wp.api.init` with a new `apiRoot` will parse the new endpoint's schema and store a new set of models and collections. A collection of 
connected endpoints is stored in `wp.api.endpoints`.

Props lucasstark.
Fixes #39683.

Merges [40364] to the 4.7 branch.


git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40735 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Pascal Birchler 2017-05-16 16:34:22 +00:00
parent 38b02ca333
commit f54b1461ac
3 changed files with 57 additions and 20 deletions

View File

@ -1126,8 +1126,8 @@
/** /**
* Tracking objects for models and collections. * Tracking objects for models and collections.
*/ */
loadingObjects.models = routeModel.get( 'models' ); loadingObjects.models = {};
loadingObjects.collections = routeModel.get( 'collections' ); loadingObjects.collections = {};
_.each( routeModel.schemaModel.get( 'routes' ), function( route, index ) { _.each( routeModel.schemaModel.get( 'routes' ), function( route, index ) {
@ -1310,7 +1310,9 @@
loadingObjects.collections[ collectionClassName ] = wp.api.WPApiBaseCollection.extend( { loadingObjects.collections[ collectionClassName ] = wp.api.WPApiBaseCollection.extend( {
// For the url of a root level collection, use a string. // For the url of a root level collection, use a string.
url: routeModel.get( 'apiRoot' ) + routeModel.get( 'versionString' ) + routeName, url: function() {
return routeModel.get( 'apiRoot' ) + routeModel.get( 'versionString' ) + routeName;
},
// Specify the model that this collection contains. // Specify the model that this collection contains.
model: function( attrs, options ) { model: function( attrs, options ) {
@ -1337,13 +1339,15 @@
loadingObjects.models[ index ] = wp.api.utils.addMixinsAndHelpers( model, index, loadingObjects ); loadingObjects.models[ index ] = wp.api.utils.addMixinsAndHelpers( model, index, loadingObjects );
} ); } );
// Set the routeModel models and collections.
routeModel.set( 'models', loadingObjects.models );
routeModel.set( 'collections', loadingObjects.collections );
} }
} ); } );
wp.api.endpoints = new Backbone.Collection( { wp.api.endpoints = new Backbone.Collection();
model: Endpoint
} );
/** /**
* Initialize the wp-api, optionally passing the API root. * Initialize the wp-api, optionally passing the API root.
@ -1357,28 +1361,30 @@
var endpoint, attributes = {}, deferred, promise; var endpoint, attributes = {}, deferred, promise;
args = args || {}; args = args || {};
attributes.apiRoot = args.apiRoot || wpApiSettings.root; attributes.apiRoot = args.apiRoot || wpApiSettings.root || '/wp-json';
attributes.versionString = args.versionString || wpApiSettings.versionString; attributes.versionString = args.versionString || wpApiSettings.versionString || 'wp/v2/';
attributes.schema = args.schema || null; attributes.schema = args.schema || null;
if ( ! attributes.schema && attributes.apiRoot === wpApiSettings.root && attributes.versionString === wpApiSettings.versionString ) { if ( ! attributes.schema && attributes.apiRoot === wpApiSettings.root && attributes.versionString === wpApiSettings.versionString ) {
attributes.schema = wpApiSettings.schema; attributes.schema = wpApiSettings.schema;
} }
if ( ! initializedDeferreds[ attributes.apiRoot + attributes.versionString ] ) { if ( ! initializedDeferreds[ attributes.apiRoot + attributes.versionString ] ) {
endpoint = wp.api.endpoints.findWhere( { apiRoot: attributes.apiRoot, versionString: attributes.versionString } );
// Look for an existing copy of this endpoint
endpoint = wp.api.endpoints.findWhere( { 'apiRoot': attributes.apiRoot, 'versionString': attributes.versionString } );
if ( ! endpoint ) { if ( ! endpoint ) {
endpoint = new Endpoint( attributes ); endpoint = new Endpoint( attributes );
wp.api.endpoints.add( endpoint );
} }
deferred = jQuery.Deferred(); deferred = jQuery.Deferred();
promise = deferred.promise(); promise = deferred.promise();
endpoint.schemaConstructed.done( function( endpoint ) { endpoint.schemaConstructed.done( function( resolvedEndpoint ) {
wp.api.endpoints.add( resolvedEndpoint );
// Map the default endpoints, extending any already present items (including Schema model). // Map the default endpoints, extending any already present items (including Schema model).
wp.api.models = _.extend( endpoint.get( 'models' ), wp.api.models ); wp.api.models = _.extend( wp.api.models, resolvedEndpoint.get( 'models' ) );
wp.api.collections = _.extend( endpoint.get( 'collections' ), wp.api.collections ); wp.api.collections = _.extend( wp.api.collections, resolvedEndpoint.get( 'collections' ) );
deferred.resolveWith( wp.api, [ endpoint ] ); deferred.resolve( resolvedEndpoint );
} ); } );
initializedDeferreds[ attributes.apiRoot + attributes.versionString ] = promise; initializedDeferreds[ attributes.apiRoot + attributes.versionString ] = promise;
} }

View File

@ -32,12 +32,14 @@ var pathToData = {
* *
* @param {object} param The parameters sent to the ajax request. * @param {object} param The parameters sent to the ajax request.
* *
* @return {Object} A jQuery defered object that resolves with the mapped data. * @return {Object} A jQuery deferred object that resolves with the mapped data.
*/ */
Backbone.ajax = function ( param ) { Backbone.ajax = function ( param ) {
var data, var data,
request = param.url.replace( 'http://localhost/', '' ); request = param.url
.replace( 'http://remotehost/', '' )
.replace( 'http://localhost/', '' );
if ( pathToData[ request ] ) { if ( pathToData[ request ] ) {
data = pathToData[ request ]; data = pathToData[ request ];

View File

@ -192,10 +192,10 @@
} ); } );
} ); } );
// Test the jswidget custom namespace and endpoints. // Test the jswidget custom namespace and endpoints.
wp.api.init( { wp.api.init( {
'versionString': 'js-widgets/v1/' 'versionString': 'js-widgets/v1/'
} ).done( function() { } ).done( function() {
var customClasses = [ var customClasses = [
'WidgetsArchives', 'WidgetsArchives',
'WidgetsCalendar', 'WidgetsCalendar',
@ -232,4 +232,33 @@ wp.api.init( {
} ); } );
// Check connecting to a second URL.
wp.api.loadPromise.done( function() {
QUnit.test( 'Checking connecting to a remote url.' , function( assert ) {
var done = assert.async();
wp.api.init({
'apiRoot': 'http://remotehost/wp-json/'
} ).done( function(){
var lastEndpoint = wp.api.endpoints.last(),
models = lastEndpoint.get( 'models' ),
post = new models.Post();
assert.equal( 'http://remotehost/wp-json/wp/v2/posts', post.url(), 'The remote API objects should have their own URLs' );
wp.api.init({
'apiRoot': 'http://localhost/wp-json/'
} ).done( function(){
var lastEndpoint = wp.api.endpoints.first(),
models = lastEndpoint.get( 'models' ),
post = new models.Post();
assert.equal( 'http://localhost/wp-json/wp/v2/posts', post.url(), 'The local API objects should have their own URLs' );
done();
} );
} );
} );
});
} )( window.QUnit ); } )( window.QUnit );