diff --git a/src/app/components/SideBar.js b/src/app/components/SideBar.js index 46c95be9bccae09a7823dd291e65df5d6ce95415..250ff3a566d60e937b81cdf2ef9d6f8bcc77e0f1 100644 --- a/src/app/components/SideBar.js +++ b/src/app/components/SideBar.js @@ -102,14 +102,6 @@ export default function SideBar({ setFilterState, filterState }) { const loggedIn = useLoggedIn(); const [id, setId] = useState(null); - useEffect(() => { - if (loggedIn) { - let data = userData(); - console.log(data, "ALKSDJLAKSJD"); - setId(data?.user["id"]); - } - }, [loggedIn]); - const getHref = (href) => { switch (href) { case "/sobre": @@ -144,6 +136,14 @@ export default function SideBar({ setFilterState, filterState }) { } }; + useEffect(() => { + if (loggedIn) { + let data = userData(); + console.log(data, "ALKSDJLAKSJD"); + setId(data?.["id"]); + } + }, [loggedIn]); + return ( <> <NeedLoginModal open={needLoginOpen} setOpen={setNeedLoginOpen} /> diff --git a/src/app/entrar/page.js b/src/app/entrar/page.js index 0703538ad206ea74a80d10c6932eac639fd2be94..41d851442eb6e1899fab8b8d72ffdb6776e4fd40 100644 --- a/src/app/entrar/page.js +++ b/src/app/entrar/page.js @@ -13,7 +13,7 @@ import { ThemeProvider } from "@emotion/react"; import theme from "../theme"; import LoginInfo from "./components/LoginInfo"; import AcessibilityBar from "../components/AcessibilityBar"; -import { logIn } from "../handlers/loginHandler"; +import { logIn, updateAccessToken } from "../handlers/loginHandler"; function Login() { const [userEmail, setUserEmail] = useState(""); @@ -22,19 +22,24 @@ function Login() { const [suggestionMessage, setSuggestionMessage] = useState(""); const [isFirstLetterUpperCase, setIsFirstLetterUpperCase] = useState(false); const searchParams = useSearchParams(); - const access_token = getStoredValue("access_token"); + const router = useRouter(); + + if (searchParams.has("token")) { + updateAccessToken(searchParams.get("token")).then(() => { + router.push("/sobre"); + }) + } // Obtendo os parâmetros de busca const redirectUrl = searchParams.get("redirect") ? searchParams.get("redirect") + (searchParams.get("params") ? `?${searchParams.get("params")}` : '') : "/sobre"; // Redireciona para /sobre se não houver valor - const router = useRouter(); const handleEmailChange = (e) => { const emailValue = e.target.value; setUserEmail(emailValue); - // Verifica se a primeira letra é maiúscula + // Verifica se a primeira letra é maiúscula if (emailValue.length > 0) { const firstLetter = emailValue.charAt(0); setIsFirstLetterUpperCase(firstLetter === firstLetter.toUpperCase()); diff --git a/src/app/handlers/loginHandler.js b/src/app/handlers/loginHandler.js index 72f45758f169f35703810fd5c4c2dc80752aafff..a7445782fcd769533c3e8f0b08e883518e7ae550 100644 --- a/src/app/handlers/loginHandler.js +++ b/src/app/handlers/loginHandler.js @@ -56,11 +56,15 @@ export function logIn(email, password) { }) .then((response) => { const token = response.data['token']; - localStorage.setItem('token', token); - fetchUser(); + updateAccessToken(token); }); } +export async function updateAccessToken(token) { + localStorage.setItem('token', token); + await fetchUser(); +} + export function logOut() { localStorage.removeItem('token'); localStorage.removeItem('user_data');