From de8319db545db06598c3a99d5043789497eae04b Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Thu, 3 Oct 2024 11:04:10 +0100 Subject: [PATCH] clear pinsuser id from cookie --- .env.local | 33 ++++++++++++++++++-------- components/account/registerComplete.js | 21 +--------------- components/header.js | 8 +++---- components/myportal.js | 8 +++---- components/timeout/index.js | 8 +++---- pages/_error.js | 14 +++++++---- pages/error.js | 15 ++++++++---- pages/furtherdetails.js | 8 +++---- 8 files changed, 61 insertions(+), 54 deletions(-) diff --git a/.env.local b/.env.local index 10bb2a17..d90469ca 100644 --- a/.env.local +++ b/.env.local @@ -18,6 +18,13 @@ RELAYPATH = "ar-hc-lz-pedw-cnr-uks-01" //RELAYURI = "dev-pedw-ns.servicebus.windows.net" //RELAYPATH = "dev-pedw-hc" +//New Dev oauth ESNR +CLIENT_ID = 9b834097-03d7-409b-b038-ecfec31a394a +CLIENT_SECRET = .Jf8Q~tKMObCJjhh_hy3J5AIctFrBalU4FS~tdxk +RELAY_ROOT = https://ar-ns-lz-pedw-dev-uks-01.servicebus.windows.net/ar-hc-lz-pedw-dev-uks-01/ +RELAYURI = "ar-ns-lz-pedw-dev-uks-01.servicebus.windows.net" +RELAYPATH = "ar-hc-lz-pedw-dev-uks-01" + //Test Oauth ESNR //CLIENT_ID = d40b9373-96c2-4b04-8bd8-c2a2fe6444c1 @@ -27,11 +34,11 @@ RELAYPATH = "ar-hc-lz-pedw-cnr-uks-01" //RELAYPATH = "test-pedw-hc" //New Test -CLIENT_ID = d40b9373-96c2-4b04-8bd8-c2a2fe6444c1 -CLIENT_SECRET = 6hT8Q~glL~jloWpGmvXw3UY37QFwjUE0r._jobEM -RELAY_ROOT = https://ar-ns-lz-pedw-test-uks-01.servicebus.windows.net/ar-hc-lz-pedw-test-uks-01/ -RELAYURI = "ar-ns-lz-pedw-test-uks-01.servicebus.windows.net" -RELAYPATH = "ar-hc-lz-pedw-test-uks-01" +# CLIENT_ID = d40b9373-96c2-4b04-8bd8-c2a2fe6444c1 +# CLIENT_SECRET = 6hT8Q~glL~jloWpGmvXw3UY37QFwjUE0r._jobEM +# RELAY_ROOT = https://ar-ns-lz-pedw-test-uks-01.servicebus.windows.net/ar-hc-lz-pedw-test-uks-01/ +# RELAYURI = "ar-ns-lz-pedw-test-uks-01.servicebus.windows.net" +# RELAYPATH = "ar-hc-lz-pedw-test-uks-01" //Preprod Oauth WGO @@ -109,16 +116,22 @@ AZURE_CLIENT_SECRET = $CLIENT_SECRET //AZURE_STORAGE_ACCOUNT_KEY = JS3ZIXianhYhB1lZrHB+bXbdzaLlON0alCyKrFAb+jVEwr9iqo2dty92EBxwnufNFM+CSN/fKX2R+AStDn0byg== //AZURE_PEDW_STORAGE_ENDPOINT = https://pedwdev.blob.core.windows.net +// new dev key +AZURE_STORAGE_ACCOUNT_NAME = "sapltpedwdevuks" +AZURE_STORAGE_ACCOUNT_KEY = JS3ZIXianhYhB1lZrHB+bXbdzaLlON0alCyKrFAb+jVEwr9iqo2dty92EBxwnufNFM+CSN/fKX2R+AStDn0byg== +AZURE_PEDW_STORAGE_ENDPOINT = https://sapltpedwdevuks.blob.core.windows.net + + // test key -//AZURE_STORAGE_ACCOUNT_NAME = "pedwtest" +//AZURE_STORAGE_ACCOUNT_NAME = "sapltpedwdevuks" ////AZURE_STORAGE_ACCOUNT_KEY = Dl8qUVEnR2mglklQorttMurmjUpe2lI3oMWl9V245U6BOLutXDwmpU36afeTrGLK+zfzNVLErsWM+AStiYsimw== //AZURE_STORAGE_ACCOUNT_KEY = iEQKwh4TB9BT63pU5a6+ivn6ItiDkuIkYCrUwjm9STJTdMBOKWUT06EEcP8pcy/qeQ89ogK75mFQ+AStT53G/g== //AZURE_PEDW_STORAGE_ENDPOINT = https://pedwtest.blob.core.windows.net -// New test key -AZURE_STORAGE_ACCOUNT_NAME = "sapltpedwtestuks" -AZURE_STORAGE_ACCOUNT_KEY = bqJAz5pYQVGee8dnVhlsqW+xHwinNTjgY2AmojNyB+d4uAotMR20WcO4Op13yB+9dFaXAkkjtIA4+AStHT/IYg== -AZURE_PEDW_STORAGE_ENDPOINT = https://sapltpedwtestuks.blob.core.windows.net +# // New test key +# AZURE_STORAGE_ACCOUNT_NAME = "sapltpedwtestuks" +# AZURE_STORAGE_ACCOUNT_KEY = bqJAz5pYQVGee8dnVhlsqW+xHwinNTjgY2AmojNyB+d4uAotMR20WcO4Op13yB+9dFaXAkkjtIA4+AStHT/IYg== +# AZURE_PEDW_STORAGE_ENDPOINT = https://sapltpedwtestuks.blob.core.windows.net // preprod key diff --git a/components/account/registerComplete.js b/components/account/registerComplete.js index b028daaf..003a6bb1 100644 --- a/components/account/registerComplete.js +++ b/components/account/registerComplete.js @@ -81,26 +81,7 @@ const RegisterComplete = (props) => {

