Merge pull request #188 from wizelineacademy/dev

Dev

actions.ts

@@ -5,12 +5,10 @@ import { signIn } from "@/auth";
 import { registerUser } from "./services/user";
 import { DatabaseErrorType } from "./types/errorTypes";
 import { DatabaseError } from "pg";
-import { redirect } from "next/navigation";
 
 export const loginAction = async (formData: FormData) => {
   try {
     await signIn("credentials", formData);
-    redirect("/profile");
   } catch (error) {
     if (error instanceof AuthError) {
       switch (error.type) {

app/(auth)/login/page.tsx

@@ -2,9 +2,11 @@
 import { loginAction } from "@/actions";
 import FormTextInput from "@/components/FormTextInput";
 import Link from "next/link";
+import { useRouter } from "next/navigation";
 import toast from "react-hot-toast";
 
 const Login = () => {
+  const router = useRouter();
   const clientLoginAction = async (formData: FormData) => {
     const result = await loginAction(formData);
     if (result) {
@@ -16,6 +18,8 @@ const Login = () => {
           toast.error("Something went wrong. Try again.");
           break;
       }
+    } else {
+      router.push("/dashboard");
     }
   };
 

auth.config.ts

@@ -64,7 +64,7 @@ export const authConfig = {
           return Response.redirect(new URL("/forbbiden", nextUrl));
         }
       }
-
+      console.log("url actual", nextUrl.pathname);
       if (
         nextUrl.pathname.startsWith("/login") ||
         nextUrl.pathname.startsWith("/register")
@@ -76,6 +76,9 @@ export const authConfig = {
 
       return true;
     },
+    async redirect({ url, baseUrl }) {
+      return url.startsWith(baseUrl) ? url : baseUrl;
+    },
     async jwt({ token, user: jwtUser, trigger }) {
       // Persist the OAuth access_token and or the user id to the token right after signin
       if (trigger === "signIn") {