Merge pull request #16 from gravitywpcom/hub

Hub

Author: kimo-works

src/LicenseHandler.php

@@ -1,3 +1,24 @@
+= 2.1.0 =
+- NEW: Centralized Hub system — single API request returns license info + ALL plugins data.
+- NEW: Support for both Global License Key (All Access, List Add-ons, Agency) and Individual Plugin Keys (Single Add-ons).
+- NEW: Auto-detection of plan type from the server (All Access, List Add-ons, Single Add-on, Agency).
+- NEW: GravityWP Settings page with tabbed interface (Global / Individual Keys / Overview).
+- NEW: GravityWP Hub catalog page with modern card-based layout.
+- NEW: Hub_Manager with 12-hour cache reduces API requests from 20+/day to 2/day per customer.
+- NEW: Stale cache fallback when API is unreachable (Cloudflare blocks, network errors, etc.).
+- NEW: Concurrent request lock to prevent duplicate API calls from multiple plugins.
+- NEW: Auto-migration — legacy per-plugin keys silently migrate to Global or Individual storage.
+- NEW: Access source badges on plugin cards (Global vs Individual).
+- CHANGED: Plugin settings pages no longer show a license input — all keys managed centrally.
+- CHANGED: LicenseHandler uses Hub_Manager for validation when available.
+- CHANGED: Update checks and download links come from the hub cache (zero extra API calls).
+
+= 2.0.6 =
+- Implementing the global licensed key.
+
+= 2.0.5 =
+- Fix non unique #id in plugin setting.
+
 = 2.0.4 =
 - Optimizing the validation function caches the result.
 

src/changelog.txt

