Phase 1 reliability/stabilisation: auth logging, logout client, loader+xml hardening

components/header.js

@@ -2,12 +2,12 @@ import _ from "lodash";
 import useTranslation from "next-translate/useTranslation";
 import Link from "next/link";
 import { useRouter } from "next/router";
-import { destroyCookie, setCookie } from "nookies";
+import { setCookie } from "nookies";
 import { connect } from "react-redux";
 import Banner from "../components/banner";
 import { setLogout } from "../store/accountDetails/action";
 
-import { signOut } from "next-auth/react";
+import { logoutClient } from "../lib/auth/logoutClient";
 
 const Header = (props) => {
     let { t, lang } = useTranslation();
@@ -85,14 +85,7 @@ const Header = (props) => {
 
     const handleLogout = () => {
         console.info("////////////\n" + "logout" + "\n////////////");
-        (window.localStorage.clear(),
-            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: locale == "cy" ? "/cy/allgofnodi" : "/logout"
-            }));
+        logoutClient(locale);
     };
 
     //const switchLocale = locale === "en" ? "cy" : "en";

components/myportal/servicebanner.js

@@ -1,41 +1,22 @@
 import useTranslation from "next-translate/useTranslation";
 import router from "next/router";
 import Link from "next/link";
-import { destroyCookie } from "nookies";
-import { signOut } from "next-auth/react";
+import { logoutClient } from "../../lib/auth/logoutClient";
 
 const ServiceBanner = (props) => {
     props = props.props;
     let { t, lang } = useTranslation();
 
-    const signInButton = () => {
-        router.push(
-            `${
-                router.locale == "cy" ? "/awd/mewngofnodi" : "/auth/signin"
-            }?callbackUrl=${encodeURIComponent(
-                window.location.href
-            )}&error=EmailSignin`
-        );
-    };
-
     const handleLogout = (locale) => {
         console.info("////////////\n" + "logout" + "\n////////////");
-        window.localStorage.clear(),
-            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: locale == "cy" ? "/cy/allgofnodi" : "/logout",
-            });
+        logoutClient(locale);
     };
 
     const portalLogoLink = [
         "/myportal/[appealtypes]",
         "/newappeal",
         "/newappeal/[appealtypes]",
-        "/myportal/representation",
+        "/myportal/representation"
     ];
     return (
         <div className="servicebanner myportal govuk-!-margin-bottom-4">

components/timeout/index.js

@@ -1,10 +1,8 @@
-import { signOut } from "next-auth/react";
 import useTranslation from "next-translate/useTranslation";
 import { useRouter } from "next/router";
-import { destroyCookie } from "nookies";
 import { useState, useEffect } from "react";
 import { useIdleTimer } from "react-idle-timer";
-import TimeoutModal from "./timeoutmodal";
+import { logoutClient } from "../../lib/auth/logoutClient";
 
 const TimeOut = (props) => {
     let { t } = useTranslation();
@@ -21,14 +19,7 @@ const TimeOut = (props) => {
     const onIdle = () => {
         setState("Idle");
         console.info("////////////\n" + "logout" + "\n////////////");
-        window.localStorage.clear(),
-            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: locale == "cy" ? "/cy/allgofnodi" : "/logout",
-            });
+        logoutClient(locale);
         setOpen(false);
     };
 
@@ -48,7 +39,7 @@ const TimeOut = (props) => {
         onPrompt,
         timeout,
         promptBeforeIdle,
-        throttle: 500,
+        throttle: 500
     });
 
     useEffect(() => {
@@ -89,14 +80,14 @@ const TimeOut = (props) => {
             <div
                 className={open ? "modal fade show" : "modal fade"}
                 style={{
-                    display: open ? "flex" : "none",
+                    display: open ? "flex" : "none"
                 }}
             >
                 <div className="modal-dialog">
                     <div className="modal-content">
                         <h3>
                             {t("common:login-modal-message", {
-                                remaining: remaining,
+                                remaining: remaining
                             })}
                         </h3>
                         <button