Fix Multi-site

Author: jkmassel

tests/wp-includes/rest-api/auth/class-test-wp-rest-key-pair.php

@@ -111,10 +111,11 @@ public function test_init() {
 	 * @covers ::get_rest_uri()
 	 */
 	public function test_get_rest_uri() {
-		$this->assertEquals( '/wp-json/wp/v2/key-pair', WP_REST_Key_Pair::get_rest_uri() );
+		$this->assertEquals( get_rest_url( null, '/wp/v2/key-pair' ), WP_REST_Key_Pair::get_rest_uri() );
 
+		// Multisite can't use plain permalinks
 		add_filter( 'default_option_permalink_structure', '__return_false', 20, 0 );
-		$this->assertEquals( '/index.php?rest_route=/wp/v2/key-pair', WP_REST_Key_Pair::get_rest_uri() );
+		$this->assertEquals( get_rest_url( null, '/wp/v2/key-pair' ), WP_REST_Key_Pair::get_rest_uri() );
 		remove_filter( 'default_option_permalink_structure', '__return_false', 20 );
 	}
 

wp-includes/rest-api/auth/class-wp-rest-key-pair.php

@@ -73,9 +73,7 @@ public function init() {
 	 * @static
 	 */
 	public static function get_rest_uri() {
-		$full_url = get_rest_url( null, sprintf( '/%s/%s', self::_NAMESPACE_, self::_REST_BASE_ ) );
-		$path     = str_replace( site_url( '' ), '', $full_url ); // Remove the protocol and domain from the URI
-		return $path;
+		return get_rest_url( null, sprintf( '/%s/%s', self::_NAMESPACE_, self::_REST_BASE_ ) );
 	}
 
 	/**
@@ -308,7 +306,8 @@ public function profile_update( $user_id ) {
 	public function require_token( $require_token, $request_uri, $request_method ) {
 
 		// Don't require token authentication to manage key-pairs.
-		if ( ( 'POST' === $request_method || 'DELETE' === $request_method ) && false !== strpos( $request_uri, self::get_rest_uri() ) ) {
+		$is_token_uri = false !== strpos( site_url( $request_uri ), self::get_rest_uri() );
+		if ( ( 'POST' === $request_method || 'DELETE' === $request_method ) && $is_token_uri ) {
 			$require_token = false;
 		}