@@ -31,14 +31,14 @@ class Plugin_Updater {
 	 *
 	 * @var $result_count
 	 */
-	private $api_url_update = 'https://my.gravitywp.com/wp-json/paddlepress-api/v1/update';
+	private $api_url_update = 'https://stg-mygravitywpcom-mygwpstage.kinsta.cloud/wp-json/paddlepress-api/v1/update';
 
 	/**
 	 * GravityWP license url endpoint of the API
 	 *
 	 * @var $result_count
 	 */
-	private $api_url_license = 'https://my.gravitywp.com/wp-json/paddlepress-api/v1/license';
+	private $api_url_license = 'https://stg-mygravitywpcom-mygwpstage.kinsta.cloud/wp-json/paddlepress-api/v1/license';
 
 	/**
 	 * HTTP parameters on API requests
@@ -224,7 +224,36 @@ public function request_is_activate( $field_setting ) {
 				$this->error_messages = nl2br( $this->generateErrorMessage( $json_data['message'] ) );
 				return false;
 			} else {
-				$this->error_messages = nl2br( $this->generateErrorMessage( 'Please try again later. If the issue persists, please contact support.' ) );
+				// Retrieve HTTP status code and headers for additional context.
+				$http_code = wp_remote_retrieve_response_code( $response );
+				$headers   = wp_remote_retrieve_headers( $response );
+
+				// Check for block by Cloudflare.
+				if ( $http_code === 403 && strpos( strtolower( $body ), 'cloudflare' ) !== false ) {
+					$this->error_messages = nl2br(
+						$this->generateErrorMessage(
+							'Access to the license server was denied by Cloudflare. This happens when malicious activity was detected from your website\'s outgoing IP address. This often happens on shared hosting where other users use the same IP address for malicious activity. Contact your hosting provider to resolve this issue. For more information, visit <a href="https://gravitywp.com/doc/license-activation-issues/">this page</a>.'
+						)
+					);
+					return false;
+				}
+
+				// Format additional information into a string for logging or support use.
+				$extra_info = sprintf(
+					"HTTP Status Code: %d\nResponse Headers: %s",
+					$http_code,
+					json_encode( $headers )
+				);
+
+				// Provide a detailed error message including the response code, extra info, and a reference URL.
+				$this->error_messages = nl2br(
+					$this->generateErrorMessage(
+						sprintf(
+							'An unexpected error occurred. Please try again later. You can also refer to <a href="https://gravitywp.com/doc/license-activation-issues/">this page</a> for more details. If the issue persists, provide the following information to support: %s.',
+							esc_html( $extra_info )  // Ensure special characters in the info are safely included in an HTML context.
+						)
+					)
+				);
 				return false;
 			}
 		}
@@ -260,7 +289,7 @@ public function generateErrorMessage( $error ) {
 					}
 				} else {
 					$sanitized_message = sanitize_text_field( $messages );
-					$error_message     .= "- $sanitized_message\n";
+					$error_message    .= "- $sanitized_message\n";
 				}
 			}
 		} else {
@@ -323,65 +352,60 @@ public function gwp_is_valid( $cached, $key = null ) {
 	}
 
 	/**
-	 * Checks the plugin's license status and updates the transient data accordingly.
-	 *
-	 * This method verifies the validity of the plugin's license key and updates the cached 
-	 * license status. It also manages admin notices based on the validation result. If the 
-	 * license key is valid, it removes any existing admin notices. Otherwise, it adds an 
-	 * admin notice to inform the user about the invalid license status.
-	 *
-	 * Key Details:
-	 * - Verifies if the current context is not the plugins page in a multisite network, 
-	 *   and returns early if true.
-	 * - Checks existing transient data for license status response, and skips further checks
-	 *   if the data is already populated unless overridden.
-	 * - Retrieves the license key and generates a unique cache key for the status request.
-	 * - Calls the API to check the license activation status.
-	 * - Updates the license status cache with the API response.
-	 * - Based on the license validation result, either removes or adds admin notices.
+	 * Checks the plugin's license status using the centralized Hub cache.
 	 *
-	 * @param stdClass $_transient_data Transient data object containing update information.
-	 *                                  If not provided as an object, it initializes a new stdClass object.
+	 * Since v2.1.0: Reads from Hub_Manager's shared cache instead of
+	 * making individual API calls. This is the key optimization —
+	 * one hub request serves ALL plugins.
 	 *
-	 * @global string $pagenow Current admin page identifier.
+	 * @param stdClass $_transient_data Transient data object.
 	 *
 	 * @return stdClass The (possibly modified) transient data object.
-	 *
-	 * @uses request_is_activate() Makes an API request to validate the license key.
-	 * @uses set_version_info_cache() Caches the result of the license key validation.
-	 * @uses gwp_is_valid() Validates the license key using cached data or via API.
 	 */
-	public function check_update_license($_transient_data) {
+	public function check_update_license( $_transient_data ) {
 		global $pagenow;
 
-		// Ensure $_transient_data is an object.
-		if (!is_object($_transient_data)) {
+		if ( ! is_object( $_transient_data ) ) {
 			$_transient_data = new stdClass();
 		}
 
-		// Return early if on the plugins page in a multisite network.
-		if ('plugins.php' === $pagenow && is_multisite()) {
+		if ( 'plugins.php' === $pagenow && is_multisite() ) {
 			return $_transient_data;
 		}
 
-		// Check if the transient data already has a response and is not being overridden.
-		if (!empty($_transient_data->response) && !empty($_transient_data->response[$this->name]) && false === $this->wp_override) {
+		if ( ! empty( $_transient_data->response ) && ! empty( $_transient_data->response[ $this->name ] ) && false === $this->wp_override ) {
 			return $_transient_data;
 		}
 
-		// Retrieve license key and generate a unique cache key.
-		$license_key      = $this->api_data['license_key'];
-		$status_cache_key = 'paddlepress_status_request_' . md5(serialize($this->slug . $this->api_data['license_key'] . $this->beta)); // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.serialize_serialize
+		// Use Hub_Manager if available (v2.1.0+).
+		if ( class_exists( '\GravityWP\Shared\Hub_Manager' ) ) {
+			$has_access = \GravityWP\Shared\Hub_Manager::has_access( $this->slug );
 
-		// Validate the license key through the API and update the cache.
-		$status = $this->request_is_activate($license_key);
-		$this->set_version_info_cache($status, $status_cache_key);
+			if ( $has_access ) {
+				remove_action( 'admin_notices', array( $this->handler_class, 'action_admin_notices' ) );
+			} else {
+				add_action( 'admin_notices', array( $this->handler_class, 'action_admin_notices' ) );
+			}
+
+			return $_transient_data;
+		}
+
+		// Fallback to direct API call if Hub_Manager not loaded yet.
+		$license_key = get_option( 'gravitywp_global_license_key', '' );
+
+		if ( empty( $license_key ) ) {
+			add_action( 'admin_notices', array( $this->handler_class, 'action_admin_notices' ) );
+			return $_transient_data;
+		}
 
-		// Validate the license key and manage admin notices based on validity.
-		if ($this->gwp_is_valid(false, $license_key)) {
-			remove_action('admin_notices', array($this->handler_class, 'action_admin_notices'));
+		$status_cache_key = 'paddlepress_status_request_' . md5( serialize( $this->slug . $license_key . $this->beta ) ); // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.serialize_serialize
+		$status           = $this->request_is_activate( $license_key );
+		$this->set_version_info_cache( $status, $status_cache_key );
+
+		if ( $this->gwp_is_valid( false, $license_key ) ) {
+			remove_action( 'admin_notices', array( $this->handler_class, 'action_admin_notices' ) );
 		} else {
-			add_action('admin_notices', array($this->handler_class, 'action_admin_notices'));
+			add_action( 'admin_notices', array( $this->handler_class, 'action_admin_notices' ) );
 		}
 
 		return $_transient_data;
@@ -418,8 +442,35 @@ public function check_update( $_transient_data ) {
 			return $_transient_data;
 		}
 
-		$version_info = false; // $this->get_cached_version_info();
+		$version_info = false;
+
+		// Try Hub_Manager first (no extra API call needed).
+		if ( class_exists( '\GravityWP\Shared\Hub_Manager' ) ) {
+			$hub_plugin_data = \GravityWP\Shared\Hub_Manager::get_plugin_data( $this->slug );
+
+			if ( ! empty( $hub_plugin_data ) && ! empty( $hub_plugin_data['new_version'] ) ) {
+				$version_info               = new stdClass();
+				$version_info->name         = $hub_plugin_data['name'] ?? '';
+				$version_info->slug         = $hub_plugin_data['slug'] ?? $this->slug;
+				$version_info->new_version  = $hub_plugin_data['new_version'];
+				$version_info->url          = '';
+				$version_info->plugin       = $this->name;
+				$version_info->icons        = $hub_plugin_data['icons'] ?? array();
+				$version_info->banners      = $hub_plugin_data['banners'] ?? array();
+				$version_info->sections     = $hub_plugin_data['sections'] ?? array();
+				$version_info->requires     = $hub_plugin_data['requires'] ?? '';
+				$version_info->tested       = $hub_plugin_data['tested'] ?? '';
+				$version_info->requires_php = $hub_plugin_data['requires_php'] ?? '';
+
+				// Only include download link if license covers this plugin.
+				if ( ! empty( $hub_plugin_data['has_access'] ) && ! empty( $hub_plugin_data['download_link'] ) ) {
+					$version_info->package       = $hub_plugin_data['download_link'];
+					$version_info->download_link = $hub_plugin_data['download_link'];
+				}
+			}
+		}
 
+		// Fallback to direct API call if Hub didn't provide data.
 		if ( false === $version_info ) {
 			$version_info = $this->api_request(
 				'get_version',
@@ -430,7 +481,6 @@ public function check_update( $_transient_data ) {
 				)
 			);
 
-			// Since we disabled our filter for the transient, we aren't running our object conversion on banners, sections, or icons. Do this now:
 			if ( isset( $version_info->banners ) && ! is_array( $version_info->banners ) ) {
 				$version_info->banners = $this->convert_object_to_array( $version_info->banners );
 			}
@@ -455,9 +505,7 @@ public function check_update( $_transient_data ) {
 			$no_update = false;
 			if ( version_compare( $this->version, $version_info->new_version, '<' ) ) {
 
-				$_transient_data->response[ $this->name ] = $version_info;
-
-				// Make sure the plugin property is set to the plugin's name/location.
+				$_transient_data->response[ $this->name ]         = $version_info;
 				$_transient_data->response[ $this->name ]->plugin = $this->name;
 			} else {
 				$no_update              = new stdClass();
@@ -522,7 +570,7 @@ public function show_update_notification( $file, $plugin ) {
 
 		if ( empty( $update_cache->response ) || empty( $update_cache->response[ $this->name ] ) ) {
 
-			$version_info = $this->get_cached_version_info(); //  || false;
+			$version_info = $this->get_cached_version_info(); // || false;
 
 			if ( false === $version_info ) {
 				$version_info = $this->api_request(