Merge pull request #726 from ProgressPlanner/filip/register-branded-site-earlier

Register branded site earlier

Author: jdevalk

classes/admin/widgets/class-challenge.php

@@ -90,7 +90,7 @@ public function get_cache_key() {
 	public function get_remote_api_url() {
 		return \add_query_arg(
 			[
-				'license_key' => \get_option( 'progress_planner_license_key' ),
+				'license_key' => \progress_planner()->get_license_key(),
 				'site'        => \get_site_url(),
 			],
 			\progress_planner()->get_remote_server_root_url() . '/wp-json/progress-planner-saas/v1/challenges'

classes/class-base.php

@@ -98,6 +98,14 @@ public function init() {
 			$this->get_utils__playground();
 		}
 
+		$prpl_license_key = $this->get_license_key();
+		if ( ! $prpl_license_key && 0 !== (int) \progress_planner()->get_ui__branding()->get_branding_id() ) {
+			$prpl_license_key = \progress_planner()->get_utils__onboard()->make_remote_onboarding_request();
+			if ( '' !== $prpl_license_key ) {
+				\update_option( 'progress_planner_license_key', $prpl_license_key, false );
+			}
+		}
+
 		// Basic classes.
 		if ( \is_admin() && \current_user_can( 'edit_others_posts' ) ) {
 			$this->get_admin__page();
@@ -301,7 +309,16 @@ public function get_activation_date() {
 	 * @return bool
 	 */
 	public function is_privacy_policy_accepted() {
-		return false !== \get_option( 'progress_planner_license_key', false );
+		return false !== $this->get_license_key();
+	}
+
+	/**
+	 * Get the license key.
+	 *
+	 * @return string|false
+	 */
+	public function get_license_key() {
+		return \get_option( 'progress_planner_license_key', false );
 	}
 
 	/**

classes/class-lessons.php

@@ -57,7 +57,7 @@ public function get_remote_api_items() {
 		$url = \add_query_arg(
 			[
 				'site'        => \get_site_url(),
-				'license_key' => \get_option( 'progress_planner_license_key' ),
+				'license_key' => \progress_planner()->get_license_key(),
 			],
 			$url
 		);

classes/rest/class-base.php

@@ -86,7 +86,7 @@ public function validate_token( $token ) {
 			return true;
 		}
 
-		$license_key = \get_option( 'progress_planner_license_key', false );
+		$license_key = \progress_planner()->get_license_key();
 		if ( ! $license_key || 'no-license' === $license_key ) {
 			// Increment failed attempts counter.
 			\set_transient( $rate_limit_key, $failed_attempts + 1, HOUR_IN_SECONDS );

classes/utils/class-debug-tools.php

@@ -515,7 +515,7 @@ protected function add_more_info_submenu_item( $admin_bar ) {
 		);
 
 		// Free license info.
-		$prpl_free_license_key = \get_option( 'progress_planner_license_key', false );
+		$prpl_free_license_key = \progress_planner()->get_license_key();
 		$admin_bar->add_node(
 			[
 				'id'     => 'prpl-free-license',

classes/utils/class-onboard.php

@@ -29,7 +29,7 @@ public function __construct() {
 		// Detect domain changes.
 		\add_action( 'shutdown', [ $this, 'detect_site_url_changes' ] );
 
-		if ( \get_option( 'progress_planner_license_key' ) ) {
+		if ( \progress_planner()->get_license_key() ) {
 			return;
 		}
 
@@ -194,7 +194,7 @@ public function detect_site_url_changes() {
 			return;
 		}
 
-		$saved_license_key = \get_option( 'progress_planner_license_key', false );
+		$saved_license_key = \progress_planner()->get_license_key();
 
 		// Bail early if the license key is not set, or if the site URL has not changed.
 		if ( ! $saved_license_key || $saved_site_url === $current_site_url ) {

classes/utils/class-playground.php

@@ -28,7 +28,7 @@ public function __construct() {
 	 * @return void
 	 */
 	public function register_hooks() {
-		if ( ! \get_option( 'progress_planner_license_key', false ) && ! \get_option( 'progress_planner_demo_data_generated', false ) ) {
+		if ( ! \progress_planner()->get_license_key() && ! \get_option( 'progress_planner_demo_data_generated', false ) ) {
 			$this->generate_data();
 			\update_option( 'progress_planner_license_key', \str_replace( ' ', '-', $this->create_random_string( 20 ) ) );
 			\update_option( 'progress_planner_force_show_onboarding', false );

tests/phpunit/test-class-api-get-stats.php

@@ -72,7 +72,7 @@ public static function set_lessons_cache() {
 		$url = \add_query_arg(
 			[
 				'site'        => \get_site_url(),
-				'license_key' => \get_option( 'progress_planner_license_key' ),
+				'license_key' => \progress_planner()->get_license_key(),
 			],
 			$url
 		);

tests/phpunit/test-class-page-types.php

@@ -73,7 +73,7 @@ public static function set_lessons_cache() {
 		$url = \add_query_arg(
 			[
 				'site'        => \get_site_url(),
-				'license_key' => \get_option( 'progress_planner_license_key' ),
+				'license_key' => \progress_planner()->get_license_key(),
 			],
 			$url
 		);

views/admin-page-header.php

@@ -25,7 +25,7 @@
 		<?php
 
 		// Render the subscribe form button and popover if the license key is not set.
-		if ( 'no-license' === \get_option( 'progress_planner_license_key', 'no-license' ) ) {
+		if ( 'no-license' === \progress_planner()->get_license_key() ) {
 			\progress_planner()->get_ui__popover()->the_popover( 'subscribe-form' )->render_button(
 				'',
 				\progress_planner()->get_asset( 'images/register_icon.svg' ) . '<span class="screen-reader-text">' . \esc_html__( 'Subscribe', 'progress-planner' ) . '</span>'