From 1b3016f51a26f878f8e783007a8687b7afb0fd59 Mon Sep 17 00:00:00 2001 From: aaaroz Date: Thu, 30 Nov 2023 21:47:51 +0700 Subject: [PATCH 1/4] refactor : delete some useless code --- src/apis/APIAuth.js | 2 +- src/services/AuthService.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/apis/APIAuth.js b/src/apis/APIAuth.js index 58626bb9..af9a545c 100644 --- a/src/apis/APIAuth.js +++ b/src/apis/APIAuth.js @@ -32,7 +32,7 @@ export const APIAuth = { } }, logout: (navigate) => { - authService.clearCredentialsFromCookie(navigate); + authService.clearCredentialsFromCookie(); navigate("/"); }, }; diff --git a/src/services/AuthService.js b/src/services/AuthService.js index 50f88520..3554abde 100644 --- a/src/services/AuthService.js +++ b/src/services/AuthService.js @@ -20,7 +20,7 @@ export class AuthService { return false; }; - if (!isTokenValid()) { + if (!isTokenValid) { this.clearCredentialsFromCookie(); return null; } From 905df2044c68f47b44983fd1d71a36eb9c3423a6 Mon Sep 17 00:00:00 2001 From: aaaroz Date: Fri, 1 Dec 2023 16:27:02 +0700 Subject: [PATCH 2/4] fix : auth service get token function --- src/services/AuthService.js | 9 ++++----- src/views/auth-views/Login.jsx | 30 ++++++++++++++++-------------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/services/AuthService.js b/src/services/AuthService.js index 3554abde..668b0600 100644 --- a/src/services/AuthService.js +++ b/src/services/AuthService.js @@ -14,15 +14,14 @@ export class AuthService { const token = Cookies.get("token"); if (token) { const decoded = jwtDecode(token); - const currentTime = Date.now() / 1000; - return decoded.exp > currentTime; + // const currentTime = Date.now() / 1000; + // return decoded.exp < currentTime + return decoded.authorized; } return false; }; - - if (!isTokenValid) { + if (!isTokenValid()) { this.clearCredentialsFromCookie(); - return null; } return Cookies.get("token"); diff --git a/src/views/auth-views/Login.jsx b/src/views/auth-views/Login.jsx index 1af34238..df1e5b67 100644 --- a/src/views/auth-views/Login.jsx +++ b/src/views/auth-views/Login.jsx @@ -51,26 +51,28 @@ const Login = () => { const redirectTo = params.get("return_to"); if (isRemembered) { try { - await APIAuth.loginWithRememberMe(data, isRemembered); - if (redirectTo) { - returnTo = `/${redirectTo}`; - return navigate(returnTo); - } else { - navigate(returnTo); - } + await APIAuth.loginWithRememberMe(data, isRemembered).then(() => { + if (redirectTo) { + returnTo = `/${redirectTo}`; + return navigate(returnTo); + } else { + navigate(returnTo); + } + }); } catch (error) { console.error(error); showErrorToast(error.message, "top-right"); } } else { try { - await APIAuth.login(data); - if (redirectTo) { - returnTo = `/${redirectTo}`; - return navigate(returnTo); - } else { - navigate(returnTo); - } + await APIAuth.login(data).then(() => { + if (redirectTo) { + returnTo = `/${redirectTo}`; + return navigate(returnTo); + } else { + navigate(returnTo); + } + }); } catch (error) { console.error(error); showErrorToast(error.message, "top-right"); From de90641d010029dbf252c027ae9d572e69ce1fda Mon Sep 17 00:00:00 2001 From: aaaroz Date: Fri, 1 Dec 2023 16:37:44 +0700 Subject: [PATCH 3/4] refactor : set expired credentials at cookies to 1 day --- src/services/AuthService.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/services/AuthService.js b/src/services/AuthService.js index 668b0600..b9d04596 100644 --- a/src/services/AuthService.js +++ b/src/services/AuthService.js @@ -32,11 +32,11 @@ export class AuthService { storeCredentials({ token, isRemembered, data }) { if (!isRemembered) { - const expires = new Date(new Date().getTime() + 60 * 60 * 1000); + const expires = new Date(new Date().getTime() + 24 * 60 * 60 * 1000); Cookies.set("token", token, { expires }); localStorage.removeItem("data"); } else { - const expires = new Date(new Date().getTime() + 60 * 60 * 1000); + const expires = new Date(new Date().getTime() + 24 * 60 * 60 * 1000); Cookies.set("token", token, { expires }); localStorage.setItem("data", JSON.stringify(data)); } From 4a19c0e314d87b2c732e76a1bf24dee3ce8aa29a Mon Sep 17 00:00:00 2001 From: aaaroz Date: Fri, 1 Dec 2023 17:02:39 +0700 Subject: [PATCH 4/4] refactor (login) : change handle disable when button is submitting --- src/components/layout-components/Sidebar.jsx | 1 - src/views/auth-views/Login.jsx | 23 ++++++-------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/src/components/layout-components/Sidebar.jsx b/src/components/layout-components/Sidebar.jsx index 249d170d..938c9661 100644 --- a/src/components/layout-components/Sidebar.jsx +++ b/src/components/layout-components/Sidebar.jsx @@ -20,7 +20,6 @@ export default function Sidebar() { const selectedKeys = location.pathname.match(regex)[0]; const openLogoutModal = () => { - console.log("Opening Logout Modal"); setShowLogoutModal(true); }; diff --git a/src/views/auth-views/Login.jsx b/src/views/auth-views/Login.jsx index df1e5b67..43fa57fe 100644 --- a/src/views/auth-views/Login.jsx +++ b/src/views/auth-views/Login.jsx @@ -215,22 +215,13 @@ const Login = () => { {/* Button */}
- {isSubmitting ? ( - - ) : ( - - )} +