Merge pull request #111 from newfold-labs/update/install_premium_plugin-logic

Update/install premium plugin logic

Author: circlecube

build/1.4.5/installer.asset.php

@@ -0,0 +1 @@
+<?php return array('dependencies' => array('react', 'react-jsx-runtime', 'wp-api-fetch', 'wp-dom-ready', 'wp-element', 'wp-i18n'), 'version' => '44d64941c0f77d3aead5');

build/1.4.5/installer.js

@@ -15,7 +15,7 @@ class Constants {
 	 */
 	public function __construct( $container ) {
 		if ( ! defined( 'NFD_INSTALLER_VERSION' ) ) {
-			define( 'NFD_INSTALLER_VERSION', '1.4.5' );
+			define( 'NFD_INSTALLER_VERSION', '1.5.0' );
 		}
 		if ( ! defined( 'NFD_INSTALLER_BUILD_DIR' ) && defined( 'NFD_INSTALLER_VERSION' ) ) {
 			define( 'NFD_INSTALLER_BUILD_DIR', dirname( __DIR__, 2 ) . '/build/' . NFD_INSTALLER_VERSION );

build/1.4.5/dataAttrListener.asset.php build/1.5.0/dataAttrListener.asset.phpbuild/1.4.5/dataAttrListener.asset.php renamed to build/1.5.0/dataAttrListener.asset.php

@@ -175,69 +175,99 @@ public static function install_premium_plugin( $plugin, $provider, $activate ) {
 		// Provision a license for the premium plugin, this returns basename and download URL
 		$license_response = $pls_utility->provision_license( $plugin, $provider );
 		if ( is_wp_error( $license_response ) ) {
+			$license_response->add(
+				'nfd_installer_error',
+				__( 'Failed to provision license', 'wp-module-installer' ),
+				array(
+					'plugin'   => $plugin,
+					'provider' => $provider,
+				)
+			);
 			return $license_response;
 		}
 
 		// Get the plugin basename from the license response
 		$plugin_basename = ! empty( $license_response['basename'] ) ? $license_response['basename'] : false;
 
-		// Check if the plugin is already installed
-		if ( $plugin_basename && self::is_plugin_installed( $plugin_basename ) ) {
-			// Check if the plugin is active
-			if ( is_plugin_active( $plugin_basename ) ) {
-				// If plugin is already installed and active, return success
-				return new \WP_REST_Response(
+		// Bail if no basename
+		if ( ! $plugin_basename ) {
+			return new \WP_Error(
+				'nfd_installer_error',
+				__( 'Plugin basename is missing.', 'wp-module-installer' ),
+				array(
+					'plugin'   => $plugin,
+					'provider' => $provider,
+				)
+			);
+		}
+
+		// If NOT installed, install plugin
+		if ( ! self::is_plugin_installed( $plugin_basename ) ) {
+			// Check if the download URL is present in the license response
+			if ( empty( $license_response['downloadUrl'] ) ) {
+				return new \WP_Error(
+					'nfd_installer_error',
+					__( 'Download URL is missing for premium plugin', 'wp-module-installer' ),
 					array(
-						'message' => __( 'Plugin is already installed and active: ', 'wp-module-installer' ) . $plugin,
-					),
-					200
+						'plugin'   => $plugin,
+						'provider' => $provider,
+						'basename' => $plugin_basename,
+					)
 				);
 			}
+			$install_status = self::install_from_zip( $license_response['downloadUrl'], $activate );
+			if ( is_wp_error( $install_status ) ) {
+				$install_status->add(
+					'nfd_installer_error',
+					__( 'Failed to install the plugin', 'wp-module-installer' ),
+					array(
+						'plugin'       => $plugin,
+						'provider'     => $provider,
+						'basename'     => $plugin_basename,
+						'download_url' => $license_response['downloadUrl'],
+					)
+				);
+				return $install_status;
+			}
+		}
 
-			// Activate the plugin if it's installed but not active
+		// If $activate is true, activate the plugin via \activate_plugin
+		if ( $activate && ! is_plugin_active( $plugin_basename ) ) {
 			$activate_plugin_response = activate_plugin( $plugin_basename );
 			if ( is_wp_error( $activate_plugin_response ) ) {
-				return new \WP_Error( 'nfd_installer_error', __( 'Failed to activate the plugin: ', 'wp-module-installer' ) . $plugin );
-			}
-
-			// Activate the license
-			$activation_response = $pls_utility->activate_license( $plugin );
-			if ( is_wp_error( $activation_response ) ) {
-				return new \WP_Error( 'nfd_installer_error', __( 'Failed to activate the license for the premium plugin: ', 'wp-module-installer' ) . $plugin );
+				$activate_plugin_response->add(
+					'nfd_installer_error',
+					__( 'Failed to activate the plugin', 'wp-module-installer' ),
+					array(
+						'plugin'   => $plugin,
+						'provider' => $provider,
+						'basename' => $plugin_basename,
+					)
+				);
+				return $activate_plugin_response;
 			}
+		}
 
-			// Return success response
-			return new \WP_REST_Response(
+		// Activate the license
+		// Should we do this here or let the activation hook handle it - see WPAdmin/Listeners/InstallerListener.php
+		$activation_response = $pls_utility->activate_license( $plugin );
+		if ( is_wp_error( $activation_response ) ) {
+			$activation_response->add(
+				'nfd_installer_error',
+				__( 'Failed to activate the license', 'wp-module-installer' ),
 				array(
-					'message' => __( 'Successfully provisioned and installed: ', 'wp-module-installer' ) . $plugin,
-				),
-				200
+					'plugin'   => $plugin,
+					'provider' => $provider,
+					'basename' => $plugin_basename,
+				)
 			);
-		}
-
-		// Check if the download URL is present in the license response
-		if ( empty( $license_response['downloadUrl'] ) ) {
-			return new \WP_Error( 'nfd_installer_error', __( 'Download URL is missing for premium plugin: ', 'wp-module-installer' ) . $plugin );
-		}
-
-		// Plugin is not installed, proceed with installation
-		$install_status = self::install_from_zip( $license_response['downloadUrl'], $activate );
-		if ( is_wp_error( $install_status ) ) {
-			return new \WP_Error( 'nfd_installer_error', __( 'Failed to install or activate the premium plugin: ', 'wp-module-installer' ) . $plugin );
-		}
-
-		// If activation is requested, activate the license
-		if ( $activate ) {
-			$activation_response = $pls_utility->activate_license( $plugin );
-			if ( is_wp_error( $activation_response ) ) {
-				return new \WP_Error( 'nfd_installer_error', __( 'Failed to activate the license for the premium plugin: ', 'wp-module-installer' ) . $plugin );
-			}
+			return $activation_response;
 		}
 
 		// Return success response
 		return new \WP_REST_Response(
 			array(
-				'message' => __( 'Successfully provisioned and installed: ', 'wp-module-installer' ) . $plugin,
+				'message' => __( 'Successfully provisioned and installed the plugin', 'wp-module-installer' ),
 			),
 			200
 		);