Fix settings and connect issues (#170)

* fix: token fails to refresh after expiry

* update: add 12 hour time for plan data refresh and fix missing subscription id

* update: add check to refresh plan data

* fix: decoding errors and alignment and add logging for errors

* update: refresh logic and formatting

Author: nirbhayel

classes/services/client.php

@@ -163,6 +163,8 @@ protected function request( $method, $endpoint, $args = [] ) {
 			return $body;
 		}
 
+		$body = json_decode( $body );
+
 		if ( false === $body ) {
 			return new WP_Error( 422, 'Wrong Server Response' );
 		}

modules/settings/module.php

@@ -100,28 +100,6 @@ public function enqueue_scripts( $hook ) : void {
 		);
 	}
 
-	public static function refresh_plan_data() {
-		$plan_data = Settings::get( Settings::PLAN_DATA );
-
-		$response = Utils::get_api_client()->make_request(
-			'GET',
-			'site/info',
-			[ 'api_key' => $plan_data->public_api_key ]
-		);
-
-		if ( ! empty( $response->site_url ) && Data::get_home_url() !== $response->site_url ) {
-			Data::set_home_url( $response->site_url );
-		}
-
-		if ( ! is_wp_error( $response ) ) {
-			Settings::set( Settings::PLAN_DATA, json_decode( $response ) );
-			Settings::set( Settings::IS_VALID_PLAN_DATA, true );
-		} else {
-			Logger::error( esc_html( $response->get_error_message() ) );
-			Settings::set( Settings::IS_VALID_PLAN_DATA, false );
-		}
-	}
-
 	/**
 	 * Get Mixpanel project Token
 	 * @return string
@@ -156,12 +134,24 @@ public function on_connect(): void {
 			return;
 		}
 
+		self::register_site_with_data();
+	}
+
+	/**
+	 * Register the website and save the plan data.
+	 * @return void
+	 */
+	public static function register_site_with_data() : void {
 		$register_response = Utils::get_api_client()->make_request(
 			'POST',
 			'site/register'
 		);
 
-		$this->save_plan_data( $register_response );
+		if ( is_wp_error( $register_response ) ) {
+			Logger::error( esc_html( $register_response->get_error_message() ) );
+		} else {
+			self::save_plan_data( $register_response );
+		}
 	}
 
 	/**
@@ -170,24 +160,65 @@ public function on_connect(): void {
 	 *
 	 * @return void
 	 */
-	public function save_plan_data( $register_response ) : void {
+	public static function save_plan_data( $register_response ) : void {
 		if ( $register_response && ! is_wp_error( $register_response ) ) {
-			$decoded_response = json_decode( $register_response );
-			Data::set_subscription_id( $decoded_response->id );
+			$decoded_response = $register_response;
+			Data::set_subscription_id( $decoded_response->plan->subscription_id );
 			update_option( Settings::PLAN_DATA, $decoded_response );
 			update_option( Settings::IS_VALID_PLAN_DATA, true );
-			$this->set_default_settings();
+			self::set_default_settings();
+			self::set_plan_data_refresh_transient();
 		} else {
 			Logger::error( esc_html( $register_response->get_error_message() ) );
 			update_option( Settings::IS_VALID_PLAN_DATA, false );
 		}
 	}
 
+	/**
+	 * Refresh the plan data after 12 hours
+	 * @return void
+	 */
+	public static function refresh_plan_data() : void {
+
+		if ( ! Connect::is_connected() ) {
+				return;
+		}
+
+		// Refresh only if refresh transient is expired
+		if ( self::get_plan_data_refresh_transient() ) {
+			return;
+		}
+
+		$plan_data = Settings::get( Settings::PLAN_DATA );
+
+		// Return if plan data does not have public_api_key
+		if ( ! $plan_data->public_api_key ) {
+			Logger::error( 'Cannot refresh the plan data. No public API key found.' );
+			self::register_site_with_data();
+			return;
+		}
+
+		$response = Utils::get_api_client()->make_request(
+			'GET',
+			'site/info',
+			[ 'api_key' => $plan_data->public_api_key ]
+		);
+
+		if ( ! is_wp_error( $response ) ) {
+			Settings::set( Settings::PLAN_DATA, $response );
+			Settings::set( Settings::IS_VALID_PLAN_DATA, true );
+			self::set_plan_data_refresh_transient();
+		} else {
+			Logger::error( esc_html( $response->get_error_message() ) );
+			Settings::set( Settings::IS_VALID_PLAN_DATA, false );
+		}
+	}
+
 	/**
 	 * Set default values after successful registration.
 	 * @return void
 	 */
-	private function set_default_settings() : void {
+	private static function set_default_settings() : void {
 		$widget_menu_settings = [
 			'bigger-text' => [
 				'enabled' => true,
@@ -242,7 +273,7 @@ private function set_default_settings() : void {
 						'unit' => 'px',
 					],
 					'vertical' => [
-						'direction' => 'top',
+						'direction' => 'bottom',
 						'value' => 10,
 						'unit' => 'px',
 					],
@@ -303,7 +334,8 @@ public function check_plan_data( $current_screen ) : void {
 				'site/register'
 			);
 
-			$this->save_plan_data( $register_response );
+			self::save_plan_data( $register_response );
+			self::set_plan_data_refresh_transient();
 		}
 	}
 
@@ -392,6 +424,14 @@ public function register_settings(): void {
 		}
 	}
 
+	public static function set_plan_data_refresh_transient(): void {
+		set_transient( Settings::PLAN_DATA . '_refresh', true, HOUR_IN_SECONDS * 12 );
+	}
+
+	public static function get_plan_data_refresh_transient(): bool {
+		return get_transient( Settings::PLAN_DATA . '_refresh' );
+	}
+
 	/**
 	 * Module constructor.
 	 */