Refactor Pro license validation logic and update related tests

Author: AbanoubGhadban

lib/react_on_rails/helper.rb

@@ -448,8 +448,8 @@ def load_pack_for_generated_component(react_component_name, render_options)
     # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
 
     def pro_warning_badge_if_needed(force_load)
-      return "".html_safe if !force_load && !ReactOnRails.configuration.force_load
-      return "".html_safe if ReactOnRails::Utils.react_on_rails_pro?
+      return "".html_safe unless force_load
+      return "".html_safe if ReactOnRails::Utils.react_on_rails_pro_licence_valid?
 
       warning_message = "[REACT ON RAILS] The 'force_load' feature requires a React on Rails Pro license. " \
                         "Please visit https://shakacode.com/react-on-rails-pro to learn more."

lib/react_on_rails/utils.rb

@@ -7,7 +7,7 @@
 require "active_support/core_ext/string"
 
 module ReactOnRails
-  module Utils
+  module Utils # rubocop:disable Metrics/ModuleLength
     TRUNCATION_FILLER = "\n... TRUNCATED #{
       Rainbow('To see the full output, set FULL_TEXT_ERRORS=true.').red
     } ...\n".freeze
@@ -213,6 +213,21 @@ def self.react_on_rails_pro_version
                                     end
     end
 
+    def self.react_on_rails_pro_licence_valid?
+      return @react_on_rails_pro_licence_valid if defined?(@react_on_rails_pro_licence_valid)
+
+      @react_on_rails_pro_licence_valid = begin
+        return false unless react_on_rails_pro?
+
+        # Maintain compatibility with legacy versions of React on Rails Pro:
+        # Earlier releases did not require license validation, as they were distributed as private gems.
+        # This check ensures that the method works correctly regardless of the installed version.
+        return true unless ReactOnRailsPro::Utils.respond_to?(:licence_valid?)
+
+        ReactOnRailsPro::Utils.licence_valid?
+      end
+    end
+
     def self.rsc_support_enabled?
       return false unless react_on_rails_pro?
 

spec/dummy/spec/helpers/react_on_rails_helper_spec.rb

@@ -23,9 +23,7 @@ class PlainReactOnRailsHelper
     }
 
     allow(ReactOnRails::Utils).to receive_messages(
-      react_on_rails_pro?: true,
-      react_on_rails_pro_version: "4.0.0",
-      rsc_support_enabled?: false
+      react_on_rails_pro_licence_valid?: true
     )
   end
 
@@ -388,7 +386,7 @@ def helper.append_javascript_pack_tag(name, **options)
         subject(:react_app) { react_component("App", props: props, force_load: true) }
 
         before do
-          allow(ReactOnRails::Utils).to receive(:react_on_rails_pro?).and_return(false)
+          allow(ReactOnRails::Utils).to receive(:react_on_rails_pro_licence_valid?).and_return(false)
         end
 
         it { is_expected.to include(badge_html_string) }
@@ -403,7 +401,7 @@ def helper.append_javascript_pack_tag(name, **options)
         subject(:react_app) { react_component("App", props: props) }
 
         before do
-          allow(ReactOnRails::Utils).to receive(:react_on_rails_pro?).and_return(false)
+          allow(ReactOnRails::Utils).to receive(:react_on_rails_pro_licence_valid?).and_return(false)
         end
 
         around do |example|
@@ -419,7 +417,7 @@ def helper.append_javascript_pack_tag(name, **options)
         subject(:react_app) { react_component("App", props: props, force_load: false) }
 
         before do
-          allow(ReactOnRails::Utils).to receive(:react_on_rails_pro?).and_return(false)
+          allow(ReactOnRails::Utils).to receive(:react_on_rails_pro_licence_valid?).and_return(false)
         end
 
         it { is_expected.not_to include(badge_html_string) }
@@ -435,8 +433,7 @@ def helper.append_javascript_pack_tag(name, **options)
 
         before do
           allow(ReactOnRails::Utils).to receive_messages(
-            react_on_rails_pro?: true,
-            react_on_rails_pro_version: "4.0.0"
+            react_on_rails_pro_licence_valid?: true
           )
         end
 
@@ -482,7 +479,7 @@ def helper.append_javascript_pack_tag(name, **options)
         subject(:react_app) { react_component_hash("App", props: props, force_load: true) }
 
         before do
-          allow(ReactOnRails::Utils).to receive(:react_on_rails_pro?).and_return(false)
+          allow(ReactOnRails::Utils).to receive(:react_on_rails_pro_licence_valid?).and_return(false)
         end
 
         it "adds badge to componentHtml" do
@@ -495,8 +492,7 @@ def helper.append_javascript_pack_tag(name, **options)
 
         before do
           allow(ReactOnRails::Utils).to receive_messages(
-            react_on_rails_pro?: true,
-            react_on_rails_pro_version: "4.0.0"
+            react_on_rails_pro_licence_valid?: true
           )
         end
 
@@ -541,7 +537,7 @@ def helper.append_javascript_pack_tag(name, **options)
         subject(:store) { redux_store("reduxStore", props: props, force_load: true) }
 
         before do
-          allow(ReactOnRails::Utils).to receive(:react_on_rails_pro?).and_return(false)
+          allow(ReactOnRails::Utils).to receive(:react_on_rails_pro_licence_valid?).and_return(false)
         end
 
         it { is_expected.to include(badge_html_string) }
@@ -556,7 +552,7 @@ def helper.append_javascript_pack_tag(name, **options)
         subject(:store) { redux_store("reduxStore", props: props, force_load: false) }
 
         before do
-          allow(ReactOnRails::Utils).to receive(:react_on_rails_pro?).and_return(false)
+          allow(ReactOnRails::Utils).to receive(:react_on_rails_pro_licence_valid?).and_return(false)
         end
 
         it { is_expected.not_to include(badge_html_string) }
@@ -567,8 +563,7 @@ def helper.append_javascript_pack_tag(name, **options)
 
         before do
           allow(ReactOnRails::Utils).to receive_messages(
-            react_on_rails_pro?: true,
-            react_on_rails_pro_version: "4.0.0"
+            react_on_rails_pro_licence_valid?: true
           )
         end