put the login page back

This commit is contained in:
Carter 2025-06-25 09:45:02 -06:00
parent 15d2a6a690
commit c7848a25ef
4 changed files with 60 additions and 42 deletions

View file

@ -1,7 +1,6 @@
import { RedirectLoginOptions, useAuth0 } from "@auth0/auth0-react";
import queryString from "query-string";
import { PropsWithChildren, useCallback, useEffect } from "react";
import { useLocation } from "react-router-dom";
import { PropsWithChildren, useEffect } from "react";
interface Props extends PropsWithChildren<any>{
setToken: React.Dispatch<React.SetStateAction<string | undefined>>
@ -9,7 +8,7 @@ interface Props extends PropsWithChildren<any>{
}
export default function AuthWrapper(props: Props) {
const { children, setToken, prevPath } = props;
const { children, setToken } = props;
const { isLoading, loginWithRedirect, isAuthenticated, getAccessTokenSilently } = useAuth0();
@ -17,6 +16,7 @@ export default function AuthWrapper(props: Props) {
const url = new URL(window.location.href);
const isManualLoginPage = url.pathname === "/login";
console.log(isManualLoginPage)
if (isManualLoginPage) {
const options: RedirectLoginOptions = {
@ -31,9 +31,9 @@ export default function AuthWrapper(props: Props) {
if (parsed.email && parsed.email !== "") {
options.authorizationParams!.login_hint = parsed.email.toString(); // prefill email
}
console.log(options)
loginWithRedirect(options)
} else if (!isAuthenticated && !isLoading) {
loginWithRedirect();
}
@ -44,7 +44,6 @@ export default function AuthWrapper(props: Props) {
if (t.length < 1) {
loginWithRedirect()
}
console.log("setting token :)")
setToken(t)
}).catch(() => {
// No token, go back to login
@ -52,38 +51,5 @@ export default function AuthWrapper(props: Props) {
})
}, [setToken, isAuthenticated])
// const setRouteBeforeLogin = useCallback((): Promise<string> => {
// return new Promise(function(resolve) {
// localStorage.setItem("routeBeforeLogin", prevPath ? prevPath : "/");
// return resolve("success");
// });
// }, [prevPath]);
useEffect(() => {
const options: RedirectLoginOptions = {
authorizationParams: {} // Initialize here
};
console.log(location)
if (location && location.search) {
let parsed = queryString.parse(location.search);
console.log(parsed.signup)
if (parsed.signup === "true") {
// if (options.authorizationParams) options.authorizationParams.screen_hint = "signup"; // 'signup' tells Auth0 to show the signup tab
options.authorizationParams!.screen_hint = "signup"; // 'signup' tells Auth0 to show the signup tab
console.log(options)
}
if (parsed.email && parsed.email !== "") {
// if (options.authorizationParams) options.authorizationParams.login_hint = parsed.email.toString(); // prefill email
options.authorizationParams!.login_hint = parsed.email.toString(); // prefill email
}
}
// setRouteBeforeLogin().finally(() => {
// loginWithRedirect(options);
// });
}, [location, loginWithRedirect, /*setRouteBeforeLogin*/]);
return children;
}