From 81a84ddc18a5add6290408d8c1bb5c4e2c5d206b Mon Sep 17 00:00:00 2001 From: abose Date: Sun, 31 Aug 2025 16:24:01 +0530 Subject: [PATCH 1/6] refactor: login popup --- src/services/html/profile-popup.html | 4 ++-- src/styles/UserProfile.less | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/services/html/profile-popup.html b/src/services/html/profile-popup.html index 29f906483a..c920c92d76 100644 --- a/src/services/html/profile-popup.html +++ b/src/services/html/profile-popup.html @@ -8,12 +8,12 @@
-
{{planName}}
+
{{planName}}
-
+
{{Strings.AI_QUOTA_USED}} {{quotaUsed}} / {{quotaTotal}} {{quotaUnit}} diff --git a/src/styles/UserProfile.less b/src/styles/UserProfile.less index 2e9daf3056..cc8b069d87 100644 --- a/src/styles/UserProfile.less +++ b/src/styles/UserProfile.less @@ -73,7 +73,7 @@ font-size: 12px; } - .quota-section { + .profile-section { margin-bottom: 20px; } From 70f4cdd5790445d74bc5f2a3516a7427b2db178f Mon Sep 17 00:00:00 2001 From: abose Date: Sun, 31 Aug 2025 19:11:55 +0530 Subject: [PATCH 2/6] feat: entitlements api call for login and user based entitlements --- src/nls/root/strings.js | 1 - src/services/html/profile-popup.html | 10 +- src/services/login-browser.js | 1 + src/services/login-desktop.js | 1 + src/services/profile-menu.js | 157 ++++++++++++++++++++++++++- 5 files changed, 159 insertions(+), 11 deletions(-) diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index dcca36044d..abb3b0e46c 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -1606,7 +1606,6 @@ define({ "CONTACT_SUPPORT": "Contact support", "SIGN_OUT": "Sign out", "ACCOUNT_DETAILS": "Account Details", - "AI_QUOTA_USED": "AI quota used", "LOGIN_REFRESH": "Check Login Status", "SIGN_IN_WAITING_TITLE": "Waiting for Sign In", "SIGN_IN_WAITING_MESSAGE": "Please complete sign-in in the new tab, then return here.", diff --git a/src/services/html/profile-popup.html b/src/services/html/profile-popup.html index c920c92d76..8080c83aff 100644 --- a/src/services/html/profile-popup.html +++ b/src/services/html/profile-popup.html @@ -13,13 +13,15 @@
-
+
+
+
- {{Strings.AI_QUOTA_USED}} - {{quotaUsed}} / {{quotaTotal}} {{quotaUnit}} + {{titleText}} + {{usageText}}
-
+
diff --git a/src/services/login-browser.js b/src/services/login-browser.js index 8f0338dfba..5885c05e3d 100644 --- a/src/services/login-browser.js +++ b/src/services/login-browser.js @@ -418,6 +418,7 @@ define(function (require, exports, module) { secureExports.getProfile = getProfile; secureExports.verifyLoginStatus = () => _verifyBrowserLogin(false); secureExports.getAccountBaseURL = _getAccountBaseURL; + secureExports.getEntitlements = ProfileMenu.getEntitlements; } // public exports diff --git a/src/services/login-desktop.js b/src/services/login-desktop.js index b960d369d3..5c6e39d6cf 100644 --- a/src/services/login-desktop.js +++ b/src/services/login-desktop.js @@ -417,6 +417,7 @@ define(function (require, exports, module) { secureExports.getProfile = getProfile; secureExports.verifyLoginStatus = () => _verifyLogin(false); secureExports.getAccountBaseURL = getAccountBaseURL; + secureExports.getEntitlements = ProfileMenu.getEntitlements; } // public exports diff --git a/src/services/profile-menu.js b/src/services/profile-menu.js index 8da38fcfb1..dd2a69c2f9 100644 --- a/src/services/profile-menu.js +++ b/src/services/profile-menu.js @@ -183,6 +183,66 @@ define(function (require, exports, module) { _setupDocumentClickHandler(); } + // Cached entitlements data + let cachedEntitlements = null; + + /** + * Get entitlements from API or cache + * Returns null if user is not logged in + */ + async function getEntitlements(forceRefresh = false) { + // Return null if not logged in + if (!KernalModeTrust.loginService.isLoggedIn()) { + return null; + } + + // Return cached data if available and not forcing refresh + if (cachedEntitlements && !forceRefresh) { + return cachedEntitlements; + } + + try { + const accountBaseURL = KernalModeTrust.loginService.getAccountBaseURL(); + const language = Phoenix.app && Phoenix.app.language ? Phoenix.app.language : 'en'; + let url = `${accountBaseURL}/getAppEntitlements?lang=${language}`; + let fetchOptions = { + method: 'GET', + headers: { + 'Accept': 'application/json' + } + }; + + // Handle different authentication methods for browser vs desktop + if (Phoenix.isNativeApp) { + // Desktop app: use appSessionID and validationCode + const profile = KernalModeTrust.loginService.getProfile(); + if (profile && profile.apiKey && profile.validationCode) { + url += `&appSessionID=${encodeURIComponent(profile.apiKey)}&validationCode=${encodeURIComponent(profile.validationCode)}`; + } else { + console.error('Missing appSessionID or validationCode for desktop app entitlements'); + return null; + } + } else { + // Browser app: use session cookies + fetchOptions.credentials = 'include'; + } + + const response = await fetch(url, fetchOptions); + + if (response.ok) { + const result = await response.json(); + if (result.isSuccess) { + cachedEntitlements = result; + return cachedEntitlements; + } + } + } catch (error) { + console.error('Failed to fetch entitlements:', error); + } + + return null; + } + let userEmail=""; class SecureEmail extends HTMLElement { constructor() { @@ -284,6 +344,50 @@ define(function (require, exports, module) { } } + /** + * Update popup content with entitlements data + */ + function _updatePopupWithEntitlements(entitlements) { + if (!$popup || !entitlements) { + return; + } + + // Update plan information + if (entitlements.plan) { + const $planName = $popup.find('.user-plan-name'); + $planName.text(entitlements.plan.name); + + // Update plan class based on paid subscriber status + $planName.removeClass('user-plan-free user-plan-paid'); + const planClass = entitlements.plan.paidSubscriber ? 'user-plan-paid' : 'user-plan-free'; + $planName.addClass(planClass); + } + + // Update quota section if available + if (entitlements.profileview && entitlements.profileview.quota) { + const $quotaSection = $popup.find('.quota-section'); + const quota = entitlements.profileview.quota; + + // Remove forced-hidden and show quota section + $quotaSection.removeClass('forced-hidden'); + + // Update quota content + $quotaSection.find('.titleText').text(quota.titleText); + $quotaSection.find('.usageText').text(quota.usageText); + $quotaSection.find('.progress-fill').css('width', quota.usedPercent + '%'); + } + + // Update HTML message if available + if (entitlements.profileview && entitlements.profileview.htmlMessage) { + const $htmlMessageSection = $popup.find('.html-message'); + $htmlMessageSection.removeClass('forced-hidden'); + $htmlMessageSection.html(entitlements.profileview.htmlMessage); + } + + // Reposition popup after content changes + positionPopup(); + } + /** * Shows the user profile popup when the user is logged in */ @@ -296,24 +400,36 @@ define(function (require, exports, module) { const profileData = KernalModeTrust.loginService.getProfile(); userEmail = profileData.email; userName = profileData.firstName + " " + profileData.lastName; + + // Default template data (fallback) - start with cached plan info if available const templateData = { initials: profileData.profileIcon.initials, avatarColor: profileData.profileIcon.color, - planClass: "user-plan-free", // "user-plan-paid" for paid plan + planClass: "user-plan-free", planName: "Free Plan", - quotaUsed: "7,000", - quotaTotal: "10,000", - quotaUnit: "tokens", - quotaPercent: 70, + titleText: "Ai Quota Used", + usageText: "100 / 200 credits", + usedPercent: 0, Strings: Strings }; - // Render template with data + // Check for cached entitlements synchronously for immediate basic plan info + if (cachedEntitlements && cachedEntitlements.plan) { + templateData.planClass = cachedEntitlements.plan.paidSubscriber ? "user-plan-paid" : "user-plan-free"; + templateData.planName = cachedEntitlements.plan.name; + } + + // Render template with data immediately const renderedTemplate = Mustache.render(profileTemplate, templateData); $popup = $(renderedTemplate); $("body").append($popup); isPopupVisible = true; + + // Apply cached entitlements immediately if available (including quota/messages) + if (cachedEntitlements) { + _updatePopupWithEntitlements(cachedEntitlements); + } positionPopup(); PopUpManager.addPopUp($popup, function() { @@ -347,6 +463,26 @@ define(function (require, exports, module) { // Load user details iframe for browser apps (after popup is created) _loadUserDetailsIframe(); + + // Refresh entitlements in background and update popup if still visible + _refreshEntitlementsInBackground(); + } + + /** + * Refresh entitlements in background and update popup if still visible + */ + async function _refreshEntitlementsInBackground() { + try { + // Fetch fresh entitlements from API + const freshEntitlements = await getEntitlements(true); // Force refresh to get latest data + + // Only update popup if it's still visible + if (isPopupVisible && $popup && freshEntitlements) { + _updatePopupWithEntitlements(freshEntitlements); + } + } catch (error) { + console.error('Failed to refresh entitlements in background:', error); + } } /** @@ -421,6 +557,9 @@ define(function (require, exports, module) { closePopup(); } _removeProfileIcon(); + + // Clear cached entitlements when user logs out + cachedEntitlements = null; } function setLoggedIn(initial, color) { @@ -429,9 +568,15 @@ define(function (require, exports, module) { closePopup(); } _updateProfileIcon(initial, color); + + // Preload entitlements when user logs in + getEntitlements().catch(error => { + console.error('Failed to preload entitlements on login:', error); + }); } exports.init = init; exports.setNotLoggedIn = setNotLoggedIn; exports.setLoggedIn = setLoggedIn; + exports.getEntitlements = getEntitlements; }); From b8144a02a05bd00e65be32692e5a3ce6c874c0d8 Mon Sep 17 00:00:00 2001 From: abose Date: Sun, 31 Aug 2025 19:22:31 +0530 Subject: [PATCH 3/6] chore: reaise event EVENT_ENTITLEMENTS_CHANGED --- src/services/login-browser.js | 4 ++++ src/services/login-desktop.js | 4 ++++ src/services/profile-menu.js | 18 +++++++++++++++++- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/services/login-browser.js b/src/services/login-browser.js index 5885c05e3d..74ad78ab79 100644 --- a/src/services/login-browser.js +++ b/src/services/login-browser.js @@ -77,6 +77,10 @@ define(function (require, exports, module) { EventDispatcher.makeEventDispatcher(exports); EventDispatcher.makeEventDispatcher(secureExports); + // Event constants + const EVENT_ENTITLEMENTS_CHANGED = "entitlements_changed"; + secureExports.EVENT_ENTITLEMENTS_CHANGED = EVENT_ENTITLEMENTS_CHANGED; + const _EVT_PAGE_FOCUSED = "page_focused"; $(window).focus(function () { exports.trigger(_EVT_PAGE_FOCUSED); diff --git a/src/services/login-desktop.js b/src/services/login-desktop.js index 5c6e39d6cf..130b21d0c1 100644 --- a/src/services/login-desktop.js +++ b/src/services/login-desktop.js @@ -53,6 +53,10 @@ define(function (require, exports, module) { EventDispatcher.makeEventDispatcher(exports); EventDispatcher.makeEventDispatcher(secureExports); + // Event constants + const EVENT_ENTITLEMENTS_CHANGED = "entitlements_changed"; + secureExports.EVENT_ENTITLEMENTS_CHANGED = EVENT_ENTITLEMENTS_CHANGED; + const _EVT_PAGE_FOCUSED = "page_focused"; $(window).focus(function () { exports.trigger(_EVT_PAGE_FOCUSED); diff --git a/src/services/profile-menu.js b/src/services/profile-menu.js index dd2a69c2f9..baa1f5a633 100644 --- a/src/services/profile-menu.js +++ b/src/services/profile-menu.js @@ -232,7 +232,16 @@ define(function (require, exports, module) { if (response.ok) { const result = await response.json(); if (result.isSuccess) { + // Check if entitlements actually changed + const entitlementsChanged = JSON.stringify(cachedEntitlements) !== JSON.stringify(result); + cachedEntitlements = result; + + // Trigger event if entitlements changed + if (entitlementsChanged && KernalModeTrust.loginService.trigger) { + KernalModeTrust.loginService.trigger(KernalModeTrust.loginService.EVENT_ENTITLEMENTS_CHANGED, result); + } + return cachedEntitlements; } } @@ -559,7 +568,14 @@ define(function (require, exports, module) { _removeProfileIcon(); // Clear cached entitlements when user logs out - cachedEntitlements = null; + if (cachedEntitlements) { + cachedEntitlements = null; + + // Trigger event when entitlements are cleared + if (KernalModeTrust.loginService.trigger) { + KernalModeTrust.loginService.trigger(KernalModeTrust.loginService.EVENT_ENTITLEMENTS_CHANGED, null); + } + } } function setLoggedIn(initial, color) { From 03878c87796c2fb9e78ac515ea58f773fa056fb7 Mon Sep 17 00:00:00 2001 From: abose Date: Sun, 31 Aug 2025 19:37:41 +0530 Subject: [PATCH 4/6] refactor: getEntitlements into login-service.js --- src/services/login-browser.js | 8 +-- src/services/login-desktop.js | 8 +-- src/services/login-service.js | 125 ++++++++++++++++++++++++++++++++++ src/services/profile-menu.js | 105 +++++----------------------- 4 files changed, 147 insertions(+), 99 deletions(-) create mode 100644 src/services/login-service.js diff --git a/src/services/login-browser.js b/src/services/login-browser.js index 74ad78ab79..be0c15fab0 100644 --- a/src/services/login-browser.js +++ b/src/services/login-browser.js @@ -51,6 +51,7 @@ define(function (require, exports, module) { Strings = require("strings"), StringUtils = require("utils/StringUtils"), ProfileMenu = require("./profile-menu"), + LoginService = require("./login-service"), Mustache = require("thirdparty/mustache/mustache"), browserLoginWaitingTemplate = require("text!./html/browser-login-waiting-dialog.html"); @@ -77,10 +78,6 @@ define(function (require, exports, module) { EventDispatcher.makeEventDispatcher(exports); EventDispatcher.makeEventDispatcher(secureExports); - // Event constants - const EVENT_ENTITLEMENTS_CHANGED = "entitlements_changed"; - secureExports.EVENT_ENTITLEMENTS_CHANGED = EVENT_ENTITLEMENTS_CHANGED; - const _EVT_PAGE_FOCUSED = "page_focused"; $(window).focus(function () { exports.trigger(_EVT_PAGE_FOCUSED); @@ -422,7 +419,8 @@ define(function (require, exports, module) { secureExports.getProfile = getProfile; secureExports.verifyLoginStatus = () => _verifyBrowserLogin(false); secureExports.getAccountBaseURL = _getAccountBaseURL; - secureExports.getEntitlements = ProfileMenu.getEntitlements; + secureExports.getEntitlements = LoginService.getEntitlements; + secureExports.EVENT_ENTITLEMENTS_CHANGED = LoginService.EVENT_ENTITLEMENTS_CHANGED; } // public exports diff --git a/src/services/login-desktop.js b/src/services/login-desktop.js index 130b21d0c1..163f0e25dc 100644 --- a/src/services/login-desktop.js +++ b/src/services/login-desktop.js @@ -27,6 +27,7 @@ define(function (require, exports, module) { Strings = require("strings"), NativeApp = require("utils/NativeApp"), ProfileMenu = require("./profile-menu"), + LoginService = require("./login-service"), Mustache = require("thirdparty/mustache/mustache"), NodeConnector = require("NodeConnector"), otpDialogTemplate = require("text!./html/otp-dialog.html"); @@ -53,10 +54,6 @@ define(function (require, exports, module) { EventDispatcher.makeEventDispatcher(exports); EventDispatcher.makeEventDispatcher(secureExports); - // Event constants - const EVENT_ENTITLEMENTS_CHANGED = "entitlements_changed"; - secureExports.EVENT_ENTITLEMENTS_CHANGED = EVENT_ENTITLEMENTS_CHANGED; - const _EVT_PAGE_FOCUSED = "page_focused"; $(window).focus(function () { exports.trigger(_EVT_PAGE_FOCUSED); @@ -421,7 +418,8 @@ define(function (require, exports, module) { secureExports.getProfile = getProfile; secureExports.verifyLoginStatus = () => _verifyLogin(false); secureExports.getAccountBaseURL = getAccountBaseURL; - secureExports.getEntitlements = ProfileMenu.getEntitlements; + secureExports.getEntitlements = LoginService.getEntitlements; + secureExports.EVENT_ENTITLEMENTS_CHANGED = LoginService.EVENT_ENTITLEMENTS_CHANGED; } // public exports diff --git a/src/services/login-service.js b/src/services/login-service.js new file mode 100644 index 0000000000..96a1cf765a --- /dev/null +++ b/src/services/login-service.js @@ -0,0 +1,125 @@ +/* + * GNU AGPL-3.0 License + * + * Copyright (c) 2021 - present core.ai . All rights reserved. + * + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU Affero General Public License as published by the Free + * Software Foundation, either version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see https://opensource.org/licenses/AGPL-3.0. + * + */ + +/** + * Shared Login Service + * + * This module contains shared login service functionality used by both + * browser and desktop login implementations, including entitlements management. + */ + +define(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 service should have access to KernalModeTrust. Cannot boot without trust ring"); + } + + // Event constants + const EVENT_ENTITLEMENTS_CHANGED = "entitlements_changed"; + + // Cached entitlements data + let cachedEntitlements = null; + + /** + * Get entitlements from API or cache + * Returns null if user is not logged in + */ + async function getEntitlements(forceRefresh = false) { + // Return null if not logged in + if (!KernalModeTrust.loginService.isLoggedIn()) { + return null; + } + + // Return cached data if available and not forcing refresh + if (cachedEntitlements && !forceRefresh) { + return cachedEntitlements; + } + + try { + const accountBaseURL = KernalModeTrust.loginService.getAccountBaseURL(); + const language = Phoenix.app && Phoenix.app.language ? Phoenix.app.language : 'en'; + let url = `${accountBaseURL}/getAppEntitlements?lang=${language}`; + let fetchOptions = { + method: 'GET', + headers: { + 'Accept': 'application/json' + } + }; + + // Handle different authentication methods for browser vs desktop + if (Phoenix.isNativeApp) { + // Desktop app: use appSessionID and validationCode + const profile = KernalModeTrust.loginService.getProfile(); + if (profile && profile.apiKey && profile.validationCode) { + url += `&appSessionID=${encodeURIComponent(profile.apiKey)}&validationCode=${encodeURIComponent(profile.validationCode)}`; + } else { + console.error('Missing appSessionID or validationCode for desktop app entitlements'); + return null; + } + } else { + // Browser app: use session cookies + fetchOptions.credentials = 'include'; + } + + const response = await fetch(url, fetchOptions); + + if (response.ok) { + const result = await response.json(); + if (result.isSuccess) { + // Check if entitlements actually changed + const entitlementsChanged = JSON.stringify(cachedEntitlements) !== JSON.stringify(result); + + cachedEntitlements = result; + + // Trigger event if entitlements changed + if (entitlementsChanged) { + KernalModeTrust.loginService.trigger(EVENT_ENTITLEMENTS_CHANGED, result); + } + + return cachedEntitlements; + } + } + } catch (error) { + console.error('Failed to fetch entitlements:', error); + } + + return null; + } + + /** + * Clear cached entitlements and trigger change event + * Called when user logs out + */ + function clearEntitlements() { + if (cachedEntitlements) { + cachedEntitlements = null; + + // Trigger event when entitlements are cleared + if (KernalModeTrust.loginService.trigger) { + KernalModeTrust.loginService.trigger(EVENT_ENTITLEMENTS_CHANGED, null); + } + } + } + + // Exports + exports.EVENT_ENTITLEMENTS_CHANGED = EVENT_ENTITLEMENTS_CHANGED; + exports.getEntitlements = getEntitlements; + exports.clearEntitlements = clearEntitlements; +}); diff --git a/src/services/profile-menu.js b/src/services/profile-menu.js index baa1f5a633..ea1006fb4b 100644 --- a/src/services/profile-menu.js +++ b/src/services/profile-menu.js @@ -2,7 +2,8 @@ define(function (require, exports, module) { const Mustache = require("thirdparty/mustache/mustache"), PopUpManager = require("widgets/PopUpManager"), ThemeManager = require("view/ThemeManager"), - Strings = require("strings"); + Strings = require("strings"), + LoginService = require("./login-service"); const KernalModeTrust = window.KernalModeTrust; if(!KernalModeTrust){ @@ -183,74 +184,6 @@ define(function (require, exports, module) { _setupDocumentClickHandler(); } - // Cached entitlements data - let cachedEntitlements = null; - - /** - * Get entitlements from API or cache - * Returns null if user is not logged in - */ - async function getEntitlements(forceRefresh = false) { - // Return null if not logged in - if (!KernalModeTrust.loginService.isLoggedIn()) { - return null; - } - - // Return cached data if available and not forcing refresh - if (cachedEntitlements && !forceRefresh) { - return cachedEntitlements; - } - - try { - const accountBaseURL = KernalModeTrust.loginService.getAccountBaseURL(); - const language = Phoenix.app && Phoenix.app.language ? Phoenix.app.language : 'en'; - let url = `${accountBaseURL}/getAppEntitlements?lang=${language}`; - let fetchOptions = { - method: 'GET', - headers: { - 'Accept': 'application/json' - } - }; - - // Handle different authentication methods for browser vs desktop - if (Phoenix.isNativeApp) { - // Desktop app: use appSessionID and validationCode - const profile = KernalModeTrust.loginService.getProfile(); - if (profile && profile.apiKey && profile.validationCode) { - url += `&appSessionID=${encodeURIComponent(profile.apiKey)}&validationCode=${encodeURIComponent(profile.validationCode)}`; - } else { - console.error('Missing appSessionID or validationCode for desktop app entitlements'); - return null; - } - } else { - // Browser app: use session cookies - fetchOptions.credentials = 'include'; - } - - const response = await fetch(url, fetchOptions); - - if (response.ok) { - const result = await response.json(); - if (result.isSuccess) { - // Check if entitlements actually changed - const entitlementsChanged = JSON.stringify(cachedEntitlements) !== JSON.stringify(result); - - cachedEntitlements = result; - - // Trigger event if entitlements changed - if (entitlementsChanged && KernalModeTrust.loginService.trigger) { - KernalModeTrust.loginService.trigger(KernalModeTrust.loginService.EVENT_ENTITLEMENTS_CHANGED, result); - } - - return cachedEntitlements; - } - } - } catch (error) { - console.error('Failed to fetch entitlements:', error); - } - - return null; - } let userEmail=""; class SecureEmail extends HTMLElement { @@ -422,11 +355,8 @@ define(function (require, exports, module) { Strings: Strings }; - // Check for cached entitlements synchronously for immediate basic plan info - if (cachedEntitlements && cachedEntitlements.plan) { - templateData.planClass = cachedEntitlements.plan.paidSubscriber ? "user-plan-paid" : "user-plan-free"; - templateData.planName = cachedEntitlements.plan.name; - } + // Note: We don't await here to keep popup display instant + // Cached entitlements will be applied asynchronously after popup is shown // Render template with data immediately const renderedTemplate = Mustache.render(profileTemplate, templateData); @@ -435,11 +365,16 @@ define(function (require, exports, module) { $("body").append($popup); isPopupVisible = true; - // Apply cached entitlements immediately if available (including quota/messages) - if (cachedEntitlements) { - _updatePopupWithEntitlements(cachedEntitlements); - } positionPopup(); + + // Apply cached entitlements immediately if available (including quota/messages) + KernalModeTrust.loginService.getEntitlements(false).then(cachedEntitlements => { + if (cachedEntitlements && isPopupVisible) { + _updatePopupWithEntitlements(cachedEntitlements); + } + }).catch(error => { + console.error('Failed to apply cached entitlements to popup:', error); + }); PopUpManager.addPopUp($popup, function() { $popup.remove(); @@ -483,7 +418,7 @@ define(function (require, exports, module) { async function _refreshEntitlementsInBackground() { try { // Fetch fresh entitlements from API - const freshEntitlements = await getEntitlements(true); // Force refresh to get latest data + const freshEntitlements = await KernalModeTrust.loginService.getEntitlements(true); // Force refresh to get latest data // Only update popup if it's still visible if (isPopupVisible && $popup && freshEntitlements) { @@ -568,14 +503,7 @@ define(function (require, exports, module) { _removeProfileIcon(); // Clear cached entitlements when user logs out - if (cachedEntitlements) { - cachedEntitlements = null; - - // Trigger event when entitlements are cleared - if (KernalModeTrust.loginService.trigger) { - KernalModeTrust.loginService.trigger(KernalModeTrust.loginService.EVENT_ENTITLEMENTS_CHANGED, null); - } - } + LoginService.clearEntitlements(); } function setLoggedIn(initial, color) { @@ -586,7 +514,7 @@ define(function (require, exports, module) { _updateProfileIcon(initial, color); // Preload entitlements when user logs in - getEntitlements().catch(error => { + KernalModeTrust.loginService.getEntitlements().catch(error => { console.error('Failed to preload entitlements on login:', error); }); } @@ -594,5 +522,4 @@ define(function (require, exports, module) { exports.init = init; exports.setNotLoggedIn = setNotLoggedIn; exports.setLoggedIn = setLoggedIn; - exports.getEntitlements = getEntitlements; }); From 82f64cb00c679ff9521215d29a4243c27cd1b6f6 Mon Sep 17 00:00:00 2001 From: abose Date: Mon, 1 Sep 2025 10:32:52 +0530 Subject: [PATCH 5/6] chore: phoenix pro branding changes --- .../new-project/assets/css/responsive.css | 10 ++-- .../new-project/assets/js/code-editor.js | 31 ++++++++++++ src/assets/new-project/code-editor.html | 19 ++++++- src/index.html | 1 + src/services/profile-menu.js | 50 +++++++++++++++++-- src/styles/brackets.less | 9 ++++ src/styles/brackets_core_ui_variables.less | 9 ++++ test/SpecRunner.html | 1 + 8 files changed, 120 insertions(+), 10 deletions(-) diff --git a/src/assets/new-project/assets/css/responsive.css b/src/assets/new-project/assets/css/responsive.css index 588b056742..8edbc0bb7c 100644 --- a/src/assets/new-project/assets/css/responsive.css +++ b/src/assets/new-project/assets/css/responsive.css @@ -36,7 +36,7 @@ width: 100%; } - .editor-name h4 { + .editor-name h4, .editor-name h4 span { font-size: 22px; } @@ -79,21 +79,21 @@ margin-left: 0px; width: 48%; } - + .project-content-right { width: 48%; } - + .website-detail input { width: 242px; height: 42px; } - + #noProjectIframe { width: 267px; } - + } @media (max-width: 650px) { diff --git a/src/assets/new-project/assets/js/code-editor.js b/src/assets/new-project/assets/js/code-editor.js index 64b82987bf..d8e82c4033 100644 --- a/src/assets/new-project/assets/js/code-editor.js +++ b/src/assets/new-project/assets/js/code-editor.js @@ -183,6 +183,36 @@ function _openURLInTauri(url) { } } +function _updateProBranding() { + try { + const $freeTitle = $('.phoenix-free-title'); + const $proTitle = $('.phoenix-pro-title'); + const $proTitleSpan = $('.pro-plan-name'); + + if (!$freeTitle.length || !$proTitle.length || !$proTitleSpan.length) { + console.warn('Pro branding elements not found'); + return; + } + + // Get plan info from window.top.Phoenix.pro.plan + const planInfo = window.top.Phoenix && window.top.Phoenix.pro && window.top.Phoenix.pro.plan; + + if (planInfo && planInfo.paidSubscriber) { + // Hide free title, show pro title + $freeTitle.addClass('forced-hidden'); + $proTitle.removeClass('forced-hidden'); + // Update plan name + $proTitleSpan.text(planInfo.name || 'Phoenix Pro'); + } else { + // Show free title, hide pro title + $freeTitle.removeClass('forced-hidden'); + $proTitle.addClass('forced-hidden'); + } + } catch (error) { + console.error('Error updating pro branding:', error); + } +} + function initCodeEditor() { document.getElementById("openFolderBtn").onclick = function() { Metrics.countEvent(Metrics.EVENT_TYPE.NEW_PROJECT, "main.Click", "open-folder"); @@ -252,4 +282,5 @@ function initCodeEditor() { _showFirstTimeExperience(); $("body").append($(``)); _attachSettingBtnEventListeners(); + _updateProBranding(); } diff --git a/src/assets/new-project/code-editor.html b/src/assets/new-project/code-editor.html index 643f6e9a99..6362e1adf2 100644 --- a/src/assets/new-project/code-editor.html +++ b/src/assets/new-project/code-editor.html @@ -15,6 +15,22 @@ +
@@ -24,7 +40,8 @@ image
-

{{APP_TITLE}}

+

{{APP_TITLE}}

+

Phoenix Pro

{{BUILD_THE_WEB}} diff --git a/src/index.html b/src/index.html index 3bfd308b3f..9e287c2feb 100644 --- a/src/index.html +++ b/src/index.html @@ -350,6 +350,7 @@ baseURL: _getBaseURL(), isTestWindow: _isTestWindow(), firstBoot: false, // will be set below + pro: {}, startTime: Date.now(), TRUSTED_ORIGINS: { // if modifying this list, make sure to update in https://github.com/phcode-dev/phcode.live/blob/main/docs/trustedOrigins.js diff --git a/src/services/profile-menu.js b/src/services/profile-menu.js index ea1006fb4b..7390539a11 100644 --- a/src/services/profile-menu.js +++ b/src/services/profile-menu.js @@ -184,6 +184,43 @@ define(function (require, exports, module) { _setupDocumentClickHandler(); } + /** + * Update main navigation branding based on entitlements + */ + function _updateBranding(entitlements) { + const $brandingLink = $("#phcode-io-main-nav"); + if (!entitlements) { + Phoenix.pro.plan = { + paidSubscriber: false, + name: "Community Edition", + isInTrial: false + }; + return; + } + + if (entitlements && entitlements.plan){ + Phoenix.pro.plan = { + paidSubscriber: entitlements.plan.paidSubscriber, + name: entitlements.plan.name, + isInTrial: entitlements.plan.isInTrial, + validTill: entitlements.plan.validTill + }; + } + if (entitlements && entitlements.plan && entitlements.plan.paidSubscriber) { + // Paid subscriber: show plan name with feather icon + const planName = entitlements.plan.name || "Phoenix Pro"; + $brandingLink + .attr("href", "https://account.phcode.dev") + .addClass("phoenix-pro") + .html(`${planName}`); + } else { + // Free user: show phcode.io branding + $brandingLink + .attr("href", "https://phcode.io") + .removeClass("phoenix-pro") + .text("phcode.io"); + } + } let userEmail=""; class SecureEmail extends HTMLElement { @@ -366,7 +403,7 @@ define(function (require, exports, module) { isPopupVisible = true; positionPopup(); - + // Apply cached entitlements immediately if available (including quota/messages) KernalModeTrust.loginService.getEntitlements(false).then(cachedEntitlements => { if (cachedEntitlements && isPopupVisible) { @@ -504,6 +541,9 @@ define(function (require, exports, module) { // Clear cached entitlements when user logs out LoginService.clearEntitlements(); + + // Reset branding to free mode + _updateBranding(null); } function setLoggedIn(initial, color) { @@ -514,9 +554,11 @@ define(function (require, exports, module) { _updateProfileIcon(initial, color); // Preload entitlements when user logs in - KernalModeTrust.loginService.getEntitlements().catch(error => { - console.error('Failed to preload entitlements on login:', error); - }); + KernalModeTrust.loginService.getEntitlements() + .then(_updateBranding) + .catch(error => { + console.error('Failed to preload entitlements on login:', error); + }); } exports.init = init; diff --git a/src/styles/brackets.less b/src/styles/brackets.less index f7100dee51..933ae3a304 100644 --- a/src/styles/brackets.less +++ b/src/styles/brackets.less @@ -82,6 +82,15 @@ html, body { color: @dark-bc-text-link; } +#phcode-io-main-nav.phoenix-pro{ + background: @phoenix-pro-gradient; + background-clip: text; + -webkit-background-clip: text; /* Chrome, Safari */ + color: transparent; /* works in Firefox */ + -webkit-text-fill-color: transparent; /* Chrome, Safari */ + display: inline-block; +} + #ctrl-nav-overlay { position: absolute; display: flex; /* Enable flexbox */ diff --git a/src/styles/brackets_core_ui_variables.less b/src/styles/brackets_core_ui_variables.less index 71fc73aa40..8221598fbd 100644 --- a/src/styles/brackets_core_ui_variables.less +++ b/src/styles/brackets_core_ui_variables.less @@ -279,3 +279,12 @@ // CSS Codehint icon @css-codehint-icon: #2ea56c; @dark-css-codehint-icon: #146a41; + +// phoenix pro +@phoenix-pro-gradient: linear-gradient( + 45deg, + #ff8c42, /* deep orange */ + #ffa500, /* bright orange */ + #ffcc70, /* golden yellow */ + #ffd700 /* rich gold */ +); diff --git a/test/SpecRunner.html b/test/SpecRunner.html index 21fc3bb5e8..feaaf3ecd2 100644 --- a/test/SpecRunner.html +++ b/test/SpecRunner.html @@ -270,6 +270,7 @@ isSpecRunnerWindow: window.location.pathname.endsWith("/SpecRunner.html"), firstBoot: false, // will be set below startTime: Date.now(), + pro: {}, TRUSTED_ORIGINS: { // if modifying this list, make sure to update in https://github.com/phcode-dev/phcode.live/blob/main/docs/trustedOrigins.js // extensions may add their trusted origin to this list at any time. From 72d621a1a34859f852ac0771623d770e15325f0b Mon Sep 17 00:00:00 2001 From: abose Date: Mon, 1 Sep 2025 10:56:35 +0530 Subject: [PATCH 6/6] chore: move back to account server instead of dev server accidentally checked in --- serve-proxy.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/serve-proxy.js b/serve-proxy.js index 4773be090f..01a870bc02 100644 --- a/serve-proxy.js +++ b/serve-proxy.js @@ -8,8 +8,8 @@ const fs = require('fs'); const httpProxy = require('http-proxy'); // Account server configuration - switch between local and production -//const ACCOUNT_SERVER = 'https://account.phcode.dev'; // Production -const ACCOUNT_SERVER = 'http://localhost:5000'; // Local development +const ACCOUNT_SERVER = 'https://account.phcode.dev'; // Production +// const ACCOUNT_SERVER = 'http://localhost:5000'; // Local development // Default configuration let config = {