stage-test

Author: av1choudharyy

.env

@@ -1,2 +1 @@
-VITE_BACKEND_URL=https://api.beejho.in
-VITE_ORDER_WEBSOCKET_URL=wss://ms4ld443q8.execute-api.ap-south-1.amazonaws.com
+VITE_BACKEND_URL=https://stg-api.beejho.in

src/components/admin/common/RestaurantLogin.tsx

@@ -155,34 +155,32 @@ export default function RestaurantLogin({
                   };
                 });
                 await axiosInstance
-                  .post('/v0/restaurantLogin', {
-                    userId: state.userId,
-                    password: state.password,
-                    restaurantId,
-                  })
-                  .then(async (loginResult) => {
+                  .post(
+                    '/v0/restaurantLogin',
+                    {
+                      userId: state.userId,
+                      password: state.password,
+                      restaurantId,
+                    },
+                    { withCredentials: true },
+                  ) // Ensure cookies are sent
+                  .then(() => {
                     setShowLogin(false);
-                    localStorage.setItem('jwt', loginResult.data.jwt);
-                    axiosInstance.defaults.headers['authorization'] = `Bearer ${loginResult.data.jwt}`;
                     if (succesfullLoginCallback) succesfullLoginCallback();
                   })
                   .catch((e) => {
                     console.log(e);
-                    setState((prevState) => {
-                      return {
-                        ...prevState,
-                        authError: e.response.data?.message,
-                      };
-                    });
+                    setState((prevState) => ({
+                      ...prevState,
+                      authError: e.response.data?.message || 'Login failed',
+                    }));
                     if (failedLoginCallback) failedLoginCallback();
                   })
                   .finally(() => {
-                    setState((prevState) => {
-                      return {
-                        ...prevState,
-                        isLoading: false,
-                      };
-                    });
+                    setState((prevState) => ({
+                      ...prevState,
+                      isLoading: false,
+                    }));
                   });
               }}
             >

src/contexts/AuthContext.tsx

@@ -0,0 +1,55 @@
+import { createContext, useContext, useEffect, useState } from 'react';
+import axiosInstance from '../utils/axios';
+import { useParams } from 'react-router-dom';
+// import { useNavigate } from 'react-router-dom';
+
+interface AuthContextType {
+  isAuthenticated: boolean;
+  checkAuth: () => Promise<void>;
+  isLoading: boolean;
+  // logout: () => void;
+}
+
+const AuthContext = createContext<AuthContextType | null>(null);
+
+export function AuthProvider({ children }: { children: React.ReactNode }) {
+  const [isAuthenticated, setIsAuthenticated] = useState<boolean>(false);
+  const [isLoading, setIsLoading] = useState(true);
+  // const navigate = useNavigate();
+
+  // Function to check authentication status by verifying cookie
+  const { restaurantId } = useParams();
+  const checkAuth = async () => {
+    try {
+      await axiosInstance.get(`/v0/restaurant/${restaurantId}/getRestaurantOrderDetails`);
+      setIsAuthenticated(true);
+    } catch {
+      setIsAuthenticated(false);
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  // // Logout function to clear the cookie
+  // const logout = async () => {
+  //   await axiosInstance.post('/v0/logout', {}, { withCredentials: true });
+  //   setIsAuthenticated(false);
+  //   w('/login'); // Redirect to login page
+  // };
+
+  // Check authentication on mount
+  useEffect(() => {
+    checkAuth();
+  }, []);
+
+  return <AuthContext.Provider value={{ isAuthenticated, checkAuth, isLoading }}>{children}</AuthContext.Provider>;
+}
+
+// Custom hook to use authentication
+export function useAuth() {
+  const context = useContext(AuthContext);
+  if (!context) {
+    throw new Error('useAuth must be used within an AuthProvider');
+  }
+  return context;
+}

src/contexts/UserContext.tsx

@@ -13,6 +13,9 @@ import { MenuProvider } from './contexts/CartContext';
 import UserOrders from './routes/UserOrders';
 import Dashboard from './routes/Dashboard';
 import RestaurantOrders from './routes/RestaurantOrders';
+import ProtectedRoute from './routes/ProtectedRoutes';
+import { AuthProvider } from './contexts/AuthContext';
+import RestaurantLogin from './components/admin/common/RestaurantLogin';
 
 const router = createBrowserRouter([
   {
@@ -28,20 +31,17 @@ const router = createBrowserRouter([
     element: <UserOrders />,
   },
   {
-    path: '/:restaurantId/admin/dashboard',
-    element: <Dashboard />,
+    path: '/:restaurantId/admin',
+    element: <ProtectedRoute />,
+    children: [
+      { path: 'dashboard', element: <Dashboard /> },
+      { path: 'editMenu', element: <Menu admin /> },
+      { path: 'orders', element: <RestaurantOrders /> },
+    ],
   },
-  // {
-  //   path: '/:restaurantId/trending',
-  //   element: <Trending />,
-  // },
   {
-    path: '/:restaurantId/admin/editMenu',
-    element: <Menu admin />,
-  },
-  {
-    path: '/:restaurantId/admin/orders',
-    element: <RestaurantOrders />,
+    path: '/login',
+    element: <RestaurantLogin showLogin={true} setShowLogin={() => {}} />,
   },
   {
     path: '*',
@@ -64,7 +64,9 @@ createRoot(document.getElementById('root')!).render(
   <StrictMode>
     <ThemeProvider theme={theme}>
       <MenuProvider>
-        <RouterProvider router={router} />
+        <AuthProvider>
+          <RouterProvider router={router} />
+        </AuthProvider>
       </MenuProvider>
     </ThemeProvider>
   </StrictMode>,

src/main.tsx

@@ -0,0 +1,12 @@
+import { Navigate, Outlet } from 'react-router-dom';
+import { useAuth } from '../contexts/AuthContext';
+
+export default function ProtectedRoute() {
+  const auth = useAuth();
+  console.log('auth', auth);
+  if (!auth?.isLoading && auth?.isAuthenticated === false) {
+    return <Navigate to='/login' replace />;
+  }
+
+  return <Outlet />;
+}