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

Jump to bottom

[frontend] Fix redirect issue after signin by using router.replace from client component #246

Merged
merged 2 commits into from
Feb 7, 2024
Merged

[frontend] Fix redirect issue after signin by using router.replace from client component #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
408c7a4
[frontend] Fix redirect issue after signin by using router.replace fr…
usatie Feb 7, 2024
d4fa13b
[frontend] Add useEffect for router.replace after signin
usatie Feb 7, 2024
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
6 changes: 5 additions & 1 deletion frontend/app/lib/actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,17 @@ export async function authenticate(
password: formData.get("password") as string,
});
revalidatePath("/", "layout");
redirect("/");
} catch (error) {
if ((error as Error).message.includes("Authentication failed")) {
return "CredentialSignin";
}
throw error;
}
// This is a temporary fix for the redirect issue. It seems that the redirect is not working as expected.
// Instead of redirecting from server action, router.refresh from client component is used.
// Maybe this is related?: https://github.com/vercel/next.js/issues/58263
// redirect('/', 'layout');
return "Authenticated";
Comment on lines +66 to +70
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove commented-out code if it's no longer needed to keep the codebase clean and maintainable.

-  // This is a temporary fix for the redirect issue. It seems that the redirect is not working as expected.
-  // Instead of redirecting from server action, router.refresh from client component is used.
-  // Maybe this is related?: https://github.com/vercel/next.js/issues/58263
-  // redirect('/', 'layout');
Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
// This is a temporary fix for the redirect issue. It seems that the redirect is not working as expected.
// Instead of redirecting from server action, router.refresh from client component is used.
// Maybe this is related?: https://github.com/vercel/next.js/issues/58263
// redirect('/', 'layout');
return "Authenticated";
return "Authenticated";

}

function getAccessToken() {
Expand Down
8 changes: 8 additions & 0 deletions frontend/app/ui/auth/login-form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
import { useFormState, useFormStatus } from "react-dom";
import { useRouter } from "next/navigation";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ensure that the import path for useRouter is correct. The correct import path from Next.js is "next/router", not "next/navigation".

- import { useRouter } from "next/navigation";
+ import { useRouter } from "next/router";
Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
import { useRouter } from "next/navigation";
import { useRouter } from "next/router";

import { useEffect } from "react";

export default function LoginForm() {
return (
Expand All @@ -26,6 +28,12 @@ export default function LoginForm() {
function Form() {
const { currentUser } = useAuthContext();
const [code, action] = useFormState(authenticate, undefined);
const router = useRouter();
useEffect(() => {
if (code === "Authenticated") {
router.replace("/");
}
}, [code, router]);
return (
<>
<form action={action}>
Expand Down
Loading