Merge pull request #7 from MaximeDan/MDA-Implement_Next_Auth

Implement Authentication with Next-Auth
MaximeDan · May 23, 2024 · 398cfd6 · 398cfd6
2 parents bd640d9 + 8c679d1
commit 398cfd6
Show file tree

Hide file tree

Showing 35 changed files with 7,455 additions and 3,158 deletions.
diff --git a/.env.example b/.env.example
@@ -6,4 +6,5 @@
 
 DATABASE_URL="postgresql://johndoe:randompassword@localhost:5432/mydb?schema=public"
 NODE_ENV="development"
-DATABASE_PASSWORD="toto123"
+DATABASE_PASSWORD="toto123"
+NEXTAUTH_SECRET=mysecret
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -25,6 +25,7 @@
     "framer-motion": "^11.2.4",
     "lucide-react": "^0.378.0",
     "next": "14.2.3",
+    "next-auth": "^4.24.7",
     "react": "^18",
     "react-day-picker": "^8.10.1",
     "react-dom": "^18",

diff --git a/...rations/20240513093416_init/migration.sql → ...rations/20240522153623_init/migration.sql b/...rations/20240513093416_init/migration.sql → ...rations/20240522153623_init/migration.sql
@@ -10,15 +10,15 @@ CREATE TABLE "Role" (
 -- CreateTable
 CREATE TABLE "User" (
     "id" SERIAL NOT NULL,
-    "name" TEXT NOT NULL,
-    "lastName" TEXT NOT NULL,
+    "name" TEXT,
+    "lastName" TEXT,
     "email" TEXT NOT NULL,
     "username" TEXT NOT NULL,
     "password" TEXT NOT NULL,
     "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
     "updatedAt" TIMESTAMP(3) NOT NULL,
     "isVerified" BOOLEAN NOT NULL DEFAULT false,
-    "dateOfBirth" TIMESTAMP(3) NOT NULL,
+    "dateOfBirth" TIMESTAMP(3),
     "avatar" TEXT,
     "experience" INTEGER NOT NULL DEFAULT 0,
 
@@ -78,9 +78,9 @@ CREATE TABLE "Journey" (
     "physicalDifficulty" INTEGER NOT NULL,
     "lastCompletion" TIMESTAMP(3),
     "mobilityImpaired" TEXT NOT NULL,
-    "PartiallySighted" TEXT NOT NULL,
-    "PartiallyDeaf" TEXT NOT NULL,
-    "CognitivelyImpaired" TEXT NOT NULL,
+    "partiallySighted" TEXT NOT NULL,
+    "partiallyDeaf" TEXT NOT NULL,
+    "cognitivelyImpaired" TEXT NOT NULL,
     "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
     "updatedAt" TIMESTAMP(3) NOT NULL,
 

diff --git a/prisma/migrations/migration_lock.toml b/prisma/migrations/migration_lock.toml
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -22,15 +22,15 @@ model Role {
 
 model User {
   id          Int         @id @default(autoincrement())
-  name        String
-  lastName    String
+  name        String?
+  lastName    String?
   email       String      @unique
   username    String
   password    String
   createdAt   DateTime    @default(now())
   updatedAt   DateTime    @updatedAt
   isVerified  Boolean     @default(false)
-  dateOfBirth DateTime
+  dateOfBirth DateTime?
   avatar      String?
   experience  Int         @default(0)
   userRoles   UserRole[] // liste des rôles de l'utilisateur

diff --git a/src/api/hello/route.ts b/src/api/hello/route.ts
diff --git a/src/app/(auth)/inscription/layout.tsx b/src/app/(auth)/inscription/layout.tsx
diff --git a/src/app/(auth)/inscription/page.tsx → src/app/(auth)/register/page.tsx b/src/app/(auth)/inscription/page.tsx → src/app/(auth)/register/page.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import Register from "@/components/form/Register";
 
-const Inscription = () => {
+const RegisterPage = () => {
   return (
     <main>
       <h1>Inscription</h1>
@@ -10,4 +10,4 @@ const Inscription = () => {
   );
 };
 
-export default Inscription;
+export default RegisterPage;
diff --git a/src/app/(auth)/connexion/page.tsx → src/app/(auth)/signin/page.tsx b/src/app/(auth)/connexion/page.tsx → src/app/(auth)/signin/page.tsx
@@ -1,7 +1,8 @@
 import React from "react";
 import Login from "@/components/form/Login";
 
-const Connexion = () => {
+const SignInPage = () => {
+
   return (
     <main>
       <h1>Connexion</h1>
@@ -10,4 +11,4 @@ const Connexion = () => {
   );
 };
 
-export default Connexion;
+export default SignInPage;
diff --git a/src/app/api/auth/[...nextauth]/route.ts b/src/app/api/auth/[...nextauth]/route.ts
@@ -0,0 +1,6 @@
+import NextAuth from "next-auth";
+import { authOptions } from "@/lib/authOptions";
+
+const handler = NextAuth(authOptions);
+
+export { handler as GET, handler as POST };
diff --git a/src/app/api/auth/register/route.ts b/src/app/api/auth/register/route.ts
@@ -0,0 +1,26 @@
+import { NextRequest, NextResponse } from "next/server";
+import { register } from "@/services/userService";
+import {RegisterUser} from "@/types/register";
+
+async function handler(req: NextRequest): Promise<NextResponse> {
+    const data = await req.json();
+
+    try {
+        const userData: RegisterUser = {
+            email: data.email,
+            password: data.password,
+            username: data.username,
+            name: data.name,
+            lastName: data.lastName,
+            dateOfBirth: data.dateOfBirth,
+        };
+
+        const newUser = await register(userData);
+        return NextResponse.json({ user: newUser }, { status: 201 });
+    } catch (error: any) {
+        console.log(error.message)
+        return NextResponse.json({ message: error.message }, { status: 500 });
+    }
+}
+
+export { handler as POST };
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -16,7 +16,7 @@ export default function RootLayout({
   children: React.ReactNode;
 }>) {
   return (
-    <html lang="en">
+    <html lang="fr">
       <body className={`${inter.className} min-h-screen`}>{children}</body>
     </html>
   );

diff --git a/src/components/form/Login.tsx b/src/components/form/Login.tsx
@@ -1,68 +1,79 @@
 "use client";
 import React from "react";
-import { loginSchema } from "@/validators/loginSchema";
-import { z } from "zod";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useForm } from "react-hook-form";
-import { Button } from "@/components/ui/button";
+import {loginSchema} from "@/validators/loginSchema";
+import {z} from "zod";
+import {zodResolver} from "@hookform/resolvers/zod";
+import {useForm} from "react-hook-form";
+import {Button} from "@/components/ui/button";
 import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
+    Form,
+    FormControl,
+    FormField,
+    FormItem,
+    FormLabel,
+    FormMessage,
 } from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
+import {Input} from "@/components/ui/input";
+import {signIn} from "next-auth/react";
 
 type LoginForm = z.infer<typeof loginSchema>;
 
 const Login = () => {
-  const form = useForm<LoginForm>({
-    resolver: zodResolver(loginSchema),
-    defaultValues: {
-      email: "",
-      password: "",
-    },
-  });
+    const form = useForm<LoginForm>({
+        resolver: zodResolver(loginSchema),
+        defaultValues: {
+            email: "[email protected]",
+            password: "password",
+        },
+    });
 
-  const onSubmit = async (data: LoginForm) => {
-    console.log(data);
-  };
+    const onSubmit = async (data: LoginForm) => {
+        try {
+            await signIn("credentials", {
+                redirect: true,
+                identifier: data.email,
+                password: data.password,
+                callbackUrl: "/",
+                cache: "no-cache",
+            });
+        } catch (error: any) {
+            console.error(error.message);
+        }
+    };
 
-  return (
-    <Form {...form}>
-      <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-8">
-        <FormField
-          control={form.control}
-          name="email"
-          render={({ field }) => (
-            <FormItem>
-              <FormLabel>Email</FormLabel>
-              <FormControl>
-                <Input {...field} />
-              </FormControl>
-              <FormMessage />
-            </FormItem>
-          )}
-        />
-        <FormField
-          control={form.control}
-          name="password"
-          render={({ field }) => (
-            <FormItem>
-              <FormLabel>Mot de passe</FormLabel>
-              <FormControl>
-                <Input type="password" {...field} />
-              </FormControl>
-              <FormMessage />
-            </FormItem>
-          )}
-        />
-        <Button type="submit">Se connecter</Button>
-      </form>
-    </Form>
-  );
+    return (
+        <Form {...form}>
+            <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-8">
+                <FormField
+                    control={form.control}
+                    name="email"
+                    render={({field}) => (
+                        <FormItem>
+                            <FormLabel>Email</FormLabel>
+                            <FormControl>
+                                <Input {...field} />
+                            </FormControl>
+                            <FormMessage/>
+                        </FormItem>
+                    )}
+                />
+                <FormField
+                    control={form.control}
+                    name="password"
+                    render={({field}) => (
+                        <FormItem>
+                            <FormLabel>Mot de passe</FormLabel>
+                            <FormControl>
+                                <Input type="password" {...field} />
+                            </FormControl>
+                            <FormMessage/>
+                        </FormItem>
+                    )}
+                />
+                <Button type="submit">Se connecter</Button>
+            </form>
+        </Form>
+    );
 };
 
 export default Login;