robbond/pedwfrontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged PR 1253: clear pinsuser id from cookie

Browse Source 
clear pinsuser id from cookie

Related work items: #12404
This commit is contained in:
Robert Bond
2024-10-03 10:06:17 +00:00
parent 8fbec7e794 de8319db54
commit ba05741b8e
8 changed files with 61 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.local
+23 -10
View File
@@ -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
components/account/registerComplete.js
+1 -20
View File
@@ -81,26 +81,7 @@ const RegisterComplete = (props) => {
</p>
<p className="govuk-body">
<Link
href="/"
className="govuk-link"
// onClick={() => {
// 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" });
// }}
>
<Link href="/" className="govuk-link">
{t("account:register-new-account-my-portal-link")}
</Link>
</p>
components/header.js
+4 -4
View File
@@ -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" });
};
components/myportal.js
+4 -4
View File
@@ -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" });
};
components/timeout/index.js
+4 -4
View File
@@ -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" });
};
pages/_error.js
+10 -4
View File
@@ -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: "/",
pages/error.js
+11 -4
View File
@@ -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: "/",
pages/furtherdetails.js
+4 -4
View File
@@ -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: "/" });
};