Skip to content

fix: login/entitlement issues and integ tests #2404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abose merged 4 commits into from
Sep 17, 2025
Merged

fix: login/entitlement issues and integ tests #2404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4f43659
fix: browser logout cleanup wasnt proper and integ tests that caught it
abose Sep 17, 2025
8485ec8
test: browser login integ tests with entitlements more coverage
abose Sep 17, 2025
2517884
fix: login browser integ tests erratically fails due to datefn overri…
abose Sep 17, 2025
ce35be6
test: login-desktop-integ-test.js port of the saem browser login tests
abose Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/services/html/login-popup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<div class="profile-popup">
<div class="profile-popup login-profile-popup">
<div class="popup-header">
<h1 class="popup-title">{{Strings.PROFILE_POP_TITLE}}</h1>
{{#trialInfo}}
<div class="trial-plan-info">
<span class="phoenix-pro-title-plain">
<span class="pro-plan-name">{{planName}}</span>
<span class="pro-plan-name user-plan-name">{{planName}}</span>
<i class="fa-solid fa-feather" style="margin-left: 3px;"></i>
</span>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/services/html/profile-popup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="profile-popup">
<div class="profile-popup user-profile-popup">
<div class="popup-header">
<div class="user-profile-header">
<div class="user-avatar" style="background-color: {{avatarColor}};">
Expand Down
2 changes: 2 additions & 0 deletions src/services/login-browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@ define(function (require, exports, module) {

// Always reset local state regardless of server response
await _resetBrowserLogin();
await _verifyBrowserLogin();

if (response.ok) {
const result = await response.json();
Expand Down Expand Up @@ -373,6 +374,7 @@ define(function (require, exports, module) {
} catch (error) {
// Always reset local state even on network error
await _resetBrowserLogin();
await _verifyBrowserLogin();
console.error("Network error during logout:", error);
const dialog = Dialogs.showModalDialog(
DefaultDialogs.DIALOG_ID_ERROR,
Expand Down
1 change: 1 addition & 0 deletions src/services/login-desktop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,7 @@ define(function (require, exports, module) {
return;
}
await _resetAccountLogin();
await _verifyLogin();
Dialogs.showModalDialog(
DefaultDialogs.DIALOG_ID_INFO,
Strings.SIGNED_OUT,
Expand Down
7 changes: 4 additions & 3 deletions src/services/profile-menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ define(function (require, exports, module) {
effectiveEntitlements.trialDaysRemaining);
const trialInfoHtml = `<div class="trial-plan-info">
<span class="phoenix-pro-title-plain">
<span class="pro-plan-name">${planName}</span>
<span class="pro-plan-name user-plan-name">${planName}</span>
<i class="fa-solid fa-feather" style="margin-left: 3px;"></i>
</span>
</div>`;
Expand Down Expand Up @@ -371,15 +371,15 @@ define(function (require, exports, module) {
const planName = StringUtils.format(Strings.PROMO_PRO_TRIAL_DAYS_LEFT,
entitlements.trialDaysRemaining);
const proTitle = `<span class="phoenix-pro-title-plain">
<span class="pro-plan-name">${planName}</span>
<span class="pro-plan-name user-plan-name">${planName}</span>
<i class="fa-solid fa-feather" style="margin-left: 3px;"></i>
</span>`;
$planName.addClass('user-plan-paid').html(proTitle);
$getProLink.removeClass('forced-hidden');
} else {
// For paid users: regular plan name with icon
const proTitle = `<span class="phoenix-pro-title">
<span class="pro-plan-name">${entitlements.plan.name}</span>
<span class="pro-plan-name user-plan-name">${entitlements.plan.name}</span>
<i class="fa-solid fa-feather" style="margin-left: 3px;"></i>
</span>`;
$planName.addClass('user-plan-paid').html(proTitle);
Expand Down Expand Up @@ -591,6 +591,7 @@ define(function (require, exports, module) {
_updateBranding(effectiveEntitlements);
} else {
console.log('Profile Menu: No active trial found');
_updateBranding(null);
}
} catch (error) {
console.error('Failed to initialize branding for trial users:', error);
Expand Down
Loading
Loading