Changeset 3104

Timestamp:

05/09/2016 09:29:51 PM (9 years ago)

Author:

iandunn

Message:

WordCamp JSON API: Automatically route all v2 requests to the Core handler.

See #1459
Props prettyboymp

File:

• sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/wcorg-json-api.php (modified) (2 diffs)

sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/wcorg-json-api.php

@@ -349 +349 @@
  * JSON REST API v1 and Core/v2 compatibility.
  *
- * All routes in $v2_routes are routed to the core handler.
+ * All v2 routes are routed to the Core handler, instead of the json-rest-api plugin.
  *
  * @param WP $request
  */
 function wcorg_json_v2_compat( $request ) {
-    $v2_routes = array(
-        '/wp-json/wordcamp-qbo',
-        '/wp-json/wordcamp-letsencrypt',
-    );
-
-    if ( strpos( $_SERVER['REQUEST_URI'], '/wp-json' ) !== 0 ) {
+    $rest_prefix = rest_get_url_prefix();
+
+    // Skip non-API requests
+    if ( 0 !== strpos( $_SERVER[ 'REQUEST_URI' ], "/$rest_prefix" ) ) {
         return;
     }
 
+    // Determine if it's a v2 request
     $is_route_v2 = false;
-    foreach ( $v2_routes as $route ) {
-        if ( strpos( $_SERVER['REQUEST_URI'], $route ) === 0 ) {
+    foreach ( rest_get_server()->get_namespaces() as $namespace ) {
+        if ( 0 === strpos( $_SERVER[ 'REQUEST_URI' ], "/$rest_prefix/$namespace" ) ) {
             $is_route_v2 = true;
             break;
@@ -371 +370 @@
     }
 
+    // Skip API v1 requests
     if ( ! $is_route_v2 ) {
         return;
     }
 
+    // Route v2 requests to Core handler
     $request->query_vars['rest_route'] = $request->query_vars['json_route'];
     unset( $request->query_vars['json_route'] );