chore: not exposing pro user flags outside the kernal trust module

Author: abose

src/LiveDevelopment/main.js

@@ -48,12 +48,15 @@ define(function main(require, exports, module) {
 
 
     const KernalModeTrust = window.KernalModeTrust;
+    if(!KernalModeTrust){
+        throw new Error("KernalModeTrust is not defined. Cannot boot without trust ring");
+    }
     const LIVE_PREVIEW_MODE = CONSTANTS.LIVE_PREVIEW_MODE,
         LIVE_HIGHLIGHT_MODE = CONSTANTS.LIVE_HIGHLIGHT_MODE,
         LIVE_EDIT_MODE = CONSTANTS.LIVE_EDIT_MODE;
 
     // this will later be assigned its correct values once entitlementsManager loads
-    let isProUser = false;
+    let isProEditUser = false;
     let isFreeTrialUser = false;
 
     const PREFERENCE_LIVE_PREVIEW_MODE = CONSTANTS.PREFERENCE_LIVE_PREVIEW_MODE;
@@ -226,7 +229,7 @@ define(function main(require, exports, module) {
     // default mode means on first load for pro user we have edit mode
     // for free user we have highlight mode
     function _getDefaultMode() {
-        return isProUser ? LIVE_EDIT_MODE : LIVE_HIGHLIGHT_MODE;
+        return isProEditUser ? LIVE_EDIT_MODE : LIVE_HIGHLIGHT_MODE;
     }
 
     // to set that mode in the preferences
@@ -238,9 +241,9 @@ define(function main(require, exports, module) {
 
         const savedMode = PreferencesManager.get(PREFERENCE_LIVE_PREVIEW_MODE) || _getDefaultMode();
 
-        if (savedMode === LIVE_HIGHLIGHT_MODE && isProUser) {
+        if (savedMode === LIVE_HIGHLIGHT_MODE && isProEditUser) {
             PreferencesManager.set(PREFERENCE_LIVE_PREVIEW_MODE, LIVE_EDIT_MODE);
-        } else if (savedMode === LIVE_EDIT_MODE && !isProUser) {
+        } else if (savedMode === LIVE_EDIT_MODE && !isProEditUser) {
             PreferencesManager.set(PREFERENCE_LIVE_PREVIEW_MODE, LIVE_HIGHLIGHT_MODE);
         }
     }
@@ -254,12 +257,9 @@ define(function main(require, exports, module) {
         try {
             const entitlement = await KernalModeTrust.EntitlementsManager.getLiveEditEntitlement();
 
-            isProUser = entitlement.activated;
+            isProEditUser = entitlement.activated;
             isFreeTrialUser = await KernalModeTrust.EntitlementsManager.isInProTrial();
 
-            exports.isProUser = isProUser;
-            exports.isFreeTrialUser = isFreeTrialUser;
-
             _initializeMode(); // validates mode based on new entitlement
             config.mode = getCurrentMode(); // update config.mode after validation
 
@@ -268,13 +268,13 @@ define(function main(require, exports, module) {
             }
         } catch (error) {
             console.error("Error updating pro user status:", error);
-            isProUser = false;
+            isProEditUser = false;
             isFreeTrialUser = false;
         }
     }
 
     function setMode(mode) {
-        if (mode === LIVE_EDIT_MODE && !exports.isProUser) {
+        if (mode === LIVE_EDIT_MODE && !isProEditUser) {
             return false;
         }
         PreferencesManager.set(PREFERENCE_LIVE_PREVIEW_MODE, mode);
@@ -381,9 +381,6 @@ define(function main(require, exports, module) {
 
     EventDispatcher.makeEventDispatcher(exports);
 
-    exports.isProUser = isProUser;
-    exports.isFreeTrialUser = isFreeTrialUser;
-
     // public events
     exports.EVENT_OPEN_PREVIEW_URL = MultiBrowserLiveDev.EVENT_OPEN_PREVIEW_URL;
     exports.EVENT_CONNECTION_CLOSE = MultiBrowserLiveDev.EVENT_CONNECTION_CLOSE;

src/extensionsIntegrated/Phoenix-live-preview/main.js

@@ -75,6 +75,11 @@ define(function (require, exports, module) {
         ProDialogs = require("services/pro-dialogs"),
         utils = require('./utils');
 
+    const KernalModeTrust = window.KernalModeTrust;
+    if(!KernalModeTrust){
+        throw new Error("KernalModeTrust is not defined. Cannot boot without trust ring");
+    }
+
     const StateManager = PreferencesManager.stateManager;
     const STATE_CUSTOM_SERVER_BANNER_ACK = "customServerBannerDone";
     let customServerModalBar;
@@ -156,6 +161,25 @@ define(function (require, exports, module) {
     let connectingOverlayTimer = null; // this is needed as we show the connecting overlay after 3s
     let connectingOverlayTimeDuration = 3000;
 
+    let isProEditUser = false;
+    // this is called everytime there is a change in entitlements
+    async function _entitlementsChanged() {
+        try {
+            const entitlement = await KernalModeTrust.EntitlementsManager.getLiveEditEntitlement();
+            isProEditUser = entitlement.activated;
+        } catch (error) {
+            console.error("Error updating pro user status:", error);
+            isProEditUser = false;
+        }
+    }
+    if(!Phoenix.isSpecRunnerWindow){
+        _entitlementsChanged();
+        KernalModeTrust.EntitlementsManager.on(
+            KernalModeTrust.EntitlementsManager.EVENT_ENTITLEMENTS_CHANGED,
+            _entitlementsChanged
+        );
+    }
+
     StaticServer.on(EVENT_EMBEDDED_IFRAME_WHO_AM_I, function () {
         if($iframe && $iframe[0]) {
             const iframeDom = $iframe[0];
@@ -310,7 +334,7 @@ define(function (require, exports, module) {
     }
 
     function _showModeSelectionDropdown(event) {
-        const isEditFeaturesActive = LiveDevelopment.isProUser;
+        const isEditFeaturesActive = isProEditUser;
         const items = [
             Strings.LIVE_PREVIEW_MODE_PREVIEW,
             Strings.LIVE_PREVIEW_MODE_HIGHLIGHT,
@@ -645,7 +669,7 @@ define(function (require, exports, module) {
     function _handlePreviewBtnClick() {
         if($previewBtn.hasClass('selected')) {
             $previewBtn.removeClass('selected');
-            const isEditFeaturesActive = LiveDevelopment.isProUser;
+            const isEditFeaturesActive = isProEditUser;
             if(modeThatWasSelected) {
                 // If the last selected mode was preview itself, default to the best mode for user's entitlement
                 if(modeThatWasSelected === 'preview') {

test/spec/LiveDevelopmentMultiBrowser-test.js

@@ -118,7 +118,6 @@ define(function (require, exports, module) {
                 // This ensures tests focus on basic live preview functionality without
                 // edit mode interference (hover/click handlers)
                 if (LiveDevMultiBrowser && LiveDevMultiBrowser.config) {
-                    LiveDevMultiBrowser.config.isProUser = false;
                     // Also update the remote browser configuration
                     if (LiveDevMultiBrowser.updateConfig) {
                         LiveDevMultiBrowser.updateConfig(JSON.stringify(LiveDevMultiBrowser.config));
@@ -175,7 +174,6 @@ define(function (require, exports, module) {
         async function waitsForLiveDevelopmentToOpen() {
             // Ensure edit mode is disabled before opening live preview
             if (LiveDevMultiBrowser && LiveDevMultiBrowser.config) {
-                LiveDevMultiBrowser.config.isProUser = false;
                 // Update the remote browser configuration to sync the disabled state
                 if (LiveDevMultiBrowser.updateConfig) {
                     LiveDevMultiBrowser.updateConfig(JSON.stringify(LiveDevMultiBrowser.config));
@@ -1946,7 +1944,6 @@ define(function (require, exports, module) {
             async function waitsForLiveDevelopmentToOpenWithEditMode(elemHighlights = 'hover') {
                 // Enable edit mode before opening live preview
                 if (LiveDevMultiBrowser && LiveDevMultiBrowser.config) {
-                    LiveDevMultiBrowser.config.isProUser = true;
                     LiveDevMultiBrowser.config.elemHighlights = elemHighlights;
                     // Update the remote browser configuration
                     if (LiveDevMultiBrowser.updateConfig) {
@@ -1962,7 +1959,6 @@ define(function (require, exports, module) {
                 LiveDevMultiBrowser.close();
                 // Disable edit mode after session
                 if (LiveDevMultiBrowser && LiveDevMultiBrowser.config) {
-                    LiveDevMultiBrowser.config.isProUser = false;
                     LiveDevMultiBrowser.config.elemHighlights = 'hover';
                 }
                 await awaitsForDone(CommandManager.execute(Commands.FILE_CLOSE_ALL, { _forceClose: true }),