Ticket #40748: 40748.2.diff

src/wp-admin/admin-ajax.php

@@ -64 +64 @@
         'parse-media-shortcode', 'destroy-sessions', 'install-plugin', 'update-plugin', 'press-this-save-post',
         'press-this-add-category', 'crop-image', 'generate-password', 'save-wporg-username', 'delete-plugin',
         'search-plugins', 'search-install-plugins', 'activate-plugin', 'update-theme', 'delete-theme',
-        'install-theme', 'get-post-thumbnail-html', 'get-community-events',
+        'install-theme', 'get-post-thumbnail-html',
 );
 
 // Deprecated

src/wp-admin/includes/ajax-actions.php

@@ -297 +297 @@
 }
 
 /**
- * Handles AJAX requests for community events
- *
- * @since 4.8.0
- */
-function wp_ajax_get_community_events() {
-        require_once( ABSPATH . 'wp-admin/includes/class-wp-community-events.php' );
-
-        check_ajax_referer( 'community_events' );
-
-        $search         = isset( $_POST['location'] ) ? wp_unslash( $_POST['location'] ) : '';
-        $timezone       = isset( $_POST['timezone'] ) ? wp_unslash( $_POST['timezone'] ) : '';
-        $user_id        = get_current_user_id();
-        $saved_location = get_user_option( 'community-events-location', $user_id );
-        $events_client  = new WP_Community_Events( $user_id, $saved_location );
-        $events         = $events_client->get_events( $search, $timezone );
-
-        if ( is_wp_error( $events ) ) {
-                wp_send_json_error( array(
-                        'error' => $events->get_error_message(),
-                ) );
-        } else {
-                if ( isset( $events['location'] ) ) {
-                        // Store the location network-wide, so the user doesn't have to set it on each site.
-                        update_user_option( $user_id, 'community-events-location', $events['location'], true );
-                }
-
-                wp_send_json_success( $events );
-        }
-}
-
-/**
  * Ajax handler for dashboard widgets.
  *
  * @since 3.4.0

src/wp-admin/includes/dashboard.php

@@ -144 +144 @@
         $events_client = new WP_Community_Events( $user_id, $user_location );
 
         $script_data = array(
-                'nonce' => wp_create_nonce( 'community_events' ),
-                'cache' => $events_client->get_cached_events(),
+                'nonce'  => wp_create_nonce( 'wp_rest' ),
+                'cache'  => $events_client->get_cached_events(),
+                'apiUrl' => rest_url( 'dashboard/v1/community-events' ),
 
                 'l10n' => array(
                         'enter_closest_city' => __( 'Enter your closest city to find nearby events.' ),

src/wp-admin/includes/rest-endpoints.php

@@ +1 @@
+<?php
+/**
+ * Administration API: REST API handlers
+ *
+ * @package WordPress
+ * @subpackage Administration
+ * @since 4.8.0
+ */
+
+/**
+ * Register REST endpoints for the dashboard/v1 namespace.
+ *
+ * @since 4.8.0
+ */
+function wp_dashboard_rest_register() {
+        // Community Events Dashboard Widget.
+        register_rest_route( 'dashboard/v1', 'community-events', array(
+                'methods'             => WP_REST_Server::EDITABLE,
+                'callback'            => 'wp_dashboard_rest_get_community_events',
+                'permission_callback' => 'is_user_logged_in',
+                'args'                => array(
+                        'location' => array(
+                                'type' => 'string',
+                                'default' => '',
+                        ),
+                        'timezone' => array(
+                                'type' => 'string',
+                                'default' => '',
+                        ),
+                ),
+        ) );
+}
+
+/**
+ * Handles AJAX requests for community events
+ *
+ * @since 4.8.0
+ */
+function wp_dashboard_rest_get_community_events( WP_REST_Request $request ) {
+        require_once( ABSPATH . 'wp-admin/includes/class-wp-community-events.php' );
+
+        $user_id        = get_current_user_id();
+        $saved_location = get_user_option( 'community-events-location', $user_id );
+        $events_client  = new WP_Community_Events( $user_id, $saved_location );
+        $events         = $events_client->get_events( $request['location'], $request['timezone'] );
+
+        if ( is_wp_error( $events ) ) {
+                return $events;
+        }
+
+        if ( isset( $events['location'] ) ) {
+                // Store the location network-wide, so the user doesn't have to set it on each site.
+                update_user_option( $user_id, 'community-events-location', $events['location'], true );
+        }
+
+        return $events;
+}

src/wp-admin/js/dashboard.js

@@ -288 +288 @@
                 getEvents: function( requestParams ) {
                         var initiatedBy,
                             app = this,
-                            $spinner = $( '.community-events-form' ).children( '.spinner' );
+                            $spinner = $( '.community-events-form' ).children( '.spinner' ),
+                            request;
 
                         requestParams          = requestParams || {};
                         requestParams._wpnonce = communityEventsData.nonce;
@@ -298 +299 @@
 
                         $spinner.addClass( 'is-active' );
 
-                        wp.ajax.post( 'get-community-events', requestParams )
+                        request = {
+                                type: 'POST',
+                                url:  communityEventsData.apiUrl,
+                                data: requestParams,
+                        };
+                        $.ajax( request )
                                 .always( function() {
                                         $spinner.removeClass( 'is-active' );
                                 })

src/wp-includes/default-filters.php

@@ -389 +389 @@
 add_action( 'rest_api_init', 'rest_api_default_filters',   10, 1 );
 add_action( 'rest_api_init', 'register_initial_settings',  10 );
 add_action( 'rest_api_init', 'create_initial_rest_routes', 99 );
+add_action( 'rest_api_init', 'wp_dashboard_rest_register', 99 );
 add_action( 'parse_request', 'rest_api_loaded' );
 
 /**

src/wp-settings.php

@@ -239 +239 @@
 require( ABSPATH . WPINC . '/rest-api/fields/class-wp-rest-post-meta-fields.php' );
 require( ABSPATH . WPINC . '/rest-api/fields/class-wp-rest-term-meta-fields.php' );
 require( ABSPATH . WPINC . '/rest-api/fields/class-wp-rest-user-meta-fields.php' );
+require( ABSPATH . 'wp-admin/includes/rest-endpoints.php' );
 
 $GLOBALS['wp_embed'] = new WP_Embed();