From 31375a599957bb9d02119c31b0060b8e85ab9a6b Mon Sep 17 00:00:00 2001
From: rdbsolutions <rob@rdbsolutions.co.uk>
Date: Mon, 5 Jun 2023 12:00:28 +0100
Subject: [PATCH] updated authentication on protected pages

---
 components/nosession.js                 | 55 ++++++++++++++
 pages/account/changepassword.js         | 14 ++++
 pages/account/forgottenpassword.js      | 15 +++-
 pages/account/forgottenuser.js          | 14 +++-
 pages/account/personaldetails.js        | 13 ++++
 pages/account/register.js               | 20 ++++--
 pages/middleware.js                     |  3 +
 pages/myportal/[appealtypes].js         | 10 +++
 pages/myportal/advancedsearch.js        | 38 ++++++----
 pages/myportal/advancedsearchresults.js | 50 +++++++------
 pages/myportal/case.js                  | 13 ++++
 pages/myportal/dnsapplications.js       | 32 ++++++---
 pages/myportal/dnsdetails.js            | 12 ++++
 pages/myportal/index.js                 | 26 +++++++
 pages/myportal/representation.js        | 13 ++++
 pages/myportal/searchresults.js         | 96 ++++++++++++++-----------
 pages/myportal/viewall.js               | 12 ++++
 pages/newappeal/[appealtypes].js        | 10 +++
 pages/newappeal/aboutyou.js             | 14 ++++
 pages/newappeal/index.js                | 67 ++++++++++-------
 20 files changed, 408 insertions(+), 119 deletions(-)
 create mode 100644 components/nosession.js
 create mode 100644 pages/middleware.js
