Merge pull request #71 from DevinWalker/develop

Merge develop -> master for 2.0.4 release
DevinWalker · Jan 3, 2024 · 11c70e0 · 11c70e0
2 parents b0fe44f + 8c316e6
commit 11c70e0
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 33 deletions.
diff --git a/readme.txt b/readme.txt
@@ -5,7 +5,7 @@ Requires at least: 4.8
 Donate Link: https://givewp.com/
 Tested up to: 6.5
 Requires PHP: 7.4
-Stable tag: 2.0.3
+Stable tag: 2.0.4
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -43,8 +43,8 @@ We do have documentation on the plugin [GitHub Wiki](https://github.com/impress-
 
 = Minimum Requirements =
 
-* WordPress 4.8 or greater
-* PHP version 5.3 or greater
+* WordPress 5.5 or greater
+* PHP version 7.4 or greater
 * MySQL version 5.0 or greater
 
 = Automatic installation =
@@ -106,6 +106,10 @@ This is the first version of this plugin. It is a tool for your convenience. Rol
 
 == Changelog ==
 
+= 2.0.4 =
+* Fix: Resolved issue REST route not including proper permission callback which created a PHP notice. Thanks, @rom1our for submitting the issue.
+* Fix: Resolve issue with REST API and multisite installs not being able to properly communicate with the endpoint.
+
 = 2.0.3 =
 * Fix: A few additional strings in JavaScript needed to be internationalized. Thanks, @pedro-mendonca for contributing the fix.
 

diff --git a/src/admin.js b/src/admin.js
@@ -25,11 +25,13 @@ const AdminPage = () => {
 
     useEffect( () => {
 
-        let restUrl = `${wprData.baseUrl}/wp-json/wp-rollback/v1/fetch-info/?type=${queryArgs.type}&slug=${queryArgs.type === 'theme' ? queryArgs.theme_file : queryArgs.plugin_slug}`;
+        let restUrl = `${wprData.restUrl}wp-rollback/v1/fetch-info/?type=${queryArgs.type}&slug=${queryArgs.type === 'theme' ? queryArgs.theme_file : queryArgs.plugin_slug}`;
 
+        const headers = new Headers({
+            'X-WP-Nonce': wprData.restApiNonce // Assuming nonce is stored in wprData.nonce
+        });
 
-
-        fetch( restUrl )
+        fetch( restUrl, { headers: headers } )
             .then( ( response ) => response.json() )
             .then( ( data ) => {
                 setRollbackInfo( data );
@@ -38,7 +40,7 @@ const AdminPage = () => {
             .catch( ( error ) => {
                 console.error( 'Error fetching data:', error );
             } );
-    }, [] );
+    }, [wprData] );
 
     useEffect( () => {
         if ( rollbackInfo && rollbackInfo.slug ) {  // Check if rollbackInfo is loaded and has a slug
@@ -138,9 +140,6 @@ const AdminPage = () => {
         }
     }
 
-    console.log(rollbackInfo);
-    console.log(queryArgs);
-
     return (
         <div className={'wpr-wrapper'}>
             <div className={'wpr-logo-wrap'}>

diff --git a/src/themes-wp-rollback.js b/src/themes-wp-rollback.js
@@ -63,6 +63,7 @@ const wprThemeRollback = theme => {
 
 const wprGetThemeData = theme => {
     const themeData = wp.themes?.data?.themes;
+
     if (!Array.isArray(themeData)) {
         console.error('Invalid theme data');
         return null;

diff --git a/wp-rollback.php b/wp-rollback.php
@@ -5,7 +5,7 @@
  * Description: Rollback (or forward) any WordPress.org plugin, theme or block like a boss.
  * Author: WP Rollback
  * Author URI: https://wprollback.com/
- * Version: 2.0.3
+ * Version: 2.0.4
  * Text Domain: wp-rollback
  * Domain Path: /languages
  *
@@ -188,13 +188,7 @@ private function setup_constants(): void {
         private function hooks(): void {
 
             // Multisite compatibility: only loads on main site.
-            if ( is_network_admin() ) {
-                $this->multisite_compatibility = new WP_Rollback_Multisite_Compatibility( $this );
-            }
-
-            if ( is_multisite() && ! is_network_admin() ) {
-                return;
-            }
+            $this->multisite_compatibility = new WP_Rollback_Multisite_Compatibility( $this );
 
             // i18n
             add_action( 'plugins_loaded', [ self::$instance, 'load_textdomain' ] );
@@ -226,23 +220,24 @@ private function hooks(): void {
          * @return void
          */
         public function scripts( $hook ): void {
-            if ( 'themes.php' === $hook ) {
+
+            // Theme's listing page JS
+            if ( 'themes.php' === $hook && !is_multisite() ) {
                 $theme_script_asset = require WP_ROLLBACK_PLUGIN_DIR . '/build/themes.asset.php';
 
                 wp_enqueue_script(
                     'wp-rollback-themes-script',
-                    plugin_dir_url( __FILE__ ) . 'build/themes.js',
+                    WP_ROLLBACK_PLUGIN_URL . 'build/themes.js',
                     $theme_script_asset['dependencies'],
                     $theme_script_asset['version']
                 );
                 // Localize for i18n
                 wp_localize_script(
                     'wp-rollback-themes-script', 'wprData', [
                         'ajaxurl'               => admin_url(),
-                        'logo'                  => plugins_url( 'src/assets/logo.svg', __FILE__ ),
-                        'avatarFallback'                  => plugins_url( 'src/assets/avatar-plugin-fallback.jpg', __FILE__ ),
                         'rollback_nonce'        => wp_create_nonce( 'wpr_rollback_nonce' ),
-                        'apiNonce'              => wp_create_nonce( 'wpr_rollback_api_nonce' ),
+                        'logo'                  => plugins_url( 'src/assets/logo.svg', WP_ROLLBACK_PLUGIN_FILE ),
+                        'avatarFallback'        => plugins_url( 'src/assets/avatar-plugin-fallback.jpg', WP_ROLLBACK_PLUGIN_FILE ),
                         'text_rollback_label'   => __( 'Rollback', 'wp-rollback' ),
                         'text_not_rollbackable' => __(
                             'No Rollback Available: This is a non-WordPress.org theme.',
@@ -272,13 +267,14 @@ public function scripts( $hook ): void {
             // Localize the script with vars for JS.
             wp_localize_script( 'wp-rollback-plugin-admin-editor', 'wprData', [
                 'rollback_nonce'          => wp_create_nonce( 'wpr_rollback_nonce' ),
+                'restApiNonce'            => wp_create_nonce( 'wp_rest' ),
                 'adminUrl'                => admin_url( 'index.php' ),
-                'baseUrl'                =>  get_site_url(),
-                'logo'                  => plugins_url( 'src/assets/logo.svg', __FILE__ ),
-                'avatarFallback'                  => plugins_url( 'src/assets/avatar-plugin-fallback.jpg', __FILE__ ),
+                'restUrl'                 => esc_url_raw( rest_url() ),
+                'logo'                    => plugins_url( 'src/assets/logo.svg', WP_ROLLBACK_PLUGIN_FILE ),
+                'avatarFallback'          => plugins_url( 'src/assets/avatar-plugin-fallback.jpg', WP_ROLLBACK_PLUGIN_FILE ),
                 'referrer'                => wp_get_referer(),
                 'text_no_changelog_found' => isset( $_GET['plugin_slug'] ) ? sprintf(
-                    // translators: %s Link.
+                // translators: %s Link.
                     __(
                         'Sorry, we couldn\'t find a changelog entry found for this version. Try checking the <a href="%s" target="_blank">developer log</a> on WP.org.',
                         'wp-rollback'
@@ -332,13 +328,16 @@ public function register_rest_route() {
             include WP_ROLLBACK_PLUGIN_DIR . '/src/class-rollback-api-requests.php';
 
             register_rest_route( 'wp-rollback/v1', '/fetch-info/', [
-                'methods'  => 'GET',
-                'callback' => function ( WP_REST_Request $request ) {
+                'methods'             => 'GET',
+                'callback'            => function ( WP_REST_Request $request ) {
                     $fetcher = new WP_Rollback_API_Fetcher();
 
                     return $fetcher->fetch_plugin_or_theme_info( $request['type'], $request['slug'] );
                 },
-                'args'     => [
+                'permission_callback' => function () {
+                    return current_user_can( 'update_plugins' );
+                },
+                'args'                => [
                     'type' => [
                         'required' => true,
                         'type'     => 'string',
@@ -472,12 +471,17 @@ private function setup_plugin_vars() {
          * @return array $actions
          */
         public function plugin_action_links( $actions, $plugin_file, $plugin_data, $context ): array {
+
+            if ( is_multisite() && !is_network_admin()) {
+                return $actions;
+            }
+
             // Filter for other devs.
             $plugin_data = apply_filters( 'wpr_plugin_data', $plugin_data );
 
             // If plugin is missing package data do not output Rollback option.
             if ( ! isset( $plugin_data['package'] ) ||
-                 (strpos($plugin_data['package'], 'downloads.wordpress.org') === false) ) {
+                 ( strpos( $plugin_data['package'], 'downloads.wordpress.org' ) === false ) ) {
                 return $actions;
             }
 
@@ -487,7 +491,7 @@ public function plugin_action_links( $actions, $plugin_file, $plugin_data, $cont
             }
 
             // Base rollback URL
-            $rollback_url = admin_url( 'index.php' );
+            $rollback_url = is_network_admin() ? network_admin_url( 'index.php' ) : admin_url( 'index.php' );
 
             $rollback_url = add_query_arg(
                 apply_filters(
@@ -683,7 +687,7 @@ public function wpr_prepare_themes_js( $prepared_themes ): array {
 
             // Loop through themes and provide a 'hasRollback' boolean key for JS.
             foreach ( $prepared_themes as $key => $value ) {
-                $themes[ $key ]                = $prepared_themes[ $key ];
+                $themes[ $key ]                = $value;
                 $themes[ $key ]['hasRollback'] = isset( $rollbacks[ $key ] );
             }