fixes #168 auth and admin login (#169)

atlp-rwanda · Oct 10, 2024 · 3290dc7 · 3290dc7
1 parent aedc9c2
commit 3290dc7
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/src/components/form/SignInForm.tsx b/src/components/form/SignInForm.tsx
@@ -60,7 +60,7 @@ const LoginForm = () => {
       const role = localStorage.getItem("roleName") as string;
       if (role === "applicant") {
         navigate("/applicant");
-      } else if (role === "superAdmin") {
+      } else if (role === "superAdmin" || role === "admin") {
         navigate("/admin");
       } else {
         const searchParams = new URLSearchParams(location.search);

diff --git a/src/components/profileDropdown.tsx b/src/components/profileDropdown.tsx
@@ -49,7 +49,7 @@ function ProfileDropdown({
           <div
             className="w-full p-3 flex flex-row align-center justify-start text-gray-900 dark:text-black -100 dark:hover:bg-gray-300 dark:hover:text-gray-900  hover:bg-gray-600 hover:rounded-b-[20px] hover:text-gray-100 "
             onClick={() => {
-              localStorage.removeItem("access_token");
+              localStorage.clear();
             }}
           >
             <Link

diff --git a/src/pages/LoginPage.tsx b/src/pages/LoginPage.tsx
@@ -49,10 +49,11 @@ const LoginPage = (props: any) => {
 }
   `;
 
-  return authenticated && roleName === "applicant" ? 
-    <Navigate to="/applicant" /> : authenticated && roleName === "superAdmin" ? <Navigate to="/" />
-   : 
-  (
+  return authenticated && roleName === "applicant" ? (
+    <Navigate to="/applicant" />
+  ) : authenticated && (roleName === "superAdmin" || roleName === "admin") ? (
+    <Navigate to="/admin" />
+  ) : (
     <>
       <div className="flex items-center dark:bg-zinc-800 ">
         <div

diff --git a/src/pages/LogoutPage.tsx b/src/pages/LogoutPage.tsx
@@ -4,7 +4,7 @@ import { Icon } from "@iconify/react";
 const LogoutPage = () => {
   const navigate = useNavigate();
   const handleLogout = async (e: any) => {
-    localStorage.removeItem("access_token");
+    localStorage.clear();
     navigate("/login");
   };
   return (

diff --git a/src/pages/PageNotFound.tsx b/src/pages/PageNotFound.tsx
@@ -13,7 +13,7 @@ const PageNotFound = () => {
             <Link to="/applicant">
               <button>Go to Applicant Dashboard</button>
             </Link>
-          ) : role === "superAdmin" ? (
+          ) : (role === "superAdmin" || role === "admin") ? (
             <Link to="/admin">
             <button>Go back to Homepage</button>
           </Link>

diff --git a/src/redux/actions/axiosconfig.ts b/src/redux/actions/axiosconfig.ts
@@ -8,8 +8,7 @@ config.interceptors.request.use(
   (config) => {
     const token = localStorage.getItem("access_token");
     if (token) {
-      config.headers = config.headers || {};
-      config.headers["Authorization"] = `Bearer ${token}`;
+      config.headers["Authorization"] = `${token}`;
     }
     return config;
   },