taken suggestion from ai and fixed test cases

Author: PurnenduMIshra129th

docs/docs/auto-docs/components/CheckIn/types/enumerations/UserRole.md

@@ -0,0 +1,31 @@
+[Admin Docs](/)
+
+***
+
+# Enumeration: UserRole
+
+Defined in: [src/components/CheckIn/types.ts:45](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/components/CheckIn/types.ts#L45)
+
+## Enumeration Members
+
+### ADMIN
+
+> **ADMIN**: `"admin"`
+
+Defined in: [src/components/CheckIn/types.ts:47](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/components/CheckIn/types.ts#L47)
+
+***
+
+### SUPER\_ADMIN
+
+> **SUPER\_ADMIN**: `"superAdmin"`
+
+Defined in: [src/components/CheckIn/types.ts:48](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/components/CheckIn/types.ts#L48)
+
+***
+
+### USER
+
+> **USER**: `"user"`
+
+Defined in: [src/components/CheckIn/types.ts:46](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/components/CheckIn/types.ts#L46)

docs/docs/auto-docs/components/CheckIn/types/type-aliases/VerifyRoleResponse.md

@@ -0,0 +1,23 @@
+[Admin Docs](/)
+
+***
+
+# Type Alias: VerifyRoleResponse
+
+> **VerifyRoleResponse**: `object`
+
+Defined in: [src/components/CheckIn/types.ts:51](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/components/CheckIn/types.ts#L51)
+
+## Type declaration
+
+### verifyRole
+
+> **verifyRole**: `object`
+
+#### verifyRole.isAuthorized
+
+> **isAuthorized**: `boolean`
+
+#### verifyRole.role
+
+> **role**: [`UserRole`](../enumerations/UserRole.md)

docs/docs/auto-docs/components/SecuredRoute/SecuredRoute/functions/default.md

@@ -6,7 +6,7 @@
 
 > **default**(): `Element`
 
-Defined in: [src/components/SecuredRoute/SecuredRoute.tsx:18](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/components/SecuredRoute/SecuredRoute.tsx#L18)
+Defined in: [src/components/SecuredRoute/SecuredRoute.tsx:19](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/components/SecuredRoute/SecuredRoute.tsx#L19)
 
 A route guard that checks if the user is logged in and has the necessary permissions.
 

docs/docs/auto-docs/components/UserPortal/SecuredRouteForUser/SecuredRouteForUser/functions/default.md

@@ -6,7 +6,7 @@
 
 > **default**(): `Element`
 
-Defined in: [src/components/UserPortal/SecuredRouteForUser/SecuredRouteForUser.tsx:16](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/components/UserPortal/SecuredRouteForUser/SecuredRouteForUser.tsx#L16)
+Defined in: [src/components/UserPortal/SecuredRouteForUser/SecuredRouteForUser.tsx:18](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/components/UserPortal/SecuredRouteForUser/SecuredRouteForUser.tsx#L18)
 
 A component that guards routes by checking if the user is logged in.
 If the user is logged in and does not have 'AdminFor' set, the child routes are rendered.

src/components/CheckIn/types.ts

@@ -42,3 +42,15 @@ export interface InterfaceTableData {
   id: string;
   checkInData: InterfaceTableCheckIn;
 }
+export enum UserRole {
+  USER = 'user',
+  ADMIN = 'admin',
+  SUPER_ADMIN = 'superAdmin',
+}
+
+export type VerifyRoleResponse = {
+  verifyRole: {
+    isAuthorized: boolean;
+    role: UserRole;
+  };
+};

src/components/SecuredRoute/SecuredRoute.tsx

@@ -1,4 +1,5 @@
 import { useQuery } from '@apollo/client';
+import { UserRole, type VerifyRoleResponse } from 'components/CheckIn/types';
 import { VERIFY_ROLE } from 'GraphQl/Queries/Queries';
 import React, { useEffect } from 'react';
 import { Navigate, Outlet, useLocation } from 'react-router-dom';
@@ -17,14 +18,17 @@ const { getItem, setItem } = useLocalStorage();
  */
 const SecuredRoute = (): JSX.Element => {
   const location = useLocation();
-  const { data, loading, error, refetch } = useQuery(VERIFY_ROLE, {
-    skip: !getItem('token'),
-    context: {
-      headers: {
-        Authorization: `Bearer ${getItem('token')}`,
+  const { data, loading, error, refetch } = useQuery<VerifyRoleResponse>(
+    VERIFY_ROLE,
+    {
+      skip: !getItem('token'),
+      context: {
+        headers: {
+          Authorization: `Bearer ${getItem('token')}`,
+        },
       },
     },
-  });
+  );
   const [token, setToken] = React.useState(getItem('token'));
 
   useEffect(() => {
@@ -43,13 +47,13 @@ const SecuredRoute = (): JSX.Element => {
   } else if (error) {
     return <div>Error During Routing ...</div>;
   } else {
-    const role = data?.verifyRole?.role || '';
-    const isLoggedIn = data?.verifyRole?.isAuthorized ?? false;
+    const { isAuthorized = false, role = '' } = (data as VerifyRoleResponse)
+      .verifyRole;
     const restrictedRoutesForAdmin = ['/member', '/users', '/communityProfile'];
-    if (isLoggedIn) {
-      if (role == 'superAdmin') {
+    if (isAuthorized) {
+      if (role == UserRole.SUPER_ADMIN) {
         return <Outlet />;
-      } else if (role == 'admin') {
+      } else if (role == UserRole.ADMIN) {
         if (restrictedRoutesForAdmin.includes(location.pathname)) {
           return <PageNotFound />;
         }

src/components/UserPortal/SecuredRouteForUser/SecuredRouteForUser.tsx

@@ -1,4 +1,6 @@
 import { useQuery } from '@apollo/client';
+import type { VerifyRoleResponse } from 'components/CheckIn/types';
+import { UserRole } from 'components/CheckIn/types';
 import { VERIFY_ROLE } from 'GraphQl/Queries/Queries';
 import React, { useEffect } from 'react';
 import { Navigate, Outlet } from 'react-router-dom';
@@ -16,27 +18,44 @@ import useLocalStorage from 'utils/useLocalstorage';
 const SecuredRouteForUser = (): JSX.Element => {
   // Custom hook to interact with local storage
   const { getItem } = useLocalStorage();
-  const { data, loading, error, refetch } = useQuery(VERIFY_ROLE, {
-    context: {
-      headers: {
-        Authorization: `Bearer ${getItem('token')}`,
+  const { data, loading, error, refetch } = useQuery<VerifyRoleResponse>(
+    VERIFY_ROLE,
+    {
+      skip: !getItem('token'),
+      context: {
+        headers: {
+          Authorization: `Bearer ${getItem('token')}`,
+        },
       },
     },
-  });
+  );
+  const [token, setToken] = React.useState(getItem('token'));
+
+  useEffect(() => {
+    const newToken = getItem('token');
+    if (newToken !== token) {
+      setToken(newToken);
+    }
+  }, []);
+
   useEffect(() => {
     refetch(); // Refetch when token updates
-  }, [getItem('token')]);
+  }, [token]);
 
   if (loading) {
     return <div> Loading.....</div>;
   } else if (error) {
     return <div>Error During Routing ...</div>;
   } else {
-    const role = data?.verifyRole?.role || '';
-    const isLoggedIn = data?.verifyRole?.isAuthorized ?? false;
+    const { isAuthorized = false, role = '' } = (data as VerifyRoleResponse)
+      .verifyRole;
 
-    if (isLoggedIn) {
-      if (role == 'user' || role == 'admin' || role == 'superAdmin') {
+    if (isAuthorized) {
+      if (
+        role == UserRole.USER ||
+        role == UserRole.ADMIN ||
+        UserRole.SUPER_ADMIN
+      ) {
         return <Outlet />;
       } else {
         return <PageNotFound />;

src/screens/PageNotFound/PageNotFound.spec.tsx

@@ -9,19 +9,38 @@ import PageNotFound from './PageNotFound';
 import i18nForTest from 'utils/i18nForTest';
 import useLocalStorage from 'utils/useLocalstorage';
 import { it, expect, describe } from 'vitest';
+import type { NormalizedCacheObject } from '@apollo/client';
+import {
+  ApolloClient,
+  ApolloLink,
+  ApolloProvider,
+  InMemoryCache,
+} from '@apollo/client';
 const { setItem } = useLocalStorage();
 
+const link = new ApolloLink((operation, forward) => {
+  return forward(operation);
+});
+
+const client: ApolloClient<NormalizedCacheObject> = new ApolloClient({
+  cache: new InMemoryCache(),
+  link: ApolloLink.from([link]),
+});
+
 describe('Testing Page not found component', () => {
   it('should render component properly for User', () => {
-    //setItem('AdminFor', undefined);
     render(
-      <BrowserRouter>
-        <Provider store={store}>
-          <I18nextProvider i18n={i18nForTest}>
-            <PageNotFound />
-          </I18nextProvider>
-        </Provider>
-      </BrowserRouter>,
+      <ApolloProvider client={client}>
+        {' '}
+        {/* ✅ Add ApolloProvider */}
+        <BrowserRouter>
+          <Provider store={store}>
+            <I18nextProvider i18n={i18nForTest}>
+              <PageNotFound />
+            </I18nextProvider>
+          </Provider>
+        </BrowserRouter>
+      </ApolloProvider>,
     );
 
     expect(screen.getByText(/Talawa User/i)).toBeInTheDocument();
@@ -40,13 +59,15 @@ describe('Testing Page not found component', () => {
       },
     ]);
     render(
-      <BrowserRouter>
-        <Provider store={store}>
-          <I18nextProvider i18n={i18nForTest}>
-            <PageNotFound />
-          </I18nextProvider>
-        </Provider>
-      </BrowserRouter>,
+      <ApolloProvider client={client}>
+        <BrowserRouter>
+          <Provider store={store}>
+            <I18nextProvider i18n={i18nForTest}>
+              <PageNotFound />
+            </I18nextProvider>
+          </Provider>
+        </BrowserRouter>
+      </ApolloProvider>,
     );
 
     expect(screen.getByText(/Talawa Admin Portal/i)).toBeInTheDocument();