Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(042) - FIxing some bug on login #42

Merged
merged 5 commits into from
Dec 1, 2023
+29 −38
Merged

(042) - FIxing some bug on login #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1b3016f
refactor : delete some useless code
aaaroz Nov 30, 2023
905df20
fix : auth service get token function
aaaroz Dec 1, 2023
de90641
refactor : set expired credentials at cookies to 1 day
aaaroz Dec 1, 2023
20ee484
Merge branch 'dev' of https://github.com/team-capstone-1/fe-repro-hea…
aaaroz Dec 1, 2023
4a19c0e
refactor (login) : change handle disable when button is submitting
aaaroz Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/apis/APIAuth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const APIAuth = {
}
},
logout: (navigate) => {
authService.clearCredentialsFromCookie(navigate);
authService.clearCredentialsFromCookie();
navigate("/");
},
};
1 change: 0 additions & 1 deletion src/components/layout-components/Sidebar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ export default function Sidebar() {
const selectedKeys = location.pathname.match(regex)[0];

const openLogoutModal = () => {
console.log("Opening Logout Modal");
setShowLogoutModal(true);
};

Expand Down
11 changes: 5 additions & 6 deletions src/services/AuthService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
this.clearCredentialsFromCookie();
return null;
}

return Cookies.get("token");
Expand All @@ -33,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));
}
Expand Down
53 changes: 23 additions & 30 deletions src/views/auth-views/Login.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -213,22 +215,13 @@ const Login = () => {

{/* Button */}
<div className="mt-16">
{isSubmitting ? (
<button
id="submit-button"
className="w-full rounded-lg bg-green-500 px-4 py-4 text-xl font-bold text-grey-10 hover:bg-green-600 disabled:bg-green-700"
disabled
>
Masuk
</button>
) : (
<button
id="submit-button"
className="w-full rounded-lg bg-green-500 px-4 py-4 text-xl font-bold text-grey-10 hover:bg-green-600"
>
Masuk
</button>
)}
<button
id="submit-button"
className="w-full rounded-lg bg-green-500 px-4 py-4 text-xl font-bold text-grey-10 hover:bg-green-600 disabled:bg-green-700"
disabled={isSubmitting}
>
Masuk
</button>
</div>
</form>
</div>
Expand Down