Merge pull request #15896 from jeclrsg/hpcc-26584-cannot-unlock-session

HPCC-26584 Unable to unlock a locked session

Reviewed-By: Gordon Smith <gordon.smith@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

esp/src/eclwatch/HPCCPlatformWidget.js

@@ -197,7 +197,9 @@ define([
                 if (lang.exists("MyAccountResponse.username", response)) {
                     context.userName = response.MyAccountResponse.username;
                     dojoConfig.username = response.MyAccountResponse.username;
-                    cookie("User", response.MyAccountResponse.username);
+                    if (response.MyAccountResponse.username) {
+                        cookie("User", response.MyAccountResponse.username);
+                    }
                     context.checkIfAdmin(context.userName);
                     context.refreshUserName();
                     if (!cookie("PasswordExpiredCheck")) {

esp/src/eclwatch/LockDialogWidget.js

@@ -57,6 +57,14 @@ define([
 
         show: function (event) {
             var context = this;
+            if (!cookie("User")) {
+                cookie("Status", "Unlocked");
+                context.storage.setItem("Status", "Unlocked");
+                topic.publish("hpcc/session_management_status", {
+                    status: "Unlocked"
+                });
+                return;
+            }
             on(this.unlockPassword, "keypress", function (event) {
                 if (event.key === "Enter") {
                     context._onUnlock();
@@ -106,7 +114,6 @@ define([
                             status: "Unlocked"
                         });
                         cookie("Status", "Unlocked");
-                        context.storage.removeItem("Status");
                         context.storage.setItem("Status", "Unlocked");
                         if (context.idleFired) {
                             dojo.publish("hpcc/brToaster", {
@@ -144,7 +151,6 @@ define([
                     status: "Locked"
                 });
                 cookie("Status", "Locked");
-                context.storage.removeItem("Status");
                 context.storage.setItem("Status", "Locked");
             } else if (cookie("Status") === "Unlocked") {
                 xhr("esp/lock", {
@@ -158,7 +164,6 @@ define([
                             status: "Locked"
                         });
                         cookie("Status", "Locked");
-                        context.storage.removeItem("Status");
                         context.storage.setItem("Status", "Locked");
                     }
                 });