cheveguerra/whaticket-community
1
0
Fork 0
mirror of https://github.com/cheveguerra/whaticket-community.git synced 2026-04-20 20:59:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: error in session handler after login / create account

Browse Source
This commit is contained in:
canove
2020-10-04 15:22:59 -03:00
parent 87e4a73e05
commit eb49531924
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
frontend/src/context/Auth/useAuth.js
View File

@@ -12,6 +12,13 @@ const useAuth = () => {
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
useEffect(() => { useEffect(() => {
if (
history.location.pathname === "/login" ||
history.location.pathname === "/signup"
) {
setLoading(false);
return;
}
const token = localStorage.getItem("token"); const token = localStorage.getItem("token");
if (token) { if (token) {
api.defaults.headers.Authorization = `Bearer ${JSON.parse(token)}`; api.defaults.headers.Authorization = `Bearer ${JSON.parse(token)}`;
@@ -61,10 +68,10 @@ const useAuth = () => {
return Promise.reject(error); return Promise.reject(error);
} }
); );
}, []); }, [history]);
const handleLogin = async (e, user) => { const handleLogin = async (e, user) => {
// setLoading(true); setLoading(true);
e.preventDefault(); e.preventDefault();
try { try {
const { data } = await api.post("/auth/login", user); const { data } = await api.post("/auth/login", user);
@@ -75,18 +82,19 @@ const useAuth = () => {
api.defaults.headers.Authorization = `Bearer ${data.token}`; api.defaults.headers.Authorization = `Bearer ${data.token}`;
setIsAuth(true); setIsAuth(true);
toast.success(i18n.t("auth.toasts.success")); toast.success(i18n.t("auth.toasts.success"));
// setLoading(false); setLoading(false);
history.push("/tickets"); history.push("/tickets");
} catch (err) { } catch (err) {
console.log(err); console.log(err);
if (err.response && err.response.data && err.response.data.error) { if (err.response && err.response.data && err.response.data.error) {
toast.error(err.response.data.error); toast.error(err.response.data.error);
} }
setLoading(false);
} }
}; };
const handleLogout = e => { const handleLogout = e => {
// setLoading(true); setLoading(true);
e.preventDefault(); e.preventDefault();
setIsAuth(false); setIsAuth(false);
localStorage.removeItem("token"); localStorage.removeItem("token");
@@ -94,7 +102,7 @@ const useAuth = () => {
localStorage.removeItem("profile"); localStorage.removeItem("profile");
localStorage.removeItem("userId"); localStorage.removeItem("userId");
api.defaults.headers.Authorization = undefined; api.defaults.headers.Authorization = undefined;
// setLoading(false); setLoading(false);
history.push("/login"); history.push("/login");
}; };