adds new api endpoints

selul · selul · commit 2d292f0fcec3 · 2020-02-28T16:04:39.000+02:00
diff --git a/src/Loader.php b/src/Loader.php
@@ -75,6 +75,28 @@ public static function init() {
 		}
 	}
 
+	/**
+	 * Get cache token used in API requests.
+	 *
+	 * @return string Cache token.
+	 */
+	public static function get_cache_token() {
+		$cache_token = get_transient( 'themeisle_sdk_cache_token' );
+		if ( false === $cache_token ) {
+			$cache_token = wp_generate_password( 6, false );
+			set_transient( $cache_token, WEEK_IN_SECONDS );
+		}
+
+		return $cache_token;
+	}
+
+	/**
+	 * Clear cache token.
+	 */
+	public static function clear_cache_token() {
+		delete_transient( 'themeisle_sdk_cache_token' );
+	}
+
 	/**
 	 * Register product into SDK.
 	 *
diff --git a/src/Modules/Licenser.php b/src/Modules/Licenser.php
@@ -13,6 +13,7 @@
 
 // Exit if accessed directly.
 use ThemeisleSDK\Common\Abstract_Module;
+use ThemeisleSDK\Loader;
 use ThemeisleSDK\Product;
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -435,7 +436,9 @@ public function get_error() {
 	 * @return bool|\WP_Error
 	 */
 	private function do_license_process( $license, $action = 'toggle' ) {
-
+		if ( strlen( $license ) < 10 ) {
+			return new \WP_Error( 'themeisle-license-invalid-format', 'Invalid license.' );
+		}
 		$status = $this->get_license_status();
 
 		if ( 'valid' === $status && 'activate' === $action ) {
@@ -451,25 +454,27 @@ private function do_license_process( $license, $action = 'toggle' ) {
 			'item_name' => rawurlencode( $this->product->get_name() ),
 			'url'       => rawurlencode( home_url() ),
 		);
-
-		switch ( $action ) {
-			case 'activate':
-				$api_params['edd_action'] = 'activate_license';
-				break;
-			case 'deactivate':
-				$api_params['edd_action'] = 'deactivate_license';
-				break;
-			case 'check':
-				$api_params['edd_action'] = 'check_license';
-				break;
-			case 'toggle':
-			case 'default':
-				$api_params['edd_action'] = ( 'valid' !== $status ? ( 'activate_license' ) : ( 'deactivate_license' ) );
-				break;
+		if ( 'toggle' === $action ) {
+			$action = ( 'valid' !== $status ? ( 'activate' ) : ( 'deactivate' ) );
 		}
 
 		// Call the custom API.
-		$response = wp_remote_get( add_query_arg( $api_params, $this->get_api_url() ) );
+		if ( 'check' === $action ) {
+			$response = wp_remote_get( sprintf( '%slicense/check/%s/%s/%s/%s', Product::API_URL, rawurlencode( $this->product->get_name() ), $license, rawurlencode( home_url() ), Loader::get_cache_token() ) );
+		} else {
+			$response = wp_remote_post(
+				sprintf( '%slicense/%s/%s/%s/%s/%s', Product::API_URL, $action, rawurlencode( $this->product->get_name() ), $license ),
+				array(
+					'body'    => array(
+						'url' => rawurlencode( home_url() ),
+					),
+					'headers' => array(
+						'Content-Type' => 'application/json',
+					),
+				)
+			);
+		}
+
 		// make sure the response came back okay.
 		if ( is_wp_error( $response ) ) {
 			return new \WP_Error( 'themeisle-license-500', sprintf( 'ERROR: Failed to connect to the license service. Please try again later. Reason: %s', $response->get_error_message() ) );
@@ -483,6 +488,9 @@ private function do_license_process( $license, $action = 'toggle' ) {
 		if ( 'check' === $action ) {
 			return $license_data;
 		}
+
+		Loader::clear_cache_token();
+
 		if ( ! isset( $license_data->license ) ) {
 			$license_data->license = 'invalid';
 		}
diff --git a/src/Modules/Rollback.php b/src/Modules/Rollback.php
@@ -167,7 +167,7 @@ private function get_versions_api_url() {
 			return '';
 		}
 
-		return sprintf( '%s?edd_action=get_versions&name=%s&url=%s&license=%s', $this->product->get_store_url(), urlencode( $this->product->get_name() ), urlencode( get_site_url() ), $license );
+		return sprintf( '%slicense/versions/%s/%s/%s/%s', Product::API_URL, urlencode( $this->product->get_name() ), $license, urlencode( get_site_url() ), $this->product->get_version() );
 	}
 
 	/**
diff --git a/src/Product.php b/src/Product.php
@@ -106,7 +106,10 @@ class Product {
 	 * @var string $version The product version.
 	 */
 	private $version;
-
+	/**
+	 * Root api endpoint.
+	 */
+	const API_URL = 'https://api.themeisle.com/';
 	/**
 	 * ThemeIsle_SDK_Product constructor.
 	 *

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ private function get_versions_api_url() {`
`167`	`167`	`return '';`
`168`	`168`	`}`
`169`	`169`
`170`		`- return sprintf( '%s?edd_action=get_versions&name=%s&url=%s&license=%s', $this->product->get_store_url(), urlencode( $this->product->get_name() ), urlencode( get_site_url() ), $license );`
	`170`	`+ return sprintf( '%slicense/versions/%s/%s/%s/%s', Product::API_URL, urlencode( $this->product->get_name() ), $license, urlencode( get_site_url() ), $this->product->get_version() );`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`/**`