useauth

cabinetoffice · Nov 8, 2023 · c44534d · c44534d
1 parent 34dd6ea
commit c44534d
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 25 deletions.
diff --git a/pages/_app.js b/pages/_app.js
@@ -1,6 +1,6 @@
 import Script from 'next/script';
 import nookies from 'nookies';
-import React, { createContext, useEffect } from 'react';
+import React, { createContext, useContext, useEffect } from 'react';
 import TagManager from 'react-gtm-module';
 import '../src/lib/ie11_nodelist_polyfill';
 import '../styles/globals.scss';
@@ -10,6 +10,8 @@ import App from 'next/app';
 
 export const AuthContext = createContext({ isUserLoggedIn: false });
 
+export const useAuth = () => useContext(AuthContext);
+
 const MyApp = ({ Component, pageProps, isUserLoggedIn }) => {
   const cookies = nookies.get({});
 

diff --git a/pages/grants/index.js b/pages/grants/index.js
@@ -1,7 +1,7 @@
 import Head from 'next/head';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
-import React, { useContext } from 'react';
+import React from 'react';
 import ErrorBanner from '../../src/components/displayErrors/errorBanner/ErrorBanner';
 import { NewsletterCallToAction } from '../../src/components/newsletter/NewsletterCallToAction';
 import { Pagination } from '../../src/components/pagination/Pagination';
@@ -22,7 +22,6 @@ import {
   extractFiltersFields,
   generateSearchHeadingFromDateRange,
 } from '../../src/utils/transform';
-import { AuthContext } from '../_app';
 
 const conditionallyClearFiltersFromQuery = (
   clearFilters,
@@ -129,7 +128,6 @@ const BrowseByCategory = ({
   titleContent,
 }) => {
   const router = useRouter();
-  const { isUserLoggedIn } = useContext(AuthContext);
 
   const handleSortByChange = (sort) => {
     const newQuery = {
@@ -148,7 +146,7 @@ const BrowseByCategory = ({
       <Head>
         <title>{titleContent}</title>
       </Head>
-      <Layout isUserLoggedIn={isUserLoggedIn} description="Find a grant">
+      <Layout description="Find a grant">
         <div className="govuk-!-margin-top-3 govuk-!-margin-bottom-0 padding-bottom40">
           <Link href={{ pathname: '../', query: { searchTerm } }}>
             <a className="govuk-back-link" data-cy="cyBrowseBackText">

diff --git a/pages/index.js b/pages/index.js
@@ -26,12 +26,7 @@ export function getServerSideProps({ query }) {
   };
 }
 
-const Home = ({
-  searchTerm,
-  applicantUrl,
-  oneLoginEnabled,
-  isUserLoggedIn,
-}) => {
+const Home = ({ searchTerm, applicantUrl, oneLoginEnabled }) => {
   return (
     <>
       <Head>
@@ -41,7 +36,7 @@ const Home = ({
         />
         <title>Home - Find a grant</title>
       </Head>
-      <Layout isUserLoggedIn={isUserLoggedIn} description="Find a grant">
+      <Layout description="Find a grant">
         <div className="govuk-width-container ">
           <div className="govuk-grid-row">
             <div className="govuk-grid-column-full govuk-!-margin-top-5 govuk-!-margin-bottom-5">

diff --git a/pages/notifications/manage-notifications/index.tsx b/pages/notifications/manage-notifications/index.tsx
@@ -339,7 +339,7 @@ const ManageNotifications = (props) => {
       <Head>
         <title>{gloss.title}</title>
       </Head>
-      <Layout isUserLoggedIn={props.isUserLoggedIn}>
+      <Layout>
         <div className="govuk-grid-row govuk-body padding-bottom40 govuk-!-margin-top-9">
           {!!urlAction && !hideConfirmationMessage && (
             <ConfirmationMessage

diff --git a/pages/notifications/unsubscribe/[slug].js b/pages/notifications/unsubscribe/[slug].js
@@ -72,19 +72,14 @@ export async function getServerSideProps(ctx) {
   };
 }
 
-function notifications({
-  unsubscribeGrant,
-  email,
-  grantDetails,
-  isUserLoggedIn,
-}) {
+function notifications({ unsubscribeGrant, email, grantDetails }) {
   unsubscribeGrant = JSON.parse(unsubscribeGrant);
   return (
     <>
       <Head>
         <title>{gloss.title}</title>
       </Head>
-      <Layout isUserLoggedIn={isUserLoggedIn} description="Notifications">
+      <Layout description="Notifications">
         <div className="govuk-!-margin-top-3 govuk-!-margin-bottom-0 padding-bottom-0">
           <a
             href={`${notificationRoutes.manageNotifications}`}

diff --git a/src/components/partials/Layout.js b/src/components/partials/Layout.js
@@ -2,12 +2,10 @@ import { useEffect } from 'react';
 import CookieBanner from './cookie-banner';
 import Footer from './Footer';
 import { Header } from './header';
+import { useAuth } from '../../../pages/_app';
 
-const Layout = ({
-  children,
-  isBasicHeader = false,
-  isUserLoggedIn = false,
-}) => {
+const Layout = ({ children, isBasicHeader = false }) => {
+  const { isUserLoggedIn } = useAuth();
   const clx = ['js-enabled', 'govuk-template__body'];
   useEffect(() => {
     document.querySelector('body').classList.add(...clx);