fix get_fields

Author: thomasnavarro

class-multisite-api.php

@@ -48,11 +48,11 @@ public function register_rest_route()
         {
             // Get all sites
             register_rest_route(
-                self::NAMESPACE, '/sites',
+                self::NAMESPACE, '/'.$this->rest_base,
                 [
                     'methods' => \WP_REST_Server::READABLE,
                     'callback' => [$this->get_sites, 'callback'],
-                    // 'permission_callback' => [$this, 'get_item_permissions_check'],
+                    'permission_callback' => '__return_true',
                     'args' => [
                         'page' => [
                             'description' => __('Current page of the result.'),
@@ -69,57 +69,43 @@ public function register_rest_route()
                             'type' => 'boolean',
                             'description' => __('Retrieves the ACF fields from the site.'),
                         ],
-                        'gps' => [
-                            'default' => false,
-                            'type' => 'boolean',
-                            'description' => __('Retrieves only the GPS coordinates of the site.'),
-                        ],
                     ],
-                    // 'schema' => [$this, 'get_public_item_schema'],
+                    'schema' => [$this, 'get_public_item_schema'],
                 ]
             );
 
             // Get site by blog ID
             register_rest_route(
                 self::NAMESPACE, '/'.$this->rest_base.'/(?P<id>[\d]+)',
                 [
+                    'methods' => \WP_REST_Server::READABLE,
+                        'callback' => [$this->get_site, 'callback'],
+                        'permission_callback' => '__return_true',
                     'args' => [
                         'id' => [
                             'description' => __('Unique identifier for the object.'),
                             'type' => 'integer',
                         ],
-                    ],
-                    [
-                        'methods' => \WP_REST_Server::READABLE,
-                        'callback' => [$this->get_site, 'callback'],
-                        // 'permission_callback' => [$this, 'get_item_permissions_check'],
-                        'args' => [
-                            'fields' => [
-                                'default' => true,
-                                'type' => 'boolean',
-                                'description' => __('Retrieves the ACF fields from the site.'),
-                            ],
-                            'gps' => [
-                                'default' => false,
-                                'type' => 'boolean',
-                                'description' => __('Retrieves only the GPS coordinates of the site.'),
-                            ],
+                        'fields' => [
+                            'default' => true,
+                            'type' => 'boolean',
+                            'description' => __('Retrieves the ACF fields from the site.'),
                         ],
                     ],
                     'schema' => [$this, 'get_public_item_schema'],
                 ]
             );
         }
 
-        private function get_item_permissions_check()
+        public function get_item_permissions_check()
         {
             global $wp_version;
 
             if (version_compare($wp_version, '4.8', '>=')) {
                 return current_user_can('setup_network');
             }
 
-            return is_super_admin();
+            return is_admin();
         }
     }
 

class-multisite-get-site.php

@@ -19,6 +19,13 @@ public function callback($request)
             return $site;
         }
 
+        // Get ACF Fields
+        switch_to_blog($request['id']);
+        if ($request['fields']) {
+            $site = $this->get_fields($site);
+        }
+        restore_current_blog();
+
         return $site;
     }
 
@@ -36,16 +43,6 @@ protected function get_site($id)
 
         $site = get_site((int) $id);
 
-        // Get ACF Fields
-        if ($request['fields']) {
-            $site = $this->get_fields($site);
-        }
-
-        // Get GPS Coordinates
-        if ($request['gps']) {
-            $site = $this->get_coordinates($site);
-        }
-
         if (empty($site) || empty($site->blog_id)) {
             return $error;
         }
@@ -61,16 +58,4 @@ protected function get_fields($site)
 
         return apply_filters('multisite_api/get_site/fields', $site);
     }
-
-    protected function get_coordinates($site)
-    {
-        $coordinates = $site->fields['business_details']['address'];
-
-        $site->gps = [
-            'lat' => $coordinates['lat'],
-            'lng' => $coordinates['lng'],
-        ];
-
-        return apply_filters('multisite_api/get_site/gps', $site);
-    }
 }

class-multisite-get-sites.php

@@ -33,12 +33,6 @@ public function callback($request)
             if ($request['fields']) {
                 $site = $this->get_fields($site);
             }
-
-            // Get GPS Coordinates
-            if ($request['gps']) {
-                $site = $this->get_coordinates($site);
-            }
-
             restore_current_blog();
         }
 
@@ -53,17 +47,4 @@ protected function get_fields($site)
 
         return apply_filters('multisite_api/get_sites/fields', $site);
     }
-
-    protected function get_coordinates($site)
-    {
-        $home_id = get_option('page_on_front');
-        $coordinates = get_field('business_details', $home_id)['address'];
-
-        $site->gps = [
-            'lat' => $coordinates['lat'],
-            'lng' => $coordinates['lng'],
-        ];
-
-        return apply_filters('multisite_api/get_sites/coordinates', $site);
-    }
 }