deploy: 606b7d0

Author: phoenixide

appConfig.js

@@ -31,7 +31,7 @@ window.AppConfig = {
         "app_notification_url": "assets/notifications/dev/",
         "app_update_url": "https://updates.phcode.io/tauri/update-latest-experimental-build.json",
         "linting.enabled_by_default": true,
-        "build_timestamp": "2025-09-18T09:23:59.718Z",
+        "build_timestamp": "2025-09-18T12:53:22.369Z",
         "googleAnalyticsID": "G-P4HJFPDB76",
         "googleAnalyticsIDDesktop": "G-VE5BXWJ0HF",
         "mixPanelID": "49c4d164b592be2350fc7af06a259bf3",
@@ -43,7 +43,7 @@ window.AppConfig = {
         "bugsnagEnv": "development"
     },
     "name": "Phoenix Code",
-    "version": "4.1.2-21475",
+    "version": "4.1.2-21478",
     "apiVersion": "4.1.2",
     "homepage": "https://core.ai",
     "issues": {

assets/default-project/en.zip

@@ -112671,7 +112671,8 @@ define("nls/root/strings", {
     "PROMO_GET_APP_UPSELL_BUTTON": "Get {0}",
     "PROMO_PRO_ENDED_TITLE": "Your {0} Trial has ended",
     "PROMO_PRO_TRIAL_DAYS_LEFT": "Phoenix Pro Trial ({0} days left)",
-    "GET_PHOENIX_PRO": "Get Phoenix Pro"
+    "GET_PHOENIX_PRO": "Get Phoenix Pro",
+    "USER_FREE_PLAN_NAME": "Free Plan"
 });
 
 /*
@@ -167452,12 +167453,14 @@ define("services/login-desktop", function (require, exports, module) {
 define("services/login-service", function (require, exports, module) {
     require("./setup-login-service"); // this adds loginService to KernalModeTrust
     require("./promotions");
+    require("./login-utils");
 
-    const Metrics = require("utils/Metrics");
-    const LoginUtils = require("./login-utils");
+    const Metrics = require("utils/Metrics"),
+        Strings = require("strings");
 
     const MS_IN_DAY = 10 * 24 * 60 * 60 * 1000;
     const TEN_MINUTES = 10 * 60 * 1000;
+    const FREE_PLAN_VALIDITY_DAYS = 10000;
 
     // the fallback salt is always a constant as this will only fail in rare circumstatnces and it needs to
     // be exactly same across versions of the app. Changing this will not affect the large majority of users and
@@ -167472,6 +167475,7 @@ define("services/login-service", function (require, exports, module) {
 
     // save a copy of window.fetch so that extensions wont tamper with it.
     let fetchFn = window.fetch;
+    let dateNowFn = Date.now;
 
     const KernalModeTrust = window.KernalModeTrust;
     if(!KernalModeTrust){
@@ -167775,8 +167779,8 @@ define("services/login-service", function (require, exports, module) {
                 const current = await getEffectiveEntitlements(false); // Get effective entitlements
 
                 // Check if we need to refresh
-                const expiredPlanName = LoginUtils.validTillExpired(current, lastRecordedState);
-                const hasChanged = LoginUtils.haveEntitlementsChanged(current, lastRecordedState);
+                const expiredPlanName = KernalModeTrust.LoginUtils.validTillExpired(current, lastRecordedState);
+                const hasChanged = KernalModeTrust.LoginUtils.haveEntitlementsChanged(current, lastRecordedState);
 
                 if (expiredPlanName || hasChanged) {
                     console.log(`Entitlements monitor detected changes, Expired: ${expiredPlanName},` +
@@ -167800,6 +167804,38 @@ define("services/login-service", function (require, exports, module) {
         console.log('Entitlements monitor started (10-minute interval)');
     }
 
+    function _validateAndFilterEntitlements(entitlements) {
+        if (!entitlements) {
+            return;
+        }
+
+        const currentDate = dateNowFn();
+
+        if(entitlements.plan && (!entitlements.plan.validTill || currentDate > entitlements.plan.validTill)) {
+            entitlements.plan = {
+                ...entitlements.plan,
+                paidSubscriber: false,
+                name: Strings.USER_FREE_PLAN_NAME,
+                validTill: currentDate + (FREE_PLAN_VALIDITY_DAYS * MS_IN_DAY)
+            };
+        }
+
+        const featureEntitlements = entitlements.entitlements;
+        if (!featureEntitlements) {
+            return;
+        }
+
+        for(const featureName in featureEntitlements) {
+            const feature = featureEntitlements[featureName];
+            if(feature && (!feature.validTill || currentDate > feature.validTill)) {
+                feature.activated = false;
+                feature.upgradeToPlan = feature.upgradeToPlan || brackets.config.main_pro_plan;
+                feature.subscribeURL = feature.subscribeURL || brackets.config.purchase_url;
+                feature.validTill = feature.validTill || (currentDate - MS_IN_DAY);
+            }
+        }
+    }
+
     /**
      * Get effective entitlements for determining feature availability throughout the app.
      * This is the primary API that should be used across Phoenix to check entitlements and enable/disable features.
@@ -167891,6 +167927,7 @@ define("services/login-service", function (require, exports, module) {
     async function getEffectiveEntitlements(forceRefresh = false) {
         // Get raw server entitlements
         const serverEntitlements = await getEntitlements(forceRefresh);
+        _validateAndFilterEntitlements(serverEntitlements); // will prune invalid entitlements
 
         // Get trial days remaining
         const trialDaysRemaining = await LoginService.getProTrialDaysRemaining();
@@ -167905,19 +167942,17 @@ define("services/login-service", function (require, exports, module) {
             // Logged-in user with trial
             if (serverEntitlements.plan.paidSubscriber) {
                 // Already a paid subscriber, return as-is
-                // todo we need to check and filter valid till for each fields that we are interested in.
                 return serverEntitlements;
             }
             // Enhance entitlements for trial user
-            // todo we need to prune and filter serverEntitlements valid till for each fields that we are interested in.
             // ie if any entitlement has valid till expired, we need to deactivate that entitlement
             return {
                 ...serverEntitlements,
                 plan: {
                     ...serverEntitlements.plan,
                     paidSubscriber: true,
                     name: brackets.config.main_pro_plan,
-                    validTill: Date.now() + trialDaysRemaining * MS_IN_DAY
+                    validTill: dateNowFn() + trialDaysRemaining * MS_IN_DAY
                 },
                 isInProTrial: true,
                 trialDaysRemaining: trialDaysRemaining,
@@ -167927,7 +167962,7 @@ define("services/login-service", function (require, exports, module) {
                         activated: true,
                         subscribeURL: brackets.config.purchase_url,
                         upgradeToPlan: brackets.config.main_pro_plan,
-                        validTill: Date.now() + trialDaysRemaining * MS_IN_DAY
+                        validTill: dateNowFn() + trialDaysRemaining * MS_IN_DAY
                     }
                 }
             };
@@ -167938,7 +167973,7 @@ define("services/login-service", function (require, exports, module) {
             plan: {
                 paidSubscriber: true,
                 name: brackets.config.main_pro_plan,
-                validTill: Date.now() + trialDaysRemaining * MS_IN_DAY
+                validTill: dateNowFn() + trialDaysRemaining * MS_IN_DAY
             },
             isInProTrial: true,
             trialDaysRemaining: trialDaysRemaining,
@@ -167947,7 +167982,7 @@ define("services/login-service", function (require, exports, module) {
                     activated: true,
                     subscribeURL: brackets.config.purchase_url,
                     upgradeToPlan: brackets.config.main_pro_plan,
-                    validTill: Date.now() + trialDaysRemaining * MS_IN_DAY
+                    validTill: dateNowFn() + trialDaysRemaining * MS_IN_DAY
                 }
             }
         };
@@ -167966,7 +168001,11 @@ define("services/login-service", function (require, exports, module) {
             LoginService,
             setFetchFn: function _setFetchFn(fn) {
                 fetchFn = fn;
-            }
+            },
+            setDateNowFn: function _setDdateNowFn(fn) {
+                dateNowFn = fn;
+            },
+            _validateAndFilterEntitlements: _validateAndFilterEntitlements
         };
     }
 
@@ -168001,9 +168040,15 @@ define("services/login-service", function (require, exports, module) {
 
 define("services/login-utils", function (require, exports, module) {
 
+    const KernalModeTrust = window.KernalModeTrust;
+    if(!KernalModeTrust){
+        // integrated extensions will have access to kernal mode, but not external extensions
+        throw new Error("Login utils should have access to KernalModeTrust. Cannot boot without trust ring");
+    }
+
     /**
      * Check if any validTill time has expired
-     * 
+     *
      * @param {Object|null} entitlements - Current entitlements object
      * @param {Object|null} lastRecordedEntitlement - Previously recorded entitlements
      * @returns {string|null} - Name of expired plan/entitlement or null if none expired
@@ -168061,7 +168106,7 @@ define("services/login-utils", function (require, exports, module) {
 
     /**
      * Check if entitlements have changed from last recorded state
-     * 
+     *
      * @param {Object|null} current - Current entitlements object
      * @param {Object|null} last - Last recorded entitlements object
      * @returns {boolean} - True if entitlements have changed, false otherwise
@@ -168105,10 +168150,17 @@ define("services/login-utils", function (require, exports, module) {
         return false;
     }
 
-    // Export functions
-    exports.validTillExpired = validTillExpired;
-    exports.haveEntitlementsChanged = haveEntitlementsChanged;
+    KernalModeTrust.LoginUtils = {
+        validTillExpired,
+        haveEntitlementsChanged
+    };
+    // Test only Export functions
+    if(Phoenix.isTestWindow) {
+        exports.validTillExpired = validTillExpired;
+        exports.haveEntitlementsChanged = haveEntitlementsChanged;
+    }
 });
+
 /*
  * GNU AGPL-3.0 License
  *
@@ -168850,7 +168902,7 @@ define("services/profile-menu", function (require, exports, module) {
             initials: profileData.profileIcon.initials,
             avatarColor: profileData.profileIcon.color,
             planClass: "user-plan-free",
-            planName: "Free Plan",
+            planName: Strings.USER_FREE_PLAN_NAME,
             titleText: "Ai Quota Used",
             usageText: "100 / 200 credits",
             usedPercent: 0,