From bd88713468375e6c3500885825e57475fd0040e4 Mon Sep 17 00:00:00 2001
From: Saddock Kabandana <aimegetz@gmail.com>
Date: Fri, 4 Oct 2024 09:43:39 +0200
Subject: [PATCH] fixes #168 auth and admin login (#169)

---
 src/components/form/SignInForm.tsx | 2 +-
 src/components/profileDropdown.tsx | 2 +-
 src/pages/LoginPage.tsx            | 9 +++++----
 src/pages/LogoutPage.tsx           | 2 +-
 src/pages/PageNotFound.tsx         | 2 +-
 src/redux/actions/axiosconfig.ts   | 3 +--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/form/SignInForm.tsx b/src/components/form/SignInForm.tsx
index a8a5c17c4..0b02d7d06 100644
--- 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
index 638778dc5..62e995589 100755
--- 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
index c7841897c..8be217c3a 100644
--- 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
index f849c923f..066c25711 100644
--- 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
index baa8b4962..769e1816e 100644
--- 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
index aba173562..ae5d6cc1b 100755
--- 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;
   },