Merge pull request #1107 from AletheiaFact/fixed-whoami-request-every…

…-time-on-sidebar-click Fixed ory whoami request every time on sidebar click
AletheiaFact · Nov 19, 2023 · df38e09 · df38e09
2 parents 43d9036 + be74f2a
commit df38e09
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git a/src/components/MainApp.tsx b/src/components/MainApp.tsx
@@ -1,17 +1,9 @@
 import { Layout } from "antd";
-import { useSetAtom } from "jotai";
 import React from "react";
-import {
-    currentAuthentication,
-    currentUserId,
-    currentUserRole,
-    isUserLoggedIn,
-} from "../atoms/currentUser";
 
 import { useMediaQueryBreakpoints } from "../hooks/useMediaQueryBreakpoints";
 import { useAppSelector } from "../store/store";
 import colors from "../styles/colors";
-import { GetUserRole } from "../utils/GetUserRole";
 import ClaimReviewDrawer from "./ClaimReview/ClaimReviewDrawer";
 import ContentWrapper from "./ContentWrapper";
 import Footer from "./Footer/Footer";
@@ -26,16 +18,6 @@ const MainApp = ({ children }) => {
             enableOverlay: state?.search?.overlayVisible,
         };
     });
-    const setCurrentRole = useSetAtom(currentUserRole);
-    const setCurrentLoginStatus = useSetAtom(isUserLoggedIn);
-    const setCurrentUserId = useSetAtom(currentUserId);
-    const setCurrentLevelAuthentication = useSetAtom(currentAuthentication);
-    GetUserRole().then(({ role, isLoggedIn, id, aal }) => {
-        setCurrentRole(role);
-        setCurrentLoginStatus(isLoggedIn);
-        setCurrentUserId(id);
-        setCurrentLevelAuthentication(aal);
-    });
 
     // Setup to provide breakpoints object on redux
     useMediaQueryBreakpoints();

diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
@@ -12,10 +12,30 @@ import colors from "../styles/colors";
 import { DefaultSeo } from "next-seo";
 import { CssBaseline, ThemeProvider } from "@mui/material";
 import { materialTheme } from "../styles/materialTheme";
+import { useSetAtom } from "jotai";
+import {
+    currentAuthentication,
+    currentUserId,
+    currentUserRole,
+    isUserLoggedIn,
+} from "../atoms/currentUser";
+import { GetUserRole } from "../utils/GetUserRole";
 
 function MyApp({ Component, pageProps }) {
     const store = useStore();
     const { t } = useTranslation();
+    const setCurrentRole = useSetAtom(currentUserRole);
+    const setCurrentLoginStatus = useSetAtom(isUserLoggedIn);
+    const setCurrentUserId = useSetAtom(currentUserId);
+    const setCurrentLevelAuthentication = useSetAtom(currentAuthentication);
+
+    GetUserRole().then(({ role, isLoggedIn, id, aal }) => {
+        setCurrentRole(role);
+        setCurrentLoginStatus(isLoggedIn);
+        setCurrentUserId(id);
+        setCurrentLevelAuthentication(aal);
+    });
+
     return (
         <>
             <Head>