Update license/asset handling

Author: robincornett

assets/build/js/edd-sl-sdk.js

@@ -74,7 +74,8 @@
 					}
 					if ( data.license.length && action === 'deactivate' ) {
 						$( '.edd-sl-sdk__license--input' ).removeAttribute( 'readonly' );
-					} else if ( action === 'activate' || action === 'verify' ) {
+						$( '.edd-sl-sdk__license-status-message' ).remove();
+					} else if ( action === 'activate' ) {
 						$( '.edd-sl-sdk__license--input' ).setAttribute( 'readonly', 'true' );
 						if ( res.data.url && res.data.url.length ) {
 							setTimeout( () => {

assets/src/js/license.js

@@ -26,14 +26,16 @@
 
 	add_action( 'after_setup_theme', 'edd_sl_sdk_register_1_0_0', 0, 0 ); // WRCS: DEFINED_VERSION.
 
-	// phpcs:disable Generic.Functions.OpeningFunctionBraceKernighanRitchie.ContentAfterBrace
 	/**
 	 * Registers this version of Action Scheduler.
 	 */
 	function edd_sl_sdk_register_1_0_0() {
-		// WRCS: DEFINED_VERSION.
+		$version  = '1.0.0';
 		$versions = EasyDigitalDownloads\Updater\Versions::instance();
-		$versions->register( '1.0.0', 'edd_sl_sdk_initialize_1_0_0' ); // WRCS: DEFINED_VERSION.
+		$versions->register( $version, 'edd_sl_sdk_initialize_1_0_0' ); // WRCS: DEFINED_VERSION.
+		if ( ! defined( 'EDD_SL_SDK_VERSION' ) ) {
+			define( 'EDD_SL_SDK_VERSION', $version );
+		}
 	}
 
 	// phpcs:disable Generic.Functions.OpeningFunctionBraceKernighanRitchie.ContentAfterBrace

edd-sl-sdk.php

@@ -86,8 +86,8 @@ public function license_modal() {
 		?>
 		<div class="edd-sdk-notice--overlay"></div>
 		<?php
-		wp_enqueue_script( 'edd-sdk-notice', EDD_SL_SDK_URL . 'assets/build/js/edd-sl-sdk.js', array(), '1.0.0', true );
-		wp_enqueue_style( 'edd-sdk-notice', EDD_SL_SDK_URL . 'assets/build/css/style-edd-sl-sdk.css', array(), '1.0.0' );
+		wp_enqueue_script( 'edd-sdk-notice', EDD_SL_SDK_URL . 'assets/build/js/edd-sl-sdk.js', array(), EDD_SL_SDK_VERSION, true );
+		wp_enqueue_style( 'edd-sdk-notice', EDD_SL_SDK_URL . 'assets/build/css/style-edd-sl-sdk.css', array(), EDD_SL_SDK_VERSION );
 		wp_localize_script(
 			'edd-sdk-notice',
 			'edd_sdk_notice',
@@ -186,4 +186,22 @@ protected function get_default_api_request_args() {
 			'allow_tracking' => $this->license->get_allow_tracking(),
 		);
 	}
+
+	/**
+	 * Gets the slug for the API request.
+	 *
+	 * @since <next-version>
+	 * @return string
+	 */
+	protected function get_slug(): string {
+		if ( empty( $this->args['file'] ) ) {
+			return '';
+		}
+
+		if ( ! $this->slug ) {
+			$this->slug = basename( dirname( $this->args['file'] ) );
+		}
+
+		return $this->slug;
+	}
 }

src/Handlers/Handler.php

@@ -77,9 +77,10 @@ public function get_key_option_name() {
 	 * @return string
 	 */
 	public function get_actions( $should_echo = false ) {
-		$status    = get_option( $this->get_status_option_name() );
-		$button    = $this->get_button_args( $status );
-		$timestamp = time();
+		$license_data = get_option( $this->get_status_option_name() );
+		$status       = $license_data->license ?? 'inactive';
+		$button       = $this->get_button_args( $status );
+		$timestamp    = time();
 		if ( ! $should_echo ) {
 			ob_start();
 		}
@@ -361,6 +362,6 @@ private function can_manage_license( $nonce_name = 'edd_sl_sdk_license_handler'
 	 * @return string
 	 */
 	private function get_status_option_name() {
-		return ! empty( $this->args['option_name'] ) ? "{$this->args['option_name']}_status" : "{$this->slug}_license_status";
+		return ! empty( $this->args['option_name'] ) ? "{$this->args['option_name']}_license" : "{$this->slug}_license";
 	}
 }