diff --git a/components/nosession.js b/components/nosession.js
new file mode 100644
index 00000000..9b8ba73f
--- /dev/null
+++ b/components/nosession.js
@@ -0,0 +1,55 @@
+import Head from "next/head";
+import Header from "../components/header";
+import Banner from "../components/banner";
+import CookieBanner from "../components/cookieBanner";
+import Breadcrumbs from "../components/breadcrumbs";
+import Footer from "../components/footer";
+import useTranslation from "next-translate/useTranslation";
+
+const NoSessionWarning = (props) => {
+    const { footerLinks, loading } = props;
+
+    let { t, lang } = useTranslation();
+
+    return (
+        <div>
+            <Head>
+                <title>
+                    {t("search:page-title")} - {t("common:service-name")}
+                </title>
+            </Head>
+            <div id="page_wrapper">
+                <CookieBanner />
+                <Header courseName={t("common:service-name")} />
+
+                <div className="govuk-grid-row">
+                    <div className="govuk-grid-column-full">
+                        <div className="govuk-width-container">
+                            <main
+                                className="govuk-main-wrapper--auto-spacing"
+                                id="main-content"
+                                role="main"
+                            >
+                                <div className="govuk-grid-row">
+                                    <div className="govuk-grid-column-two-thirds">
+                                        <h1>
+                                            {
+                                                (loading = !true
+                                                    ? "Loading"
+                                                    : "You are not logged in")
+                                            }{" "}
+                                        </h1>
+                                    </div>
+                                </div>
+                            </main>
+                        </div>
+                    </div>
+                </div>
+
+                <Footer footerLinks={footerLinks} />
+            </div>
+        </div>
+    );
+};
+
+export default NoSessionWarning;
diff --git a/pages/account/changepassword.js b/pages/account/changepassword.js
index a389881b..f09f3d96 100644
--- a/pages/account/changepassword.js
+++ b/pages/account/changepassword.js
@@ -28,6 +28,9 @@ import {
 import { getAppealsTypes, getLPA } from "../../actions";
 import { setLPA } from "../../store/lpa/action";
 
+import { getSession, useSession } from "next-auth/react";
+import NoSessionWarning from "../../components/nosession";
+
 const Home = (props) => {
     const { footerLinks, pages, formData } = props;
     let { t, lang } = useTranslation();
@@ -39,6 +42,17 @@ const Home = (props) => {
     const { appealType, LPAData } = props;
     const [passwordUpdated, setPasswordUpdated] = useState(false);
 
+    const { data: session, status } = useSession();
+
+    if (status === "loading") {
+        return <NoSessionWarning loading={true} />;
+    }
+
+    if (status === "unauthenticated") {
+        router.push("/auth/signin");
+        return <NoSessionWarning />;
+    }
+
     return (
         <div>
             <Head>
diff --git a/pages/account/forgottenpassword.js b/pages/account/forgottenpassword.js
index ddc251ce..dd9cbaeb 100644
--- a/pages/account/forgottenpassword.js
+++ b/pages/account/forgottenpassword.js
@@ -17,9 +17,11 @@ import jsonpath from "jsonpath";
 import { reduxForm, formValueSelector } from "redux-form";
 
 import RegisterForm from "../../components/account/registerform";
+import { getSession, useSession } from "next-auth/react";
+import NoSessionWarning from "../../components/nosession";
 
 const Home = (props) => {
-    const { footerLinks, formData } = props;
+    const { footerLinks } = props;
     let { t, lang } = useTranslation();
 
     const router = useRouter();
@@ -29,6 +31,17 @@ const Home = (props) => {
     const [registerFormComplete, setRegisterFormComplete] = useState(false);
     const [accountCreatedComplete, setAccountCreatedComplete] = useState(false);
 
+    const { data: session, status } = useSession();
+
+    if (status === "loading") {
+        return <NoSessionWarning loading={true} />;
+    }
+
+    if (status === "unauthenticated") {
+        router.push("/auth/signin");
+        return <NoSessionWarning />;
+    }
+
     return (
         <div>
             <Head>
diff --git a/pages/account/forgottenuser.js b/pages/account/forgottenuser.js
index 22ad5b99..4a6c252d 100644
--- a/pages/account/forgottenuser.js
+++ b/pages/account/forgottenuser.js
@@ -15,7 +15,8 @@ import { useState } from "react";
 import useTranslation from "next-translate/useTranslation";
 import jsonpath from "jsonpath";
 import { reduxForm, formValueSelector } from "redux-form";
-
+import { getSession, useSession } from "next-auth/react";
+import NoSessionWarning from "../../components/nosession";
 import RegisterForm from "../../components/account/registerform";
 
 const Home = (props) => {
@@ -29,6 +30,17 @@ const Home = (props) => {
     const [registerFormComplete, setRegisterFormComplete] = useState(false);
     const [accountCreatedComplete, setAccountCreatedComplete] = useState(false);
 
+    const { data: session, status } = useSession();
+
+    if (status === "loading") {
+        return <NoSessionWarning loading={true} />;
+    }
+
+    if (status === "unauthenticated") {
+        router.push("/auth/signin");
+        return <NoSessionWarning />;
+    }
+
     return (
         <div>
             <Head>
diff --git a/pages/account/personaldetails.js b/pages/account/personaldetails.js
index 0002d1ea..38a47487 100644
--- a/pages/account/personaldetails.js
+++ b/pages/account/personaldetails.js
@@ -20,6 +20,8 @@ import PersonalDetails from "../../components/account/personaldetails";
 import { setAccountDetails } from "../../store/accountDetails/action";
 import { getPersonalAccount } from "../../actions";
 import { setCookie } from "nookies";
+import { getSession, useSession } from "next-auth/react";
+import NoSessionWarning from "../../components/nosession";
 
 const Home = (props) => {
     const { footerLinks, formData } = props;
@@ -36,6 +38,17 @@ const Home = (props) => {
     setCookie(null, "pinsUser", props.accountDetails.loggedinUserId),
         { path: "/" };
 
+    const { data: session, status } = useSession();
+
+    if (status === "loading") {
+        return <NoSessionWarning loading={true} />;
+    }
+
+    if (status === "unauthenticated") {
+        router.push("/auth/signin");
+        return <NoSessionWarning />;
+    }
+
     return (
         <div>
             <Head>
diff --git a/pages/account/register.js b/pages/account/register.js
index 644f71de..65f7e748 100644
--- a/pages/account/register.js
+++ b/pages/account/register.js
@@ -162,11 +162,21 @@ export const getServerSideProps = wrapper.getServerSideProps(
 
         let thisSession = await getSession(ctx);
 
-        console.log(
-            "auth sess for register :",
-            thisSession,
-            thisSession.user.email
-        );
+        // console.log(
+        //     "auth sess for register :",
+        //     thisSession,
+        //     thisSession.user.email
+        // );
+
+        if (!thisSession) {
+            console.log("not has sesssion.......");
+            return {
+                redirect: {
+                    destination: "/auth/signin",
+                    permanent: false,
+                },
+            };
+        }
 
         return {
             props: {
diff --git a/pages/middleware.js b/pages/middleware.js
new file mode 100644
index 00000000..0ee82360
--- /dev/null
+++ b/pages/middleware.js
@@ -0,0 +1,3 @@
+export { default } from "next-auth/middleware";
+
+export const config = { matcher: ["/myportal/:path*"] };
diff --git a/pages/myportal/[appealtypes].js b/pages/myportal/[appealtypes].js
index 26a596c5..df2241b7 100644
--- a/pages/myportal/[appealtypes].js
+++ b/pages/myportal/[appealtypes].js
@@ -223,6 +223,16 @@ export const getServerSideProps = wrapper.getServerSideProps(
         let thisSession = await getSession(ctx);
         //console.log("nextAuth Session:", thisSession);
 
+        if (!thisSession) {
+            console.log("not has sesssion.......");
+            return {
+                redirect: {
+                    destination: "/auth/signin",
+                    permanent: false,
+                },
+            };
+        }
+
         let loggedInUserIdent = thisSession.user.id;
         let loggedInUserEmail = thisSession.user.email;
 
diff --git a/pages/myportal/advancedsearch.js b/pages/myportal/advancedsearch.js
index efab7f49..d57fb53d 100644
--- a/pages/myportal/advancedsearch.js
+++ b/pages/myportal/advancedsearch.js
@@ -75,22 +75,34 @@ export const getServerSideProps = wrapper.getServerSideProps(
 
         let thisSession = await getSession(ctx);
 
-        const [accountDetails, appealTypeData, lpaData] = await Promise.all([
-            await getPersonalAccount(loggedInUser),
-            await getAppealsTypes(),
-            await getLPA(),
-        ]);
+        if (!thisSession) {
+            console.log("not has sesssion.......");
+            return {
+                redirect: {
+                    destination: "/auth/signin",
+                    permanent: false,
+                },
+            };
+        } else {
+            const [accountDetails, appealTypeData, lpaData] = await Promise.all(
+                [
+                    await getPersonalAccount(loggedInUser),
+                    await getAppealsTypes(),
+                    await getLPA(),
+                ]
+            );
 
-        // const lpaData = require("../../data/lpa.json");
-        // const appealTypeData = require("../../data/appealtypes.json");
+            // const lpaData = require("../../data/lpa.json");
+            // const appealTypeData = require("../../data/appealtypes.json");
 
-        store.dispatch(setAccountDetails(accountDetails));
-        store.dispatch(setAppealType(appealTypeData));
-        store.dispatch(setLPA(lpaData));
-        store.dispatch(setLoggedInUserId(loggedInUser));
+            store.dispatch(setAccountDetails(accountDetails));
+            store.dispatch(setAppealType(appealTypeData));
+            store.dispatch(setLPA(lpaData));
+            store.dispatch(setLoggedInUserId(loggedInUser));
 
-        thisSession != false &&
-            store.dispatch(setContainerID(thisSession.user.id));
+            thisSession != false &&
+                store.dispatch(setContainerID(thisSession.user.id));
+        }
     }
 );
 
diff --git a/pages/myportal/advancedsearchresults.js b/pages/myportal/advancedsearchresults.js
index 3ab20f86..5831b2fe 100644
--- a/pages/myportal/advancedsearchresults.js
+++ b/pages/myportal/advancedsearchresults.js
@@ -81,29 +81,39 @@ export const getServerSideProps = wrapper.getServerSideProps(
         let loggedInUser = cookies.pinsUser;
         let thisSession = await getSession(ctx);
 
-        thisSession != false &&
-            store.dispatch(setContainerID(thisSession.user.id));
+        if (!thisSession) {
+            console.log("not has sesssion.......");
+            return {
+                redirect: {
+                    destination: "/auth/signin",
+                    permanent: false,
+                },
+            };
+        } else {
+            thisSession != false &&
+                store.dispatch(setContainerID(thisSession.user.id));
 
-        const [accountDetails, searchResultsObj, watchedCases] =
-            await Promise.all([
-                await getPersonalAccount(loggedInUser),
-                await getAdvancedSearch(query),
-                await getWatchedCases(loggedInUser),
+            const [accountDetails, searchResultsObj, watchedCases] =
+                await Promise.all([
+                    await getPersonalAccount(loggedInUser),
+                    await getAdvancedSearch(query),
+                    await getWatchedCases(loggedInUser),
+                ]);
+
+            console.log(accountDetails);
+
+            const [searchDetailsObj, watchedCasesDetails] = await Promise.all([
+                await getSearchDetails(searchResultsObj),
+                await getDetails(watchedCases, "myWatchedCases"),
             ]);
 
-        console.log(accountDetails);
-
-        const [searchDetailsObj, watchedCasesDetails] = await Promise.all([
-            await getSearchDetails(searchResultsObj),
-            await getDetails(watchedCases, "myWatchedCases"),
-        ]);
-
-        store.dispatch(setAccountDetails(accountDetails));
-        store.dispatch(setSearchResults(searchResultsObj));
-        store.dispatch(setSearchDetails(searchDetailsObj));
-        store.dispatch(setWatchedCases(watchedCases));
-        store.dispatch(setWatchedCasesDetails(watchedCasesDetails));
-        store.dispatch(setSearch(Object.entries(query)));
+            store.dispatch(setAccountDetails(accountDetails));
+            store.dispatch(setSearchResults(searchResultsObj));
+            store.dispatch(setSearchDetails(searchDetailsObj));
+            store.dispatch(setWatchedCases(watchedCases));
+            store.dispatch(setWatchedCasesDetails(watchedCasesDetails));
+            store.dispatch(setSearch(Object.entries(query)));
+        }
     }
 );
 
diff --git a/pages/myportal/case.js b/pages/myportal/case.js
index d6c8da93..c6d46f74 100644
--- a/pages/myportal/case.js
+++ b/pages/myportal/case.js
@@ -8,6 +8,8 @@ import CookieBanner from "../../components/cookieBanner";
 import Footer from "../../components/footer";
 import Header from "../../components/header";
 import TimeOut from "../../components/timeout";
+import { useSession, getSession } from "next-auth/react";
+import NoSessionWarning from "../../components/nosession";
 
 const Home = (props) => {
     const { footerLinks, pages, showRepresentations } = props;
@@ -17,6 +19,17 @@ const Home = (props) => {
     const { locale } = router;
     const { appealtypes } = router.query;
 
+    const { data: session, status } = useSession();
+
+    if (status === "loading") {
+        return <NoSessionWarning loading={true} />;
+    }
+
+    if (status === "unauthenticated") {
+        router.push("/auth/signin");
+        return <NoSessionWarning />;
+    }
+
     return (
         <div>
             <Head>
diff --git a/pages/myportal/dnsapplications.js b/pages/myportal/dnsapplications.js
index 29434388..9a7d139a 100644
--- a/pages/myportal/dnsapplications.js
+++ b/pages/myportal/dnsapplications.js
@@ -30,6 +30,8 @@ import {
     setWatchedCasesDetails,
 } from "../../store/watchedCases/action";
 
+import { getSession, useSession } from "next-auth/react";
+
 const Home = (props) => {
     const { footerLinks, pages, watchedCases, showMap } = props;
     let { t, lang } = useTranslation();
@@ -126,19 +128,30 @@ const Home = (props) => {
 };
 
 export const getServerSideProps = wrapper.getServerSideProps(
-    (store) =>
-        async ({ query, req, res }) => {
-            console.log("query-", query);
+    (store) => async (ctx) => {
+        const { query, req, res } = ctx;
+        console.log("query-", query);
 
-            const { cookies } = req;
+        const { cookies } = req;
 
-            res.setHeader(
-                "Cache-Control",
-                "public, s-maxage=10, stale-while-revalidate=59"
-            );
+        res.setHeader(
+            "Cache-Control",
+            "public, s-maxage=10, stale-while-revalidate=59"
+        );
 
-            let loggedInUser = cookies.pinsUser;
+        let loggedInUser = cookies.pinsUser;
 
+        let thisSession = await getSession(ctx);
+
+        if (!thisSession) {
+            console.log("not has sesssion.......");
+            return {
+                redirect: {
+                    destination: "/auth/signin",
+                    permanent: false,
+                },
+            };
+        } else {
             let [searchResultsObj, watchedCases] = await Promise.all([
                 await getBasicDNSSearch(),
                 await getWatchedCases(loggedInUser),
@@ -170,6 +183,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
                 props: { showMap: showMapCheck },
             };
         }
+    }
 );
 
 const getDetails = (resultsObj, detailsType) => {
diff --git a/pages/myportal/dnsdetails.js b/pages/myportal/dnsdetails.js
index 6806ce31..206cad1e 100644
--- a/pages/myportal/dnsdetails.js
+++ b/pages/myportal/dnsdetails.js
@@ -7,6 +7,7 @@ import Case from "../../components/case";
 import CookieBanner from "../../components/cookieBanner";
 import Footer from "../../components/footer";
 import Header from "../../components/header";
+import { useSession, getSession } from "next-auth/react";
 
 const Home = (props) => {
     const { footerLinks, pages } = props;
@@ -16,6 +17,17 @@ const Home = (props) => {
     const { locale } = router;
     const { appealtypes } = router.query;
 
+    const { data: session, status } = useSession();
+
+    if (status === "loading") {
+        return <NoSessionWarning loading={true} />;
+    }
+
+    if (status === "unauthenticated") {
+        router.push("/auth/signin");
+        return <NoSessionWarning />;
+    }
+
     return (
         <div>
             <Head>
diff --git a/pages/myportal/index.js b/pages/myportal/index.js
index 68ea59c3..08bcfe3e 100644
--- a/pages/myportal/index.js
+++ b/pages/myportal/index.js
@@ -207,6 +207,31 @@ export const getServerSideProps = wrapper.getServerSideProps(
         //     awaitingSubmissionFromBlob.case
         // );
 
+        console.log(
+            "preferred language:",
+            accountDetails.pinswg_preferredlanguage
+        );
+
+        console.log(
+            "locale :",
+            accountDetails.pinswg_preferredlanguage == "846040000" ? "cy" : "en"
+        );
+
+        console.log("req locale :", ctx.locale);
+
+        const preferredLocale =
+            accountDetails.pinswg_preferredlanguage == "846040000"
+                ? "cy"
+                : "en";
+
+        // if (preferredLocale != ctx.locale) {
+        //     return {
+        //         redirect: {
+        //             destination: "/cy/myportal",
+        //             permanent: false,
+        //         },
+        //     };
+        // } else {
         if (_.has(accountDetails, "errorCode") != false) {
             return {
                 redirect: {
@@ -255,6 +280,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
                 },
             };
         }
+        // }
     }
 );
 
diff --git a/pages/myportal/representation.js b/pages/myportal/representation.js
index 07e73ca5..cdc89231 100644
--- a/pages/myportal/representation.js
+++ b/pages/myportal/representation.js
@@ -28,6 +28,8 @@ import {
     setLoggedInUserId,
 } from "../../store/accountDetails/action";
 
+import NoSessionWarning from "../../components/nosession";
+
 const Home = (props) => {
     const { footerLinks, pages } = props;
     let { t, lang } = useTranslation();
@@ -62,6 +64,17 @@ const Home = (props) => {
         updateAccountStore();
     }, [dispatch]);
 
+    const { data: session, status } = useSession();
+
+    if (status === "loading") {
+        return <NoSessionWarning loading={true} />;
+    }
+
+    if (status === "unauthenticated") {
+        router.push("/auth/signin");
+        return <NoSessionWarning />;
+    }
+
     return (
         <div>
             <Head>
diff --git a/pages/myportal/searchresults.js b/pages/myportal/searchresults.js
index 243eb28a..0109ae06 100644
--- a/pages/myportal/searchresults.js
+++ b/pages/myportal/searchresults.js
@@ -84,51 +84,61 @@ export const getServerSideProps = wrapper.getServerSideProps(
 
         let thisSession = await getSession(ctx);
 
-        let [searchResultsObj, loggedInUser] = await Promise.all([
-            await getBasicSearch(query.q),
-            await getPortalLogin(thisSession.user.email),
-        ]);
-
-        const showReps = process.env.SHOWREPRESENTATIONS || false;
-        const showLoginCheck = process.env.SHOWLOGIN || false;
-        store.dispatch(setShowReps(showReps, showLoginCheck));
-
-        console.log("env var ", process.env.SHOWREPRESENTATIONS);
-        store.dispatch(setShowReps(showReps, showLoginCheck));
-
-        searchResultsObj =
-            searchResultsObj.status == 502
-                ? {
-                      value: [],
-                      errorCode: searchResultsObj.status,
-                      errorMsg: searchResultsObj.statusText,
-                  }
-                : searchResultsObj;
-
-        //console.log("sssss", searchResultsObj);
-
-        loggedInUser = loggedInUser.value[0].contactid;
-
-        const watchedCases = await getWatchedCases(loggedInUser);
-
-        console.log("sssss", loggedInUser);
-
-        const [accountDetails, searchDetailsObj, watchedCasesDetails] =
-            await Promise.all([
-                await getPersonalAccount(loggedInUser),
-                await getSearchDetails(searchResultsObj),
-                await getDetails(watchedCases, "myWatchedCases"),
+        if (!thisSession) {
+            console.log("not has sesssion.......");
+            return {
+                redirect: {
+                    destination: "/auth/signin",
+                    permanent: false,
+                },
+            };
+        } else {
+            let [searchResultsObj, loggedInUser] = await Promise.all([
+                await getBasicSearch(query.q),
+                await getPortalLogin(thisSession.user.email),
             ]);
-        store.dispatch(setAccountDetails(accountDetails));
-        store.dispatch(setSearchResults(searchResultsObj));
-        store.dispatch(setSearchDetails(searchDetailsObj));
-        store.dispatch(setSearch(query.q));
-        store.dispatch(setWatchedCases(watchedCases));
-        store.dispatch(setWatchedCasesDetails(watchedCasesDetails));
-        store.dispatch(setLoggedInUserId(loggedInUser));
 
-        thisSession != false &&
-            store.dispatch(setContainerID(thisSession.user.id));
+            const showReps = process.env.SHOWREPRESENTATIONS || false;
+            const showLoginCheck = process.env.SHOWLOGIN || false;
+            store.dispatch(setShowReps(showReps, showLoginCheck));
+
+            console.log("env var ", process.env.SHOWREPRESENTATIONS);
+            store.dispatch(setShowReps(showReps, showLoginCheck));
+
+            searchResultsObj =
+                searchResultsObj.status == 502
+                    ? {
+                          value: [],
+                          errorCode: searchResultsObj.status,
+                          errorMsg: searchResultsObj.statusText,
+                      }
+                    : searchResultsObj;
+
+            //console.log("sssss", searchResultsObj);
+
+            loggedInUser = loggedInUser.value[0].contactid;
+
+            const watchedCases = await getWatchedCases(loggedInUser);
+
+            console.log("sssss", loggedInUser);
+
+            const [accountDetails, searchDetailsObj, watchedCasesDetails] =
+                await Promise.all([
+                    await getPersonalAccount(loggedInUser),
+                    await getSearchDetails(searchResultsObj),
+                    await getDetails(watchedCases, "myWatchedCases"),
+                ]);
+            store.dispatch(setAccountDetails(accountDetails));
+            store.dispatch(setSearchResults(searchResultsObj));
+            store.dispatch(setSearchDetails(searchDetailsObj));
+            store.dispatch(setSearch(query.q));
+            store.dispatch(setWatchedCases(watchedCases));
+            store.dispatch(setWatchedCasesDetails(watchedCasesDetails));
+            store.dispatch(setLoggedInUserId(loggedInUser));
+
+            thisSession != false &&
+                store.dispatch(setContainerID(thisSession.user.id));
+        }
     }
 );
 
diff --git a/pages/myportal/viewall.js b/pages/myportal/viewall.js
index 51064cb3..bcf2da58 100644
--- a/pages/myportal/viewall.js
+++ b/pages/myportal/viewall.js
@@ -8,6 +8,7 @@ import Footer from "../../components/footer";
 import Header from "../../components/header";
 import ViewAll from "../../components/myportal/viewall";
 import TimeOut from "../../components/timeout";
+import { getSession, useSession } from "next-auth/react";
 
 const Home = (props) => {
     const { footerLinks, pages } = props;
@@ -17,6 +18,17 @@ const Home = (props) => {
     const { locale } = router;
     const { appealtypes } = router.query;
 
+    const { data: session, status } = useSession();
+
+    if (status === "loading") {
+        return <NoSessionWarning loading={true} />;
+    }
+
+    if (status === "unauthenticated") {
+        router.push("/auth/signin");
+        return <NoSessionWarning />;
+    }
+
     return (
         <div>
             <Head>
diff --git a/pages/newappeal/[appealtypes].js b/pages/newappeal/[appealtypes].js
index 925516f2..ed383ef3 100644
--- a/pages/newappeal/[appealtypes].js
+++ b/pages/newappeal/[appealtypes].js
@@ -225,6 +225,16 @@ export const getServerSideProps = wrapper.getServerSideProps(
         let thisSession = await getSession(ctx);
         //console.log("nextAuth Session:", thisSession);
 
+        if (!thisSession) {
+            console.log("not has sesssion.......");
+            return {
+                redirect: {
+                    destination: "/auth/signin",
+                    permanent: false,
+                },
+            };
+        }
+
         let loggedInUserIdent = thisSession.user.id;
         let loggedInUserEmail = thisSession.user.email;
 
diff --git a/pages/newappeal/aboutyou.js b/pages/newappeal/aboutyou.js
index 4cf9c7f4..dbf82807 100644
--- a/pages/newappeal/aboutyou.js
+++ b/pages/newappeal/aboutyou.js
@@ -9,6 +9,7 @@ import Header from "../../components/header";
 import Aboutyou from "../../components/newappeal/aboutyou";
 import CreateCase from "../../components/newappeal/createCase";
 import { wrapper } from "../../store/store";
+import { getSession, useSession } from "next-auth/react";
 
 const AboutYou = (props) => {
     const { footerLinks, pages, formData } = props;
@@ -118,6 +119,19 @@ export const getServerSideProps = wrapper.getServerSideProps(
         console.log(cookies);
 
         let loggedInUser = cookies.pinsUser;
+
+        let thisSession = await getSession(ctx);
+        //console.log("nextAuth Session:", thisSession);
+
+        if (!thisSession) {
+            console.log("not has sesssion.......");
+            return {
+                redirect: {
+                    destination: "/auth/signin",
+                    permanent: false,
+                },
+            };
+        }
     }
 );
 
diff --git a/pages/newappeal/index.js b/pages/newappeal/index.js
index eb2c00a8..b736cbc4 100644
--- a/pages/newappeal/index.js
+++ b/pages/newappeal/index.js
@@ -141,39 +141,52 @@ export const getServerSideProps = wrapper.getServerSideProps(
         let thisSession = await getSession(ctx);
         //console.log("nextAuth Session:", thisSession);
 
-        if (_.has(thisSession, "user") == false) {
+        // if (_.has(thisSession, "user") == false) {
+        //     return {
+        //         redirect: {
+        //             destination: "/error",
+        //             permanent: false,
+        //         },
+        //     };
+        // }
+
+        if (!thisSession) {
+            console.log("not has sesssion.......");
             return {
                 redirect: {
-                    destination: "/error",
+                    destination: "/auth/signin",
                     permanent: false,
                 },
             };
+        } else {
+            let loggedInUserIdent = thisSession.user.id;
+            let loggedInUser = cookies.pinsUser;
+
+            console.log("has loggedInUser", loggedInUser);
+
+            const [appealTypeData, lpaData, accountDetails] = await Promise.all(
+                [
+                    await getAppealsTypesForNewAppeal(),
+                    await getLPA(),
+                    await getPersonalAccount(loggedInUser),
+                ]
+            );
+
+            console.log("wewerwe s s", accountDetails);
+
+            // const lpaData = require("../../data/lpa.json");
+            // const appealTypeData = require("../../data/appealtypes.json");
+
+            store.dispatch(setAppealType(appealTypeData));
+            store.dispatch(setLPA(lpaData));
+            store.dispatch(setLoggedInUserId(loggedInUser));
+            store.dispatch(setAccountDetails(accountDetails));
+            store.dispatch(setContainerID(thisSession.user.id));
+
+            return {
+                props: { loggedInUserIdent: loggedInUserIdent },
+            };
         }
-        let loggedInUserIdent = thisSession.user.id;
-        let loggedInUser = cookies.pinsUser;
-
-        console.log("has loggedInUser", loggedInUser);
-
-        const [appealTypeData, lpaData, accountDetails] = await Promise.all([
-            await getAppealsTypesForNewAppeal(),
-            await getLPA(),
-            await getPersonalAccount(loggedInUser),
-        ]);
-
-        console.log("wewerwe s s", accountDetails);
-
-        // const lpaData = require("../../data/lpa.json");
-        // const appealTypeData = require("../../data/appealtypes.json");
-
-        store.dispatch(setAppealType(appealTypeData));
-        store.dispatch(setLPA(lpaData));
-        store.dispatch(setLoggedInUserId(loggedInUser));
-        store.dispatch(setAccountDetails(accountDetails));
-        store.dispatch(setContainerID(thisSession.user.id));
-
-        return {
-            props: { loggedInUserIdent: loggedInUserIdent },
-        };
     }
 );
 
