fix: desktop device license tests without logging in

Author: abose

src/services/login-service.js

@@ -657,13 +657,18 @@ define(function (require, exports, module) {
         return NodeUtils.isLicensedDeviceSystemWide();
     }
 
+    let _isLicensedDeviceFlagForTest = false;
+
     /**
      * Checks if app is configured to check for device licenses at app start at system or user level.
      *
      * @returns {Promise<boolean>} - Resolves with `true` if the device is licensed, `false` otherwise.
      */
     async function isLicensedDevice() {
-        if(Phoenix.isTestWindow || !Phoenix.isNativeApp) {
+        if(Phoenix.isTestWindow) {
+            return _isLicensedDeviceFlagForTest;
+        }
+        if(!Phoenix.isNativeApp) {
             // browser app doesn't support device licence keys, obviously.
             return false;
         }
@@ -696,10 +701,13 @@ define(function (require, exports, module) {
     if (Phoenix.isTestWindow) {
         window._test_login_service_exports = {
             LoginService,
-            setFetchFn: function _setFetchFn(fn) {
+            setIsLicensedDevice: function (isLicensedDevice) {
+                _isLicensedDeviceFlagForTest = isLicensedDevice;
+            },
+            setFetchFn: function (fn) {
                 fetchFn = fn;
             },
-            setDateNowFn: function _setDdateNowFn(fn) {
+            setDateNowFn: function (fn) {
                 dateNowFn = fn;
             },
             _validateAndFilterEntitlements: _validateAndFilterEntitlements

test/spec/login-desktop-integ-test.js

@@ -187,7 +187,11 @@ define(function (require, exports, module) {
                 } else if (url.includes('/getAppEntitlements')) {
                     // Entitlements endpoint - return user's plan and entitlements
                     console.log("llgT: Handling getAppEntitlements call");
-                    if (userSignedOut) {
+
+                    // Check if this is a device ID request (non-logged-in user with device license)
+                    const isDeviceIDRequest = url.includes('deviceID=');
+
+                    if (userSignedOut && !isDeviceIDRequest) {
                         return Promise.resolve({
                             ok: false,
                             status: 401,
@@ -207,7 +211,7 @@ define(function (require, exports, module) {
                             entitlementsResponse.plan = {
                                 paidSubscriber: true,
                                 name: "Phoenix Pro",
-                                fullName: "Phoenix Pro",
+                                fullName: isDeviceIDRequest ? "Phoenix Pro Test Edu" : "Phoenix Pro",
                                 validTill: validTill
                             };
                             entitlementsResponse.entitlements = {

test/spec/login-shared.js

@@ -710,6 +710,96 @@ define(function (require, exports, module) {
                 await cleanupTrialState();
             }
         });
+
+        if (Phoenix.isNativeApp) {
+            it("should show device-licensed Pro branding and popup when not logged in", async function () {
+                console.log("llgT: Starting device license Pro branding test");
+
+                try {
+                    // Setup: Enable device license flag
+                    LoginServiceExports.setIsLicensedDevice(true);
+
+                    // Setup mock that handles device ID requests (returns Pro entitlements)
+                    setupProUserMock(true, false);
+
+                    // Ensure no trial is active
+                    await cleanupTrialState();
+
+                    // Ensure user is logged out
+                    if (LoginServiceExports.LoginService.isLoggedIn()) {
+                        await performFullLogoutFlow();
+                    }
+
+                    // Clear and refresh entitlements to trigger device license check
+                    await LoginServiceExports.LoginService.clearEntitlements();
+                    await LoginServiceExports.LoginService.getEffectiveEntitlements(true);
+
+                    // Wait for branding to update in the navbar
+                    await awaitsFor(
+                        function () {
+                            const $branding = testWindow.$("#phcode-io-main-nav");
+                            return $branding.hasClass("phoenix-pro");
+                        },
+                        "navbar branding to show Phoenix Pro",
+                        3000
+                    );
+
+                    // Verify navbar shows Pro branding (uses plan.name)
+                    await verifyProBranding(true, "device license shows Phoenix Pro branding in navbar");
+
+                    // Verify entitlements API shows Pro access
+                    await verifyPlanEntitlements(
+                        { paidSubscriber: true, name: "Phoenix Pro" },
+                        "device license provides Pro plan"
+                    );
+                    await verifyIsInProTrialEntitlement(false, "device license is not a trial");
+                    await verifyLiveEditEntitlement({ activated: true }, "live edit activated via device license");
+
+                    // Verify raw entitlements are present (not null)
+                    const rawEntitlements = await EntitlementsExports.getRawEntitlements();
+                    expect(rawEntitlements).toBeDefined();
+                    expect(rawEntitlements).not.toBeNull();
+                    expect(rawEntitlements.plan.paidSubscriber).toBe(true);
+
+                    // Verify login popup shows Pro branding with fullName
+                    const $profileButton = testWindow.$("#user-profile-button");
+                    $profileButton.trigger('click');
+                    await popupToAppear(SIGNIN_POPUP);
+
+                    // Wait for Pro branding to appear in popup (async entitlements load)
+                    await awaitsFor(
+                        function () {
+                            const $popup = testWindow.$('.profile-popup');
+                            const $proInfo = $popup.find('.trial-plan-info');
+                            return $proInfo.length > 0;
+                        },
+                        "Pro branding to appear in login popup",
+                        3000
+                    );
+
+                    // Check for Pro branding in popup (uses plan.fullName)
+                    const $popup = testWindow.$('.profile-popup');
+                    const $proInfo = $popup.find('.trial-plan-info');
+                    expect($proInfo.length).toBe(1);
+
+                    const proText = $proInfo.text();
+                    expect(proText).toContain("Phoenix Pro Test Edu");
+
+                    // Verify feather icon is present
+                    const $featherIcon = $proInfo.find('.fa-feather');
+                    expect($featherIcon.length).toBe(1);
+
+                    // Close popup
+                    $profileButton.trigger('click');
+
+                    console.log("llgT: Device license Pro branding test completed successfully");
+                } finally {
+                    // Cleanup: Reset device license flag
+                    LoginServiceExports.setIsLicensedDevice(false);
+                    await LoginServiceExports.LoginService.clearEntitlements();
+                }
+            });
+        }
     }
 
     exports.setup = setup;