- { - // console.info( - // "////////////\n" + - // "logout" + - // "\n////////////" - // ); - // window.localStorage.clear(), - // destroyCookie(null, "next-auth.csrf-token"), - // destroyCookie( - // null, - // "next-auth.callback-url" - // ), - // destroyCookie(null, "pedw_locale"), - // destroyCookie(null, "pinsUser"), - // signOut({ callbackUrl: "/logout" }); - // }} - > + {t("account:register-new-account-my-portal-link")}

diff --git a/components/header.js b/components/header.js index 3750da5e..fedc8d72 100644 --- a/components/header.js +++ b/components/header.js @@ -74,10 +74,10 @@ const Header = (props) => { const handleLogout = () => { console.info("////////////\n" + "logout" + "\n////////////"); window.localStorage.clear(), - destroyCookie(null, "next-auth.csrf-token"), - destroyCookie(null, "next-auth.callback-url"), - destroyCookie(null, "pedw_locale"), - destroyCookie(null, "pinsUser"), + destroyCookie(null, "next-auth.csrf-token", { path: "/" }), + destroyCookie(null, "next-auth.callback-url", { path: "/" }), + destroyCookie(null, "pedw_locale", { path: "/" }), + destroyCookie(null, "pinsUser", { path: "/" }), signOut({ callbackUrl: "/logout" }); }; diff --git a/components/myportal.js b/components/myportal.js index 40b8269f..65629f5c 100644 --- a/components/myportal.js +++ b/components/myportal.js @@ -25,10 +25,10 @@ const MyPortal = (props) => { const handleLogout = () => { console.info("////////////\n" + "logout" + "\n////////////"); window.localStorage.clear(), - destroyCookie(null, "next-auth.csrf-token"), - destroyCookie(null, "next-auth.callback-url"), - destroyCookie(null, "pedw_locale"), - destroyCookie(null, "pinsUser"), + destroyCookie(null, "next-auth.csrf-token", { path: "/" }), + destroyCookie(null, "next-auth.callback-url", { path: "/" }), + destroyCookie(null, "pedw_locale", { path: "/" }), + destroyCookie(null, "pinsUser", { path: "/" }), signOut({ callbackUrl: "/logout" }); }; diff --git a/components/timeout/index.js b/components/timeout/index.js index 8a3a2463..05475c36 100644 --- a/components/timeout/index.js +++ b/components/timeout/index.js @@ -41,10 +41,10 @@ const TimeOut = (props) => { const handleLogout = () => { console.info("////////////\n" + "logout" + "\n////////////"); window.localStorage.clear(), - destroyCookie(null, "next-auth.csrf-token"), - destroyCookie(null, "next-auth.callback-url"), - destroyCookie(null, "pedw_locale"), - destroyCookie(null, "pinsUser"), + destroyCookie(null, "next-auth.csrf-token", { path: "/" }), + destroyCookie(null, "next-auth.callback-url", { path: "/" }), + destroyCookie(null, "pedw_locale", { path: "/" }), + destroyCookie(null, "pinsUser", { path: "/" }), signOut({ callbackUrl: "/logout" }); }; diff --git a/pages/_error.js b/pages/_error.js index 8152de70..37d84e95 100644 --- a/pages/_error.js +++ b/pages/_error.js @@ -41,14 +41,20 @@ function Error({ statusCode }, props) { window.localStorage.clear(), destroyCookie( null, - "next-auth.csrf-token" + "next-auth.csrf-token", + { path: "/" } ), destroyCookie( null, - "next-auth.callback-url" + "next-auth.callback-url", + { path: "/" } ), - destroyCookie(null, "pedw_locale"), - destroyCookie(null, "pinsUser"), + destroyCookie(null, "pedw_locale", { + path: "/", + }), + destroyCookie(null, "pinsUser", { + path: "/", + }), session != null ? signOut({ callbackUrl: "/", diff --git a/pages/error.js b/pages/error.js index affcf3ac..c1de6a39 100644 --- a/pages/error.js +++ b/pages/error.js @@ -42,16 +42,23 @@ function Error({ statusCode }, props) { className="govuk-link" onClick={() => { window.localStorage.clear(), + window.localStorage.clear(), destroyCookie( null, - "next-auth.csrf-token" + "next-auth.csrf-token", + { path: "/" } ), destroyCookie( null, - "next-auth.callback-url" + "next-auth.callback-url", + { path: "/" } ), - destroyCookie(null, "pedw_locale"), - destroyCookie(null, "pinsUser"), + destroyCookie(null, "pedw_locale", { + path: "/", + }), + destroyCookie(null, "pinsUser", { + path: "/", + }), session != null ? signOut({ callbackUrl: "/", diff --git a/pages/furtherdetails.js b/pages/furtherdetails.js index ce4669d1..28a33e3c 100644 --- a/pages/furtherdetails.js +++ b/pages/furtherdetails.js @@ -15,10 +15,10 @@ const FourOhFour = (props) => { const handleLogout = () => { console.info("////////////\n" + "logout" + "\n////////////"); window.localStorage.clear(), - destroyCookie(null, "next-auth.csrf-token"), - destroyCookie(null, "next-auth.callback-url"), - destroyCookie(null, "pedw_locale"), - destroyCookie(null, "pinsUser"), + destroyCookie(null, "next-auth.csrf-token", { path: "/" }), + destroyCookie(null, "next-auth.callback-url", { path: "/" }), + destroyCookie(null, "pedw_locale", { path: "/" }), + destroyCookie(null, "pinsUser", { path: "/" }), signOut({ callbackUrl: "/" }); };