Fix: Fix infinite request loop

sevenc-nanashi · Aug 29, 2024 · 5baedb7 · 5baedb7
1 parent f64166f
commit 5baedb7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/frontend/app/routes/login.tsx b/frontend/app/routes/login.tsx
@@ -12,7 +12,7 @@ import { useLogin } from "~/lib/useLogin.ts";
 export const loader = async ({ request }: LoaderFunctionArgs) => {
   const locale = await detectLocale(request);
   const rootT = await i18n.getFixedT(locale, "root");
-  const t = await i18n.getFixedT(locale, "liked");
+  const t = await i18n.getFixedT(locale, "login");
 
   const title = `${t("title")} | ${rootT("name")}`;
 
@@ -57,9 +57,9 @@ const Login = () => {
         <h1 className="page-title">{t("title")}</h1>
         <p>
           <Trans
-            i18nKey="header:login.description"
+            i18nKey="menu:login.description"
             components={[
-              <Link key={0} to={loginState?.url || ""} target="_blank" />,
+              <a key={0} href={loginState?.url.toString()} target="_blank" />,
             ]}
           />
         </p>

diff --git a/frontend/lib/requireLogin.tsx b/frontend/lib/requireLogin.tsx
@@ -6,9 +6,14 @@ const requireLogin = <T extends React.FC<never>>(component: T) => {
   return (props: never) => {
     const session = useSession();
     const navigate = useNavigate();
+
+    useEffect(() => {
+      if (session?.loggedIn === false) {
+        navigate("/login");
+      }
+    }, [session]);
     if (!session) return <div />;
     if (session.loggedIn) return createElement(component, props);
-    navigate("/login");
     return <div />;
   };
 };