From a8247d7e309caadf93314be985948678c6f27da6 Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Thu, 30 Nov 2023 16:58:02 +0000 Subject: [PATCH 1/2] Split off 8.10.68 Signed-off-by: Jake Smith --- helm/hpcc/Chart.yaml | 4 ++-- helm/hpcc/templates/_helpers.tpl | 2 +- helm/hpcc/templates/dafilesrv.yaml | 2 +- helm/hpcc/templates/dali.yaml | 2 +- helm/hpcc/templates/dfuserver.yaml | 2 +- helm/hpcc/templates/eclagent.yaml | 4 ++-- helm/hpcc/templates/eclccserver.yaml | 4 ++-- helm/hpcc/templates/eclscheduler.yaml | 2 +- helm/hpcc/templates/esp.yaml | 2 +- helm/hpcc/templates/localroxie.yaml | 2 +- helm/hpcc/templates/roxie.yaml | 8 ++++---- helm/hpcc/templates/sasha.yaml | 2 +- helm/hpcc/templates/thor.yaml | 10 +++++----- version.cmake | 2 +- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/helm/hpcc/Chart.yaml b/helm/hpcc/Chart.yaml index 6778d9b6194..dcd7a9828c4 100644 --- a/helm/hpcc/Chart.yaml +++ b/helm/hpcc/Chart.yaml @@ -6,9 +6,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 8.10.67-closedown0 +version: 8.10.69-closedown0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 8.10.67-closedown0 +appVersion: 8.10.69-closedown0 diff --git a/helm/hpcc/templates/_helpers.tpl b/helm/hpcc/templates/_helpers.tpl index df2b93e61d5..b38dacc8838 100644 --- a/helm/hpcc/templates/_helpers.tpl +++ b/helm/hpcc/templates/_helpers.tpl @@ -1208,7 +1208,7 @@ kind: Service metadata: name: {{ $lvars.serviceName | quote }} labels: - helmVersion: 8.10.67-closedown0 + helmVersion: 8.10.69-closedown0 {{- include "hpcc.addStandardLabels" (dict "root" $.root "instance" $lvars.serviceName ) | indent 4 }} {{- if $lvars.labels }} {{ toYaml $lvars.labels | indent 4 }} diff --git a/helm/hpcc/templates/dafilesrv.yaml b/helm/hpcc/templates/dafilesrv.yaml index 1a716392fb3..8125ec1e7b5 100644 --- a/helm/hpcc/templates/dafilesrv.yaml +++ b/helm/hpcc/templates/dafilesrv.yaml @@ -50,7 +50,7 @@ spec: labels: {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "dafilesrv" "name" "dafilesrv" "instance" .name) | indent 8 }} server: {{ .name | quote }} - helmVersion: 8.10.67-closedown0 + helmVersion: 8.10.69-closedown0 annotations: checksum/config: {{ $configSHA }} spec: diff --git a/helm/hpcc/templates/dali.yaml b/helm/hpcc/templates/dali.yaml index d351bb6c9c3..9e124d668c7 100644 --- a/helm/hpcc/templates/dali.yaml +++ b/helm/hpcc/templates/dali.yaml @@ -81,7 +81,7 @@ spec: run: {{ $dali.name | quote }} server: {{ $dali.name | quote }} app: dali - helmVersion: 8.10.67-closedown0 + helmVersion: 8.10.69-closedown0 {{- if hasKey $.Values.global "metrics" }} {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8 }} {{- end }} diff --git a/helm/hpcc/templates/dfuserver.yaml b/helm/hpcc/templates/dfuserver.yaml index e1fe83eee0f..7790128367e 100644 --- a/helm/hpcc/templates/dfuserver.yaml +++ b/helm/hpcc/templates/dfuserver.yaml @@ -56,7 +56,7 @@ spec: {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "dfuserver" "name" "dfuserver" "instance" .name) | indent 8 }} run: {{ .name | quote }} accessDali: "yes" - helmVersion: 8.10.67-closedown0 + helmVersion: 8.10.69-closedown0 {{- if hasKey . "labels" }} {{ toYaml .labels | indent 8 }} {{- end }} diff --git a/helm/hpcc/templates/eclagent.yaml b/helm/hpcc/templates/eclagent.yaml index 97d528ff667..04314223e0d 100644 --- a/helm/hpcc/templates/eclagent.yaml +++ b/helm/hpcc/templates/eclagent.yaml @@ -58,7 +58,7 @@ data: {{- include "hpcc.addStandardLabels" (dict "root" $ "component" $apptype "name" "eclagent" "instance" $appJobName "instanceOf" (printf "%s-job" .me.name)) | indent 12 }} accessDali: "yes" accessEsp: "yes" - helmVersion: 8.10.67-closedown0 + helmVersion: 8.10.69-closedown0 {{- if hasKey .me "labels" }} {{ toYaml .me.labels | indent 12 }} {{- end }} @@ -137,7 +137,7 @@ spec: run: {{ .name | quote }} accessDali: "yes" accessEsp: {{ .useChildProcesses | default false | ternary "yes" "no" | quote }} - helmVersion: 8.10.67-closedown0 + helmVersion: 8.10.69-closedown0 {{- if hasKey . "labels" }} {{ toYaml .labels | indent 8 }} {{- end }} diff --git a/helm/hpcc/templates/eclccserver.yaml b/helm/hpcc/templates/eclccserver.yaml index 3640b3dd055..0c9e77d888a 100644 --- a/helm/hpcc/templates/eclccserver.yaml +++ b/helm/hpcc/templates/eclccserver.yaml @@ -57,7 +57,7 @@ data: {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclccserver" "name" "eclccserver" "instance" $compileJobName "instanceOf" (printf "%s-job" .me.name)) | indent 12 }} accessDali: "yes" accessEsp: "yes" - helmVersion: 8.10.67-closedown0 + helmVersion: 8.10.69-closedown0 {{- if hasKey .me "labels" }} {{ toYaml .me.labels | indent 12 }} {{- end }} @@ -142,7 +142,7 @@ spec: run: {{ .name | quote }} accessDali: "yes" accessEsp: {{ .useChildProcesses | default false | ternary "yes" "no" | quote }} - helmVersion: 8.10.67-closedown0 + helmVersion: 8.10.69-closedown0 {{- if hasKey . "labels" }} {{ toYaml .labels | indent 8 }} {{- end }} diff --git a/helm/hpcc/templates/eclscheduler.yaml b/helm/hpcc/templates/eclscheduler.yaml index fef0cd9a0f8..7874eee1855 100644 --- a/helm/hpcc/templates/eclscheduler.yaml +++ b/helm/hpcc/templates/eclscheduler.yaml @@ -64,7 +64,7 @@ spec: run: {{ .name | quote }} accessDali: "yes" accessEsp: "no" - helmVersion: 8.10.67-closedown0 + helmVersion: 8.10.69-closedown0 {{- if hasKey . "labels" }} {{ toYaml .labels | indent 8 }} {{- end }} diff --git a/helm/hpcc/templates/esp.yaml b/helm/hpcc/templates/esp.yaml index 52c7d16ae88..c25c1d17bd5 100644 --- a/helm/hpcc/templates/esp.yaml +++ b/helm/hpcc/templates/esp.yaml @@ -116,7 +116,7 @@ spec: server: {{ .name | quote }} accessDali: "yes" app: {{ $application }} - helmVersion: 8.10.67-closedown0 + helmVersion: 8.10.69-closedown0 {{- include "hpcc.addStandardLabels" (dict "root" $ "name" $application "component" "esp" "instance" .name) | indent 8 }} {{- if hasKey $.Values.global "metrics" }} {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8 }} diff --git a/helm/hpcc/templates/localroxie.yaml b/helm/hpcc/templates/localroxie.yaml index 4f9723720a1..ba881d88991 100644 --- a/helm/hpcc/templates/localroxie.yaml +++ b/helm/hpcc/templates/localroxie.yaml @@ -70,7 +70,7 @@ spec: server: {{ $servername | quote }} accessDali: "yes" accessEsp: "yes" - helmVersion: 8.10.67-closedown0 + helmVersion: 8.10.69-closedown0 {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-server" "name" "roxie" "instance" $roxie.name) | indent 8 }} {{- if hasKey . "labels" }} {{ toYaml .labels | indent 8 }} diff --git a/helm/hpcc/templates/roxie.yaml b/helm/hpcc/templates/roxie.yaml index a274643e164..e5f8b458399 100644 --- a/helm/hpcc/templates/roxie.yaml +++ b/helm/hpcc/templates/roxie.yaml @@ -118,7 +118,7 @@ spec: {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 8 }} run: {{ $commonCtx.toponame | quote }} roxie-cluster: {{ $roxie.name | quote }} - helmVersion: 8.10.67-closedown0 + helmVersion: 8.10.69-closedown0 {{- if hasKey $.Values.global "metrics" }} {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}} {{- end }} @@ -178,7 +178,7 @@ kind: Service metadata: name: {{ $commonCtx.toponame | quote }} labels: - helmVersion: 8.10.67-closedown0 + helmVersion: 8.10.69-closedown0 {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 4 }} spec: ports: @@ -240,7 +240,7 @@ spec: roxie-cluster: {{ $roxie.name | quote }} accessDali: "yes" accessEsp: "yes" - helmVersion: 8.10.67-closedown0 + helmVersion: 8.10.69-closedown0 {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-server" "name" "roxie" "instance" $servername) | indent 8 }} {{- if hasKey $.Values.global "metrics" }} {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}} @@ -343,7 +343,7 @@ spec: roxie-cluster: {{ $roxie.name | quote }} accessDali: "yes" accessEsp: "yes" - helmVersion: 8.10.67-closedown0 + helmVersion: 8.10.69-closedown0 {{- if hasKey $.Values.global "metrics" }} {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}} {{- end }} diff --git a/helm/hpcc/templates/sasha.yaml b/helm/hpcc/templates/sasha.yaml index 342ec5a5e08..17963dc0be9 100644 --- a/helm/hpcc/templates/sasha.yaml +++ b/helm/hpcc/templates/sasha.yaml @@ -52,7 +52,7 @@ spec: run: {{ $serviceName | quote }} server: {{ $serviceName | quote }} accessDali: {{ (has "dali" $sasha.access) | ternary "yes" "no" | quote }} - helmVersion: 8.10.67-closedown0 + helmVersion: 8.10.69-closedown0 {{- if hasKey $sasha "labels" }} {{ toYaml $sasha.labels | indent 8 }} {{- end }} diff --git a/helm/hpcc/templates/thor.yaml b/helm/hpcc/templates/thor.yaml index c886547b315..e9d339ec61d 100644 --- a/helm/hpcc/templates/thor.yaml +++ b/helm/hpcc/templates/thor.yaml @@ -82,7 +82,7 @@ data: labels: accessDali: "yes" accessEsp: "yes" - helmVersion: 8.10.67-closedown0 + helmVersion: 8.10.69-closedown0 {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclagent" "name" "thor" "instance" $eclAgentJobName "instanceOf" (printf "%s-job" .eclAgentName)) | indent 8 }} {{- if hasKey .me "labels" }} {{ toYaml .me.labels | indent 12 }} @@ -149,7 +149,7 @@ data: accessEsp: "yes" app: "thor" component: "thormanager" - helmVersion: 8.10.67-closedown0 + helmVersion: 8.10.69-closedown0 instance: "_HPCC_JOBNAME_" job: "_HPCC_JOBNAME_" {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "thormanager" "name" "thor" "instance" $thorManagerJobName "instanceOf" (printf "%s-thormanager-job" .me.name)) | indent 12 }} @@ -218,7 +218,7 @@ data: accessEsp: "yes" app: "thor" component: "thorworker" - helmVersion: 8.10.67-closedown0 + helmVersion: 8.10.69-closedown0 instance: "_HPCC_JOBNAME_" job: "_HPCC_JOBNAME_" {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "thorworker" "name" "thor" "instance" $thorWorkerJobName "instanceOf" (printf "%s-thorworker-job" .me.name)) | indent 12 }} @@ -353,7 +353,7 @@ spec: accessEsp: {{ $commonCtx.eclAgentUseChildProcesses | ternary "yes" "no" | quote }} app: "thor" component: "thor-eclagent" - helmVersion: 8.10.67-closedown0 + helmVersion: 8.10.69-closedown0 instance: {{ $commonCtx.eclAgentName | quote }} {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclagent" "name" "thor" "instance" $commonCtx.eclAgentName ) | indent 8 }} {{- if hasKey $commonCtx.me "labels" }} @@ -418,7 +418,7 @@ spec: accessEsp: "no" app: "thor" component: "thor-thoragent" - helmVersion: 8.10.67-closedown0 + helmVersion: 8.10.69-closedown0 instance: {{ $commonCtx.thorAgentName | quote }} {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclagent" "name" "thor" "instance" $commonCtx.thorAgentName ) | indent 8 }} {{- if hasKey $commonCtx.me "labels" }} diff --git a/version.cmake b/version.cmake index f8e2039a0e5..f7dc9169d2c 100644 --- a/version.cmake +++ b/version.cmake @@ -5,7 +5,7 @@ set ( HPCC_NAME "Community Edition" ) set ( HPCC_PROJECT "community" ) set ( HPCC_MAJOR 8 ) set ( HPCC_MINOR 10 ) -set ( HPCC_POINT 67 ) +set ( HPCC_POINT 69 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From 518377c33b6ea106a4bf8aaa41daeb4d951a4174 Mon Sep 17 00:00:00 2001 From: Jeremy Clements <79224539+jeclrsg@users.noreply.github.com> Date: Thu, 4 Apr 2024 13:12:14 -0400 Subject: [PATCH 2/2] HPCC-28452 ECL Watch fix "Session is locked" messages Remove any client code that would write a "Status" cookie when either the session timeout monitor fires, or the user manually clicks the "Lock" link. Also, though not strictly related, this PR includes a fix for one of the rewrite rules for the lightweight web server config (used for local dev of ecl watch). Signed-off-by: Jeremy Clements <79224539+jeclrsg@users.noreply.github.com> --- esp/src/Login.html | 2 +- esp/src/eclwatch/HPCCPlatformWidget.js | 4 ++-- esp/src/eclwatch/LockDialogWidget.js | 10 ++-------- esp/src/index.html | 2 +- esp/src/lws.config.js | 2 +- esp/src/src-react/components/Frame.tsx | 2 +- esp/src/src-react/components/Title.tsx | 2 +- esp/src/src-react/components/forms/Login.tsx | 1 - esp/src/src-react/hooks/user.ts | 4 +--- esp/src/src-react/index.tsx | 2 +- esp/src/src/ESPRequest.ts | 1 - esp/src/src/Session.ts | 7 +------ esp/src/src/Utility.ts | 2 +- 13 files changed, 13 insertions(+), 28 deletions(-) diff --git a/esp/src/Login.html b/esp/src/Login.html index 7ee298a80b5..17435f00ba7 100644 --- a/esp/src/Login.html +++ b/esp/src/Login.html @@ -140,7 +140,7 @@ var d = new Date(); d.setTime(d.getTime() + (exMins * 60 * 1000)); var expires = "expires=" + d.toUTCString(); - document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/"; + document.cookie = cname + "=" + cvalue + ";" + expires + ";"; } if (document.cookie.indexOf("ESPAuthenticationMSG") > -1) { diff --git a/esp/src/eclwatch/HPCCPlatformWidget.js b/esp/src/eclwatch/HPCCPlatformWidget.js index 5f73bd12833..9c6e868195b 100644 --- a/esp/src/eclwatch/HPCCPlatformWidget.js +++ b/esp/src/eclwatch/HPCCPlatformWidget.js @@ -227,7 +227,7 @@ define([ context.checkIfAdmin(context.userName); context.refreshUserName(); if (!cookie("PasswordExpiredCheck")) { - cookie("PasswordExpiredCheck", "true", { expires: 1 }); + cookie("PasswordExpiredCheck", "true", { expires: 1, path: "/" }); if (lang.exists("MyAccountResponse.passwordDaysRemaining", response)) { switch (response.MyAccountResponse.passwordDaysRemaining) { case null: @@ -462,7 +462,7 @@ define([ }, _ondebugLanguageFiles: function () { - /* DEBUG_ONLY + /* DEBUG_ONLY var context = this; require(["src/nls/hpcc"], function (lang) { var languageID = []; diff --git a/esp/src/eclwatch/LockDialogWidget.js b/esp/src/eclwatch/LockDialogWidget.js index 3028c6cd3b5..6b4717b0177 100644 --- a/esp/src/eclwatch/LockDialogWidget.js +++ b/esp/src/eclwatch/LockDialogWidget.js @@ -58,7 +58,6 @@ define([ show: function (event) { var context = this; if (!dojoConfig.username) { - cookie("Status", "Unlocked"); context.storage.setItem("Status", "Unlocked"); topic.publish("hpcc/session_management_status", { status: "Unlocked" @@ -96,7 +95,6 @@ define([ var context = this; if (this.unlockForm.validate()) { - cookie("Status", "login_attempt"); WsAccount.Unlock({ request: { username: this.unlockUserName.get("value"), @@ -113,7 +111,6 @@ define([ topic.publish("hpcc/session_management_status", { status: "Unlocked" }); - cookie("Status", "Unlocked"); context.storage.setItem("Status", "Unlocked"); if (context.idleFired) { dojo.publish("hpcc/brToaster", { @@ -127,7 +124,6 @@ define([ } } else { context.unlockStatus.innerHTML = response.UnlockResponse.Message; - cookie("Status", "Locked"); } }); } @@ -150,10 +146,9 @@ define([ topic.publish("hpcc/session_management_status", { status: "Locked" }); - cookie("Status", "Locked"); context.storage.setItem("Status", "Locked"); - } else if (cookie("Status") === "Unlocked") { - xhr("esp/lock", { + } else { + xhr("/esp/lock", { method: "post" }).then(function (response) { if (response) { @@ -163,7 +158,6 @@ define([ topic.publish("hpcc/session_management_status", { status: "Locked" }); - cookie("Status", "Locked"); context.storage.setItem("Status", "Locked"); } }); diff --git a/esp/src/index.html b/esp/src/index.html index 2ff97b9eed0..976da06abf0 100644 --- a/esp/src/index.html +++ b/esp/src/index.html @@ -38,7 +38,7 @@ } function checkCookie() { - document.cookie.indexOf("ESPAuthenticated=true") > -1 ? window.location.href : window.location.href = location.origin + "#/login"; + document.cookie.indexOf("ESPAuthenticated=true") > -1 ? window.location.href : window.location.href = location.origin + "/esp/files/Login.html"; } function sendAuthRequest() { diff --git a/esp/src/lws.config.js b/esp/src/lws.config.js index 0e147898d37..cd8e8dca97a 100644 --- a/esp/src/lws.config.js +++ b/esp/src/lws.config.js @@ -38,7 +38,7 @@ let rewrite = [ { from: "/esp/files/dist/(.*)", to: "/build/dist/$1" }, { from: "/esp/files/img/(.*)", to: "build/esp/files/img/$1" }, { from: "/esp/files/(.*/*.css)", to: "/build/esp/files/$1" }, - { from: "/esp/files/(.*)", to: "/$1" }, + { from: "/esp/files/(.*)", to: "/build/$1" }, { from: "/main", to: protocol + "://" + ip + ":" + port + "/main" }, { from: "/FileSpray/(.*)", to: protocol + "://" + ip + ":" + port + "/FileSpray/$1" }, { from: "/WsCloud/(.*)", to: protocol + "://" + ip + ":" + port + "/WsCloud/$1" }, diff --git a/esp/src/src-react/components/Frame.tsx b/esp/src/src-react/components/Frame.tsx index 587e48246d3..ee5f89e3d42 100644 --- a/esp/src/src-react/components/Frame.tsx +++ b/esp/src/src-react/components/Frame.tsx @@ -62,7 +62,7 @@ export const Frame: React.FunctionComponent = () => { fireIdle(); } else if (publishedMessage.status === "Idle") { window.localStorage.setItem("pageOnLock", window.location.hash.substring(1)); - setUserSession({ ...userSession, Status: "Locked" }); + setUserSession({ ...userSession }); window.location.reload(); } }); diff --git a/esp/src/src-react/components/Title.tsx b/esp/src/src-react/components/Title.tsx index b41d4843bd0..dfb9f829445 100644 --- a/esp/src/src-react/components/Title.tsx +++ b/esp/src/src-react/components/Title.tsx @@ -111,7 +111,7 @@ export const DevTitle: React.FunctionComponent = ({ fetch("esp/lock", { method: "post" }).then(() => { - setUserSession({ ...userSession, Status: "Locked" }); + setUserSession({ ...userSession }); replaceUrl("/login", null, true); }); } diff --git a/esp/src/src-react/components/forms/Login.tsx b/esp/src/src-react/components/forms/Login.tsx index a6d7d39c769..ce0e71ea9a6 100644 --- a/esp/src/src-react/components/forms/Login.tsx +++ b/esp/src/src-react/components/forms/Login.tsx @@ -116,7 +116,6 @@ export const Login: React.FunctionComponent = ({ setErrorMessage(cookies.ESPAuthenticationMSG); setShowError(true); } else { - cookies["Status"] = "Unlocked"; cookies["ESPAuthenticated"] = "true"; createUserSession(cookies).then(() => { setErrorMessage(""); diff --git a/esp/src/src-react/hooks/user.ts b/esp/src/src-react/hooks/user.ts index 26647d03616..34a1537f2ee 100644 --- a/esp/src/src-react/hooks/user.ts +++ b/esp/src/src-react/hooks/user.ts @@ -7,7 +7,6 @@ const defaults = { ESPSessionTimeout: 7200, ESPAuthenticated: false, ECLWatchUser: false, - Status: "Unlocked", ESPSessionState: false }; @@ -17,7 +16,6 @@ export interface UserSession { ESPSessionTimeout: number; ESPAuthenticated: boolean; ECLWatchUser: boolean; - Status: string; ESPAuthenticationMSG?: string; ESPSessionState: boolean; } @@ -47,6 +45,7 @@ export function useUserSession(): { case "Mixed": case "PerSessionOnly": store.set("ESPSessionState", "true"); + store.set("ESPAuthenticated", "true"); break; case "PerRequestOnly": case "UserNameOnly": @@ -56,7 +55,6 @@ export function useUserSession(): { default: store.set("ESPSessionState", "false"); } - store.set("Status", "Unlocked"); store.set("ECLWatchUser", "true"); }).catch(err => console.log("Unable to create user session.")); }, [store]); diff --git a/esp/src/src-react/index.tsx b/esp/src/src-react/index.tsx index 9a311de9e15..ebaa7c8060a 100644 --- a/esp/src/src-react/index.tsx +++ b/esp/src/src-react/index.tsx @@ -41,7 +41,7 @@ store.getEx(ModernMode, { defaultValue: String(containerized) }).then(async mode const authType = await authTypeResp?.text() ?? "None"; const userStore = cookieKeyValStore(); const userSession = await userStore.getAll(); - if (authType.indexOf("None") < 0 && (userSession["ESPSessionState"] === "false" || userSession["ECLWatchUser"] === "false" || (!userSession["Status"] || userSession["Status"] === "Locked"))) { + if (authType.indexOf("None") < 0 && (userSession["ESPSessionState"] === "false" || userSession["ECLWatchUser"] === "false")) { if (window.location.hash.indexOf("login") < 0) { replaceUrl("/login"); } diff --git a/esp/src/src/ESPRequest.ts b/esp/src/src/ESPRequest.ts index 1fbde9879f9..0f753faa61c 100644 --- a/esp/src/src/ESPRequest.ts +++ b/esp/src/src/ESPRequest.ts @@ -122,7 +122,6 @@ class RequestHelper { status: "DoIdle" }); } - cookie("Status", "Locked"); ESPUtil.LocalStorage.removeItem("Status"); } } diff --git a/esp/src/src/Session.ts b/esp/src/src/Session.ts index 530fe131694..ec5dbe6be63 100644 --- a/esp/src/src/Session.ts +++ b/esp/src/src/Session.ts @@ -3,10 +3,10 @@ import * as xhr from "dojo/request/xhr"; import * as topic from "dojo/topic"; import { format as d3Format } from "@hpcc-js/common"; import { SMCService } from "@hpcc-js/comms"; +import { scopedLogger } from "@hpcc-js/util"; import { cookieKeyValStore } from "src/KeyValStore"; import { singletonDebounce } from "../src-react/util/throttle"; import * as ESPUtil from "./ESPUtil"; -import { scopedLogger } from "@hpcc-js/util"; const logger = scopedLogger("src/Session.ts"); @@ -72,21 +72,16 @@ export function initSession() { }); idleWatcher.start(); - if (!cookie("Status")) { - document.cookie = "Status=Unlocked;Path=/"; - } } else if (cookie("ECLWatchUser")) { window.location.replace(dojoConfig.urlInfo.basePath + "/Login.html"); } } export function lock() { - cookie("Status", "Locked"); idleWatcher.stop(); } export function unlock() { - cookie("Status", "Unlocked"); idleWatcher.start(); } diff --git a/esp/src/src/Utility.ts b/esp/src/src/Utility.ts index e5c0f9117fa..e0435a0ce6f 100644 --- a/esp/src/src/Utility.ts +++ b/esp/src/src/Utility.ts @@ -1058,7 +1058,7 @@ export function parseCookies(): Record { export function deleteCookie(name: string) { const expireDate = new Date(); expireDate.setSeconds(expireDate.getSeconds() + 1); - document.cookie = `${name}=; domain=${window.location.hostname}; path=/; expires=${expireDate.toUTCString()}`; + document.cookie = `${name}=; domain=${window.location.hostname}; expires=${expireDate.toUTCString()}`; } const d3FormatDecimal = d3Format(",.2f");