diff --git a/package.json b/package.json
index 92244f7..ded8745 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,6 @@
     "test": "jest"
   },
   "dependencies": {
-    "@clerk/nextjs": "^4.19.0",
     "@hookform/resolvers": "^3.1.1",
     "@prisma/client": "^4.15.0",
     "@radix-ui/react-dialog": "^1.0.4",
@@ -59,4 +58,4 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5.0.4"
   }
-}
+}
\ No newline at end of file
diff --git a/src/app/acces/page.tsx b/src/app/acces/page.tsx
deleted file mode 100644
index 377a811..0000000
--- a/src/app/acces/page.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import { MasterFormCreate } from "@/components/forms/master-form-create"
-import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from "@/components/ui/card"
-import { userAppService } from "@/services/userApp.service"
-import { currentUser } from "@clerk/nextjs"
-import { redirect } from "next/navigation"
-
-export default async function AccesPage() {
-  const user = await currentUser()
-
-  if (!user?.primaryEmailAddressId) {
-    throw new Error("Pas d'adresse e-mail trouvé pour l'utilisateur.")
-  }
-  const primaryEmail = user.emailAddresses.find((email) => email.id == user.primaryEmailAddressId)
-  if (!primaryEmail) {
-    throw new Error("Pas d'adresse e-mail trouvé pour l'utilisateur.")
-  }
-
-  const searchedUser = await userAppService.getByEmail(primaryEmail.emailAddress)
-  if (searchedUser) {
-    redirect("/check")
-  } else {
-    return (
-      <Card className="text-center">
-        <CardHeader>
-          <CardTitle>Choississez votre Master Password.</CardTitle>
-          <CardDescription>Assurez-vous d'avoir une connexion sécurisée lors de la création de votre master password.</CardDescription>
-        </CardHeader>
-        <CardContent>
-          <MasterFormCreate />
-        </CardContent>
-        <CardFooter>
-          Il doit posseder au minimum 15 caractères, une minuscule, une MAJUSCULE, un chiffre, un caractère spécial (Parmi : $ * % @ ! ? &)
-        </CardFooter>
-      </Card>
-    )
-  }
-}
diff --git a/src/app/api/check-master/route.ts b/src/app/api/check-master/route.ts
index 2a0bbe0..f50a358 100644
--- a/src/app/api/check-master/route.ts
+++ b/src/app/api/check-master/route.ts
@@ -1,30 +1,20 @@
-import { generateAccessToken, generateRefreshToken } from "@/services/auth.service"
-import { userAppService } from "@/services/userApp.service"
-import { currentUser } from "@clerk/nextjs"
+import { generateAccessToken, generateRefreshToken } from "@/lib/services/auth.service"
+import { userAppService } from "@/lib/services/userApp.service"
 import bcrypt from "bcrypt"
 import { cookies } from "next/headers"
 import { NextRequest, NextResponse } from "next/server"
 
 export async function POST(request: NextRequest) {
-  const user = await currentUser()
+  const { clientHashedMaster, email } = await request.json()
 
-  if (!user?.primaryEmailAddressId) {
-    return NextResponse.json({ error: "Impossible de trouver l&apose-mail." }, { status: 400 })
-  }
-  const primaryEmail = user.emailAddresses.find((email) => email.id == user.primaryEmailAddressId)
-  if (!primaryEmail) {
-    return NextResponse.json({ error: "Impossible de trouver l&apose-mail." }, { status: 400 })
-  }
-
-  const searchUser = await userAppService.getByEmail(primaryEmail.emailAddress)
+  const searchUser = await userAppService.getByEmail(email)
 
   if (!searchUser) {
-    return NextResponse.json({ error: "Impossible de trouver l&aposutilisateur.." }, { status: 400 })
+    return NextResponse.json({ error: "Impossible de trouver l'utilisateur.." }, { status: 400 })
   }
 
   const salt = searchUser.salt
   const masterPassword = searchUser.masterPassword
-  const { clientHashedMaster } = await request.json()
   const clientDoubleHashedMaster = await bcrypt.hash(clientHashedMaster, salt)
   const clientDoubleHashedMasterBuffer = Buffer.from(clientDoubleHashedMaster)
 
@@ -32,9 +22,8 @@ export async function POST(request: NextRequest) {
     return NextResponse.json({ error: "Le mot de passe est incorrect." }, { status: 400 })
   }
 
-  const accessToken = generateAccessToken(primaryEmail.emailAddress)
-  const refreshToken = generateRefreshToken(primaryEmail.emailAddress)
-  const privateKey = searchUser.privateKey.toString("utf-8")
+  const accessToken = generateAccessToken(email, searchUser.privateKey.toString("utf-8"))
+  const refreshToken = generateRefreshToken(email, searchUser.privateKey.toString("utf-8"))
 
   const cookieHeaders = cookies()
   cookieHeaders.set("accessToken", accessToken, {
@@ -53,5 +42,5 @@ export async function POST(request: NextRequest) {
     path: "/",
   })
 
-  return NextResponse.json({ message: "Correspondance ok", privateKey: privateKey })
+  return NextResponse.json({ message: "Correspondance ok" })
 }
diff --git a/src/app/api/get-public-key/route.ts b/src/app/api/get-public-key/route.ts
index a87083f..623e96e 100644
--- a/src/app/api/get-public-key/route.ts
+++ b/src/app/api/get-public-key/route.ts
@@ -1,26 +1,18 @@
-import { userAppService } from "@/services/userApp.service"
-import { currentUser } from "@clerk/nextjs"
+import { currentUser } from "@/lib/hooks/auth"
+import { userAppService } from "@/lib/services/userApp.service"
 import { NextRequest, NextResponse } from "next/server"
 
 export async function GET(request: NextRequest) {
-  const user = await currentUser()
-  let searchUser
-  if (user) {
-    if (!user?.primaryEmailAddressId) {
-      return NextResponse.json({ error: "Impossible de trouver l&apose-mail." }, { status: 400 })
-    }
-    const primaryEmail = user.emailAddresses.find((email) => email.id == user.primaryEmailAddressId)
-    if (!primaryEmail) {
-      return NextResponse.json({ error: "Impossible de trouver l&apose-mail." }, { status: 400 })
-    }
+  const { email } = currentUser()
 
-    searchUser = await userAppService.getByEmail(primaryEmail.emailAddress)
-  } else {
-    searchUser = await userAppService.getByEmail("noemail@sandbox.com")
+  if (!email) {
+    return NextResponse.json({ error: "Vous devez être connecté pour créer un mot de passe." }, { status: 401 })
   }
 
+  const searchUser = await userAppService.getByEmail(email)
+
   if (!searchUser) {
-    return NextResponse.json({ error: "Impossible de trouver l&aposuser." }, { status: 400 })
+    return NextResponse.json({ error: "Impossible de trouver l'utilisateur." }, { status: 400 })
   }
 
   return NextResponse.json({ message: "Acces autorisé", publicKey: searchUser.publicKey.toString("utf-8") }, { status: 200 })
diff --git a/src/app/api/passwords/[id]/route.ts b/src/app/api/passwords/[id]/route.ts
index ad61c7c..4ebdb17 100644
--- a/src/app/api/passwords/[id]/route.ts
+++ b/src/app/api/passwords/[id]/route.ts
@@ -1,41 +1,19 @@
-import { guardedPasswordService } from "@/services/GuardedPassword.service"
-import { verifyAccessToken } from "@/services/auth.service"
-import { userAppService } from "@/services/userApp.service"
-import { currentUser } from "@clerk/nextjs"
-import { cookies } from "next/headers"
+import { currentUser } from "@/lib/hooks/auth"
+import { guardedPasswordService } from "@/lib/services/GuardedPassword.service"
+import { userAppService } from "@/lib/services/userApp.service"
 import { NextRequest, NextResponse } from "next/server"
 
 export async function DELETE(request: NextRequest, { params }: { params: { id: string } }) {
-  const user = await currentUser()
-  let cUser
-  if (user) {
-    if (!user?.primaryEmailAddressId) {
-      return NextResponse.json({ error: "Impossible de trouver l'e-mail." }, { status: 400 })
-    }
-
-    const primaryEmail = user.emailAddresses.find((email) => email.id == user.primaryEmailAddressId)
-    if (!primaryEmail) {
-      return NextResponse.json({ error: "Impossible de trouver l'apose-mail." }, { status: 400 })
-    }
-
-    const cookieStore = cookies()
-    const accessToken = cookieStore.get("accessToken")
-    if (!accessToken) {
-      return NextResponse.json({ error: "Pas de token d'acces dans les cookies." }, { status: 400 })
-    }
-    try {
-      const decoded = verifyAccessToken(accessToken.value)
-    } catch (err) {
-      return NextResponse.json({ error: "Le token n'est pas valide ou à expiré." }, { status: 400 })
-    }
-
-    cUser = await userAppService.getByEmail(primaryEmail.emailAddress)
-  } else {
-    cUser = await userAppService.getByEmail("noemail@sandbox.com")
+  const { email } = currentUser()
+
+  if (!email) {
+    return NextResponse.json({ error: "Vous devez être connecté pour supprimer un mot de passe." }, { status: 401 })
   }
 
+  const cUser = await userAppService.getByEmail(email)
+
   if (!cUser) {
-    return NextResponse.json({ error: "Impossible de trouver l'user." }, { status: 400 })
+    return NextResponse.json({ error: "Impossible de trouver l'utilisateur." }, { status: 400 })
   }
 
   if (!params.id) {
@@ -53,36 +31,16 @@ export async function DELETE(request: NextRequest, { params }: { params: { id: s
 }
 
 export async function PUT(request: NextRequest, { params }: { params: { id: string } }) {
-  const user = await currentUser()
-  let cUser
-  if (user) {
-    if (!user?.primaryEmailAddressId) {
-      return NextResponse.json({ error: "Impossible de trouver l'e-mail." }, { status: 400 })
-    }
-
-    const primaryEmail = user.emailAddresses.find((email) => email.id == user.primaryEmailAddressId)
-    if (!primaryEmail) {
-      return NextResponse.json({ error: "Impossible de trouver l'apose-mail." }, { status: 400 })
-    }
-
-    const cookieStore = cookies()
-    const accessToken = cookieStore.get("accessToken")
-    if (!accessToken) {
-      return NextResponse.json({ error: "Pas de token d'acces dans les cookies." }, { status: 400 })
-    }
-    try {
-      const decoded = verifyAccessToken(accessToken.value)
-    } catch (err) {
-      return NextResponse.json({ error: "Le token n'est pas valide ou à expiré." }, { status: 400 })
-    }
-
-    cUser = await userAppService.getByEmail(primaryEmail.emailAddress)
-  } else {
-    cUser = await userAppService.getByEmail("noemail@sandbox.com")
+  const { email } = await currentUser()
+
+  if (!email) {
+    return NextResponse.json({ error: "Vous devez être connecté pour supprimer un mot de passe." }, { status: 401 })
   }
 
+  const cUser = await userAppService.getByEmail(email)
+
   if (!cUser) {
-    return NextResponse.json({ error: "Impossible de trouver l'user." }, { status: 400 })
+    return NextResponse.json({ error: "Impossible de trouver l'utilisateur." }, { status: 400 })
   }
 
   if (!params.id) {
diff --git a/src/app/api/passwords/route.ts b/src/app/api/passwords/route.ts
index d06a35d..97123e1 100644
--- a/src/app/api/passwords/route.ts
+++ b/src/app/api/passwords/route.ts
@@ -1,78 +1,19 @@
-import { guardedPasswordService } from "@/services/GuardedPassword.service"
-import { verifyAccessToken } from "@/services/auth.service"
-import { userAppService } from "@/services/userApp.service"
-import { currentUser } from "@clerk/nextjs"
-import { cookies } from "next/headers"
+import { currentUser } from "@/lib/hooks/auth"
+import { guardedPasswordService } from "@/lib/services/GuardedPassword.service"
+import { userAppService } from "@/lib/services/userApp.service"
 import { NextRequest, NextResponse } from "next/server"
 
-// Récupérer tous les mots de passe
-export async function GET(request: NextRequest) {
-  const user = await currentUser()
-  if (!user?.primaryEmailAddressId) {
-    return NextResponse.json({ error: "Impossible de trouver l'e-mail." }, { status: 400 })
-  }
-
-  const primaryEmail = user.emailAddresses.find((email) => email.id == user.primaryEmailAddressId)
-  if (!primaryEmail) {
-    return NextResponse.json({ error: "Impossible de trouver l'e-mail." }, { status: 400 })
-  }
-
-  const cookieStore = cookies()
-  const accessToken = cookieStore.get("accessToken")
-  if (!accessToken) {
-    return NextResponse.json({ error: "Pas de token d'acces dans les cookies." }, { status: 400 })
-  }
-  try {
-    const decoded = verifyAccessToken(accessToken.value)
-  } catch (err) {
-    return NextResponse.json({ error: "Le token n'est pas valide ou à expiré." }, { status: 400 })
-  }
-
-  const cUser = await userAppService.getByEmail(primaryEmail.emailAddress)
-  if (!cUser) {
-    return NextResponse.json({ error: "Impossible de trouver l'user." }, { status: 400 })
-  }
-
-  const passwords = await guardedPasswordService.getAllGuardedPasswordByUserID(cUser.id)
-  if (!passwords) {
-    return NextResponse.json({ error: "Echec dans la récupération des mots de passe." }, { status: 400 })
-  }
-
-  return NextResponse.json({ message: "Acces autorisé", passwords: passwords }, { status: 200 })
-}
-
 // Création d'un mot de passe
 export async function POST(request: NextRequest) {
-  const user = await currentUser()
-  let cUser
-  if (user) {
-    if (!user?.primaryEmailAddressId) {
-      return NextResponse.json({ error: "Impossible de trouver l'e-mail." }, { status: 400 })
-    }
-
-    const primaryEmail = user.emailAddresses.find((email) => email.id == user.primaryEmailAddressId)
-    if (!primaryEmail) {
-      return NextResponse.json({ error: "Impossible de trouver l'apose-mail." }, { status: 400 })
-    }
-
-    const cookieStore = cookies()
-    const accessToken = cookieStore.get("accessToken")
-    if (!accessToken) {
-      return NextResponse.json({ error: "Pas de token d'acces dans les cookies." }, { status: 400 })
-    }
-    try {
-      const decoded = verifyAccessToken(accessToken.value)
-    } catch (err) {
-      return NextResponse.json({ error: "Le token n'est pas valide ou à expiré." }, { status: 400 })
-    }
+  const { email, privateKey } = currentUser()
 
-    cUser = await userAppService.getByEmail(primaryEmail.emailAddress)
-  } else {
-    cUser = await userAppService.getByEmail("noemail@sandbox.com")
+  if (!email || !privateKey) {
+    return NextResponse.json({ error: "Vous devez être connecté pour créer un mot de passe." }, { status: 401 })
   }
 
+  const cUser = await userAppService.getByEmail(email)
   if (!cUser) {
-    return NextResponse.json({ error: "Impossible de trouver l'user." }, { status: 400 })
+    return NextResponse.json({ error: "Impossible de trouver l'utilisateur." }, { status: 400 })
   }
 
   const {
diff --git a/src/app/api/user/route.ts b/src/app/api/user/route.ts
index 686aaaf..cf2e771 100644
--- a/src/app/api/user/route.ts
+++ b/src/app/api/user/route.ts
@@ -1,54 +1,17 @@
-import { verifyAccessToken } from "@/services/auth.service"
-import { generateRSAKeyPair } from "@/services/security.service"
-import { userAppService } from "@/services/userApp.service"
-import { currentUser } from "@clerk/nextjs"
+import { generateRSAKeyPair } from "@/lib/services/security.service"
+import { userAppService } from "@/lib/services/userApp.service"
 import { UserApp } from "@prisma/client"
 import bcrypt from "bcrypt"
-import { cookies } from "next/headers"
 import { NextRequest, NextResponse } from "next/server"
 
-export async function GET(request: NextRequest) {
-  const user = await currentUser()
-
-  if (!user) {
-    return NextResponse.json({ error: "Impossible de trouver l&aposaposuser." }, { status: 400 })
-  }
-
-  const cookieStore = cookies()
-  const accessToken = cookieStore.get("accessToken")
-  if (!accessToken) {
-    return NextResponse.json({ error: "Pas de token d&aposacces dans les cookies." }, { status: 400 })
-  }
-  try {
-    const decoded = verifyAccessToken(accessToken.value)
-  } catch (err) {
-    return NextResponse.json({ error: "Le token n&aposest pas valide ou à expiré." }, { status: 400 })
-  }
-
-  return NextResponse.json({ message: "Acces autorisé" }, { status: 200 })
-}
-
 export async function POST(request: NextRequest) {
   const randomSalt = await bcrypt.genSalt(16)
-  const { hashMaster } = await request.json()
-  const user = await currentUser()
-
-  // Verifie que l&aposuser est bien connecté avec clerk
-  if (!user?.primaryEmailAddressId || !user.firstName || !user.lastName) {
-    return NextResponse.json({ error: "Impossible de trouver l&aposuser." }, { status: 400 })
-  }
-  const name = `${user.firstName} ${user.lastName}`
-
-  // recherche de l&aposemail principale s&aposil existe.
-  const primaryEmail = user.emailAddresses.find((email) => email.id == user.primaryEmailAddressId)
-  if (!primaryEmail) {
-    return NextResponse.json({ error: "Impossible de trouver l&apose-mail." }, { status: 400 })
-  }
+  const { hashMaster, email } = await request.json()
 
   // Est-ce un nouvel user comme prévu ?
-  const searchCurrentUser = await userAppService.getByEmail(primaryEmail.emailAddress)
+  const searchCurrentUser = await userAppService.getByEmail(email)
   if (searchCurrentUser) {
-    return NextResponse.json({ error: "Impossible de trouver l&apose-mail." }, { status: 400 })
+    return NextResponse.json({ error: "Utilisateur déjà existant" }, { status: 400 })
   }
 
   try {
@@ -56,8 +19,8 @@ export async function POST(request: NextRequest) {
     const { privateKey, publicKey } = generateRSAKeyPair()
 
     const newUser: Omit<UserApp, "id"> = {
-      email: primaryEmail.emailAddress,
-      name: name,
+      email: email,
+      name: email.split("@")[0],
       masterPassword: Buffer.from(doubleHashedMaster, "utf-8"),
       salt: randomSalt,
       privateKey: Buffer.from(privateKey.toString(), "utf-8"),
diff --git a/src/app/check/page.tsx b/src/app/check/page.tsx
deleted file mode 100644
index 1c552f7..0000000
--- a/src/app/check/page.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import { CheckPasswordForm } from "@/components/forms/check-password-form"
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
-import { currentUser } from "@clerk/nextjs"
-
-export default async function ProtectedPage() {
-  const user = await currentUser()
-
-  if (!user) {
-    throw new Error("Utilisateur non connecté.")
-  }
-
-  if (!user?.primaryEmailAddressId) {
-    throw new Error("Pas d&aposadresse e-mail trouvé pour l&aposutilisateur.")
-  }
-  const primaryEmail = user.emailAddresses.find((email) => email.id == user.primaryEmailAddressId)
-  if (!primaryEmail) {
-    throw new Error("Pas d&aposadresse e-mail trouvé pour l&aposutilisateur.")
-  }
-
-  return (
-    <Card className="text-center">
-      <CardHeader>
-        <CardTitle>Vérification de votre identité :</CardTitle>
-        <CardDescription>Ne divulgez ce mot de passe à personne.</CardDescription>
-        <CardContent>
-          <CheckPasswordForm userEmail={primaryEmail.emailAddress} />
-        </CardContent>
-      </CardHeader>
-    </Card>
-  )
-}
diff --git a/src/app/error.tsx b/src/app/error.tsx
index 102b628..f986a8d 100644
--- a/src/app/error.tsx
+++ b/src/app/error.tsx
@@ -10,7 +10,7 @@ export default function Error({ error, reset }: { error: Error; reset: () => voi
 
   return (
     <div className="text-center flex flex-col gap-3">
-      <h1>{error.message}</h1>
+      <div>{error.message}</div>
       <Image src="/voleur.jpg" width={700} height={700} alt="Voleur assomé, coffre intact." />
     </div>
   )
diff --git a/src/app/favicon.ico b/src/app/favicon.ico
index 718d6fe..0f4974a 100644
Binary files a/src/app/favicon.ico and b/src/app/favicon.ico differ
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index e85dad2..1e9f88e 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -3,7 +3,6 @@ import { Providers } from "@/components/Providers"
 import { Footer } from "@/components/footer"
 import { Toaster } from "@/components/ui/toaster"
 import { cn } from "@/lib/utils"
-import { ClerkProvider } from "@clerk/nextjs"
 import { Inter } from "next/font/google"
 import "./globals.css"
 
@@ -18,19 +17,17 @@ export default function RootLayout({ children }: { children: React.ReactNode })
   return (
     <html lang="fr" suppressHydrationWarning>
       <Providers>
-        <ClerkProvider>
-          <body
-            className={cn(
-              "font-sans min-h-screen flex flex-col dark:bg-gradient-to-r dark:from-gray-700 dark:via-gray-900 dark:to-black",
-              inter.className
-            )}
-          >
-            <NavBar />
-            <main className="flex-grow flex items-center justify-center p-5">{children}</main>
-            <Toaster />
-            <Footer />
-          </body>
-        </ClerkProvider>
+        <body
+          className={cn(
+            "font-sans min-h-screen flex flex-col dark:bg-gradient-to-r dark:from-gray-700 dark:via-gray-900 dark:to-black",
+            inter.className
+          )}
+        >
+          <NavBar />
+          <main className="flex-grow flex items-center justify-center p-5">{children}</main>
+          <Toaster />
+          <Footer />
+        </body>
       </Providers>
     </html>
   )
diff --git a/src/app/page.tsx b/src/app/page.tsx
index ab9586f..0578f2e 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,38 +1,11 @@
-import { Description } from "@/components/description"
-import { PwnedPassword } from "@/components/pwned-password"
-import { Button } from "@/components/ui/Button"
-import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from "@/components/ui/card"
-import { currentUser } from "@clerk/nextjs"
-import Link from "next/link"
+import { GeneratePasswordCard } from "@/components/generate-password-card"
+import { SignInUp } from "@/components/signin_signup"
 
 export default async function Home() {
-  const user = await currentUser()
-
   return (
-    <div className="flex flex-col gap-5">
-      <Card className="text-center max-w-[500px]">
-        <CardHeader>
-          <CardTitle>Password Guard</CardTitle>
-          <CardDescription>One password for protect all others.</CardDescription>
-        </CardHeader>
-        <CardContent>
-          {user ? (
-            <Link href="/acces">
-              <Button>Entrer</Button>
-            </Link>
-          ) : (
-            <Description />
-          )}
-        </CardContent>
-        {!user && (
-          <CardFooter className="flex justify-center">
-            <Link href="/sandbox">
-              <Button>Sandbox</Button>
-            </Link>
-          </CardFooter>
-        )}
-      </Card>
-      <PwnedPassword />
+    <div className="flex flex-col items-center gap-5">
+      <SignInUp />
+      <GeneratePasswordCard />
     </div>
   )
 }
diff --git a/src/app/sandbox/page.tsx b/src/app/sandbox/page.tsx
index a70af5f..cfb74cc 100644
--- a/src/app/sandbox/page.tsx
+++ b/src/app/sandbox/page.tsx
@@ -1,22 +1,22 @@
 import { AddPasswordCard } from "@/components/add-password-card"
 import { PasswordCard } from "@/components/password_card"
 import { PasswordsHealthCard } from "@/components/passwords-health"
-import { PassBdd, encryptData } from "@/components/types/types"
 import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from "@/components/ui/card"
 import { HoverCard, HoverCardContent, HoverCardTrigger } from "@/components/ui/hover-card"
-import { guardedPasswordService } from "@/services/GuardedPassword.service"
-import { decryptPassword, privateKeyDecrypt } from "@/services/security.service"
-import { userAppService } from "@/services/userApp.service"
-import { currentUser } from "@clerk/nextjs"
+import { currentUser } from "@/lib/hooks/auth"
+import { guardedPasswordService } from "@/lib/services/GuardedPassword.service"
+import { decryptPassword, privateKeyDecrypt } from "@/lib/services/security.service"
+import { userAppService } from "@/lib/services/userApp.service"
+import { PassBdd, encryptData } from "@/lib/types/types"
 import Image from "next/image"
 import Link from "next/link"
 import { Home } from "../../../node_modules/lucide-react"
 
 export default async function SandBoxPage() {
   const sandBoxUser = await userAppService.getByEmail("noemail@sandbox.com")
-  const user = await currentUser()
+  const { email } = currentUser()
 
-  if (user) {
+  if (email) {
     throw new Error("Déconnectez-vous pour utiliser la sandbox.")
   }
 
@@ -85,7 +85,7 @@ export default async function SandBoxPage() {
           .map((password) => {
             return (
               <div key={password.id}>
-                <PasswordCard password={password} recupPasswords={undefined} />
+                <PasswordCard password={password} />
               </div>
             )
           })}
diff --git a/src/app/view-passwords/page.tsx b/src/app/view-passwords/page.tsx
index 0da9f3d..74da895 100644
--- a/src/app/view-passwords/page.tsx
+++ b/src/app/view-passwords/page.tsx
@@ -1,87 +1,59 @@
-"use client"
-
-import { AddPasswordForm } from "@/components/forms/add-password-form"
+import { AddPasswordCard } from "@/components/add-password-card"
 import { PasswordCard } from "@/components/password_card"
 import { PasswordsHealthCard } from "@/components/passwords-health"
-import { PlusPasswordCard } from "@/components/plus-password-card"
 import AccessDenied from "@/components/shared/access-denied"
-import { Loader } from "@/components/shared/loader"
-import { PassBdd, encryptData } from "@/components/types/types"
-import { decryptPassword, privateKeyDecrypt } from "@/services/security.service"
-import { useUser } from "@clerk/nextjs"
-import { useEffect, useState } from "react"
-
-export default function ViewPasswordsPage() {
-  const { isLoaded, isSignedIn, user } = useUser()
-  const [isLoading, setIsLoading] = useState(true)
-  const [isAcces, setIsAcces] = useState(false)
-  const [isShow, setIsShow] = useState(false)
-  const [passwords, setPasswords] = useState<PassBdd[]>([])
-
-  async function checkIsUserLogged() {
-    const response = await fetch("api/user")
-    if (response.ok) {
-      setIsAcces(true)
-      recupPasswords()
-    }
-    setIsLoading(false)
-  }
+import { currentUser } from "@/lib/hooks/auth"
+import { guardedPasswordService } from "@/lib/services/GuardedPassword.service"
+import { decryptPassword, privateKeyDecrypt } from "@/lib/services/security.service"
+import { userAppService } from "@/lib/services/userApp.service"
+import { PassBdd, encryptData } from "@/lib/types/types"
 
-  async function recupPasswords() {
-    const privateKey = localStorage.getItem("privateKey")
-    if (!privateKey) return
-    const response = await fetch("api/passwords")
-    if (!response.ok) return
+export default async function ViewPasswordsPage() {
+  const { email, privateKey } = currentUser()
 
-    const data = await response.json()
+  if (!email) return <AccessDenied />
+  if (!privateKey) throw new Error("Pas de clé privée")
 
-    const privateKeyBuffer = Buffer.from(privateKey, "utf-8")
+  const privateKeyBuffer = Buffer.from(privateKey, "utf-8")
 
-    const passBdds: PassBdd[] = []
+  const cUser = await userAppService.getByEmail(email)
+  if (!cUser) {
+    throw new Error("Impossible de trouver l'utilisateur.")
+  }
 
-    for (const password of data.passwords) {
-      const encryptedData: encryptData = {
-        iv: password.iv,
-        encryptedPassword: Buffer.from(password.password, "hex").toString("hex"),
-      }
+  const passwords = await guardedPasswordService.getAllGuardedPasswordByUserID(cUser.id)
+  if (!passwords) {
+    throw new Error("Echec dans la récupération des mots de passe.")
+  }
 
-      const decryptedAESKey = privateKeyDecrypt(Buffer.from(password.encryptedAESKey, "base64"), privateKeyBuffer)
-      const decryptedPassword = decryptPassword(encryptedData, decryptedAESKey)
+  const passBdds: PassBdd[] = []
 
-      passBdds.push({ id: password.id, title: password.title, login: password.login, password: decryptedPassword })
+  for (const password of passwords) {
+    const encryptedData: encryptData = {
+      iv: password.iv,
+      encryptedPassword: password.password.toString("hex"),
     }
 
-    setPasswords(passBdds)
-  }
-
-  useEffect(() => {
-    checkIsUserLogged()
-  }, [isShow])
-
-  if (isLoading) {
-    return <Loader />
-  }
+    const decryptedAESKey = privateKeyDecrypt(password.encryptedAESKey, privateKeyBuffer)
+    const decryptedPassword = decryptPassword(encryptedData, decryptedAESKey)
 
-  if (!user || !isAcces) {
-    return <AccessDenied />
+    passBdds.push({ id: password.id, title: password.title, login: password.login, password: decryptedPassword })
   }
 
   return (
     <div className="flex flex-col items-center">
-      <PasswordsHealthCard passBdds={passwords} />
+      <PasswordsHealthCard passBdds={passBdds} />
       <div className="flex flex-row gap-3 flex-wrap justify-center my-5">
-        {isAcces && passwords.length > 0 && (
-          <>
-            {passwords.map((password) => {
-              return (
-                <div key={password.id}>
-                  <PasswordCard password={password} recupPasswords={recupPasswords} />
-                </div>
-              )
-            })}
-          </>
-        )}
-        {isShow ? <AddPasswordForm setIsShow={setIsShow} recupPasswords={recupPasswords} /> : <PlusPasswordCard setIsShow={setIsShow} />}
+        {passBdds
+          .sort((a, b) => a.id - b.id)
+          .map((password) => {
+            return (
+              <div key={password.id}>
+                <PasswordCard password={password} />
+              </div>
+            )
+          })}
+        <AddPasswordCard />
       </div>
     </div>
   )
diff --git a/src/components/NavBar.tsx b/src/components/NavBar.tsx
index dae27ab..c387a7f 100644
--- a/src/components/NavBar.tsx
+++ b/src/components/NavBar.tsx
@@ -1,8 +1,6 @@
-import { SignedIn, SignedOut, SignInButton, UserButton } from "@clerk/nextjs"
 import Image from "next/image"
 import Link from "next/link"
 import { SwitchToggle } from "./switch-theme"
-import { Button } from "./ui/Button"
 
 export function NavBar() {
   return (
@@ -13,14 +11,6 @@ export function NavBar() {
         </Link>
         <div className="flex items-center gap-4">
           <SwitchToggle />
-          <SignedIn>
-            <UserButton afterSignOutUrl="/" userProfileUrl="/profile" />
-          </SignedIn>
-          <SignedOut>
-            <SignInButton mode="modal">
-              <Button>Sign in</Button>
-            </SignInButton>
-          </SignedOut>
         </div>
       </div>
     </nav>
diff --git a/src/components/btn-acces-if-logged.tsx b/src/components/btn-acces-if-logged.tsx
deleted file mode 100644
index 541e2db..0000000
--- a/src/components/btn-acces-if-logged.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { currentUser } from "@clerk/nextjs"
-import Link from "next/link"
-import { Description } from "./description"
-import { Button } from "./ui/Button"
-
-export const BtnAccesIfLogged = async () => {
-  const user = await currentUser()
-
-  if (!user) {
-    return <Description />
-  }
-
-  return (
-    <Link href="/acces">
-      <Button>Entrer</Button>
-    </Link>
-  )
-}
diff --git a/src/components/clipBoardButton.tsx b/src/components/clipBoardButton.tsx
index 2ff71bd..cbf25f2 100644
--- a/src/components/clipBoardButton.tsx
+++ b/src/components/clipBoardButton.tsx
@@ -1,7 +1,7 @@
 "use client"
 import { Key, User } from "../../node_modules/lucide-react"
 import { useState } from "react"
-import { Button } from "./ui/Button"
+import { Button } from "@/ui/Button"
 
 export function CopyToClipboardButton({ password, btnType }: { password: string; btnType: "user" | "password" }) {
   const [isCopied, setIsCopied] = useState(false)
diff --git a/src/components/delete-password-card.tsx b/src/components/delete-password-card.tsx
index 9ae5efe..4bb4510 100644
--- a/src/components/delete-password-card.tsx
+++ b/src/components/delete-password-card.tsx
@@ -1,9 +1,9 @@
 "use client"
 
+import { Button } from "@/components/ui/Button"
+import { useToast } from "@/components/ui/use-toast"
+import { PassBdd } from "@/lib/types/types"
 import { useRouter } from "next/navigation"
-import { PassBdd } from "./types/types"
-import { Button } from "./ui/Button"
-import { useToast } from "./ui/use-toast"
 
 export function DeletePasswordCard({ password }: { password: PassBdd }) {
   const { toast } = useToast()
diff --git a/src/components/description.tsx b/src/components/description.tsx
index 131985e..24bcbb9 100644
--- a/src/components/description.tsx
+++ b/src/components/description.tsx
@@ -1,7 +1,7 @@
 "use client"
 import { useState } from "react"
 import { Undo2 } from "../../node_modules/lucide-react"
-import { Button } from "./ui/Button"
+import { Button } from "@/ui/Button"
 
 export function Description() {
   const [isDescrHidden, setIsDescrHidden] = useState(true)
diff --git a/src/components/forms/add-password-form.tsx b/src/components/forms/add-password-form.tsx
index 12b9178..4845138 100644
--- a/src/components/forms/add-password-form.tsx
+++ b/src/components/forms/add-password-form.tsx
@@ -2,9 +2,11 @@
 
 import { Card, CardContent, CardFooter, CardHeader, CardTitle } from "@/components/ui/card"
 import { Form, FormControl, FormField, FormItem, FormMessage } from "@/components/ui/form"
+import { HoverCard, HoverCardContent, HoverCardTrigger } from "@/components/ui/hover-card"
 import { Input } from "@/components/ui/input"
 import { useToast } from "@/components/ui/use-toast"
-import { encryptPassword, generateAESKey, publicKeyEncrypt } from "@/services/security.service"
+import { generatePassword } from "@/lib/password"
+import { encryptPassword, generateAESKey, publicKeyEncrypt } from "@/lib/services/security.service"
 import { addPasswordSchema } from "@/zod/schema.example"
 import { zodResolver } from "@hookform/resolvers/zod"
 import { useRouter } from "next/navigation"
@@ -12,8 +14,6 @@ import { Dispatch, SetStateAction } from "react"
 import { useForm } from "react-hook-form"
 import { z } from "zod"
 import { MinusCircle, RefreshCw, Send } from "../../../node_modules/lucide-react"
-import { generatePassword } from "../functions/password"
-import { HoverCard, HoverCardContent, HoverCardTrigger } from "../ui/hover-card"
 
 export function AddPasswordForm({
   setIsShow,
@@ -85,7 +85,7 @@ export function AddPasswordForm({
   }
 
   return (
-    <div className="w-[240px] h-[240px]">
+    <div className="w-[255px] h-[240px]">
       <Form {...form}>
         <form onSubmit={form.handleSubmit(handleSubmit)}>
           <Card>
diff --git a/src/components/forms/check-password-form.tsx b/src/components/forms/check-password-form.tsx
index 15afed6..2894a3a 100644
--- a/src/components/forms/check-password-form.tsx
+++ b/src/components/forms/check-password-form.tsx
@@ -1,40 +1,49 @@
 "use client"
-import { PasswordInput } from "@/components/shared/password-input"
+import { InputEye } from "@/components/shared/input-password-eye"
 import { Button } from "@/components/ui/Button"
+import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from "@/components/ui/card"
+import { Form, FormControl, FormField, FormItem, FormMessage } from "@/components/ui/form"
+import { Input } from "@/components/ui/input"
 import { useToast } from "@/components/ui/use-toast"
+import { checkMasterPasswordSchema } from "@/zod/schema.example"
+import { zodResolver } from "@hookform/resolvers/zod"
 import CryptoJS from "crypto-js"
 import { useRouter } from "next/navigation"
-import { useState } from "react"
+import { useForm } from "react-hook-form"
+import { z } from "zod"
 
-export function CheckPasswordForm({ userEmail }: { userEmail: string }) {
-  const [isChecking, setIsChecking] = useState(false)
+export function CheckPasswordForm({ setIsSignIn }: { setIsSignIn: (value: boolean) => void }) {
   const { toast } = useToast()
   const router = useRouter()
 
-  async function checkPassword(event: React.FormEvent<HTMLFormElement>) {
-    event.preventDefault()
-    setIsChecking(true)
+  const form = useForm<z.infer<typeof checkMasterPasswordSchema>>({
+    resolver: zodResolver(checkMasterPasswordSchema),
+    defaultValues: {
+      email: "",
+      master: "",
+    },
+  })
+
+  async function checkPassword(values: z.infer<typeof checkMasterPasswordSchema>) {
     toast({
       description: "Vérification du mot de passe en cours ...",
     })
-    const formData = new FormData(event.target as HTMLFormElement)
     const envSalt = process.env.NEXT_PUBLIC_SUPERMASTERSALT
-    if (!envSalt) return console.error("Probleme d&aposenv")
-    const supersalt = envSalt + userEmail
+    if (!envSalt) return console.error("Probleme d'env")
+
+    const supersalt = envSalt + values.email
 
-    const hashedMaster = CryptoJS.SHA256(supersalt + String(formData.get("master"))).toString(CryptoJS.enc.Hex)
+    const hashedMaster = CryptoJS.SHA256(supersalt + values.master).toString(CryptoJS.enc.Hex)
 
     const response = await fetch("api/check-master", {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
       },
-      body: JSON.stringify({ clientHashedMaster: hashedMaster }),
+      body: JSON.stringify({ clientHashedMaster: hashedMaster, email: values.email }),
     })
 
     if (response.ok) {
-      const data: { message: string; privateKey: string } = await response.json()
-      localStorage.setItem("privateKey", data.privateKey)
       toast({
         description: "Accès autorisé pour 1h.",
       })
@@ -43,20 +52,54 @@ export function CheckPasswordForm({ userEmail }: { userEmail: string }) {
       const data: { error: string } = await response.json()
       toast({
         variant: "destructive",
-        title: "Oh, oh ! Une erreur s&aposest produite !",
+        title: "Oh, oh ! Une erreur s'est produite !",
         description: `Raison : ${data.error}`,
       })
     }
-
-    setIsChecking(false)
   }
 
   return (
-    <form onSubmit={checkPassword} className="flex flex-col items-center gap-3 mt-5">
-      <PasswordInput label="Master" name="master" />
-      <Button className="mt-1" type="submit" disabled={isChecking}>
-        Déverouiller
-      </Button>
-    </form>
+    <Card className="min-w-[350px] w-screen max-w-[700px]">
+      <CardHeader>
+        <CardTitle>Déverouille ton coffre.</CardTitle>
+        <CardDescription>Accède à tes mots de passe.</CardDescription>
+      </CardHeader>
+      <CardContent>
+        <Form {...form}>
+          <form onSubmit={form.handleSubmit(checkPassword)} className="space-y-8">
+            <FormField
+              control={form.control}
+              name="email"
+              render={({ field }) => (
+                <FormItem>
+                  <FormControl>
+                    <Input {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="master"
+              render={({ field }) => (
+                <FormItem>
+                  <FormControl>
+                    <InputEye {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <Button type="submit">Dévérouille ton coffre.</Button>
+          </form>
+        </Form>
+      </CardContent>
+      <CardFooter className="justify-end">
+        <div onClick={() => setIsSignIn(false)} className="cursor-pointer">
+          Pas encore de coffre ? Clique ici.
+        </div>
+      </CardFooter>
+    </Card>
   )
 }
diff --git a/src/components/forms/edit-password-form.tsx b/src/components/forms/edit-password-form.tsx
index 20ba1b6..1e568e6 100644
--- a/src/components/forms/edit-password-form.tsx
+++ b/src/components/forms/edit-password-form.tsx
@@ -1,11 +1,12 @@
 "use client"
 
-import { PassBdd } from "@/components/types/types"
 import { Card, CardContent, CardFooter, CardHeader, CardTitle } from "@/components/ui/card"
 import { Form, FormControl, FormField, FormItem, FormMessage } from "@/components/ui/form"
 import { Input } from "@/components/ui/input"
 import { toast } from "@/components/ui/use-toast"
-import { encryptPassword, generateAESKey, publicKeyEncrypt } from "@/services/security.service"
+import { generatePassword } from "@/lib/password"
+import { encryptPassword, generateAESKey, publicKeyEncrypt } from "@/lib/services/security.service"
+import { PassBdd } from "@/lib/types/types"
 import { addPasswordSchema } from "@/zod/schema.example"
 import { zodResolver } from "@hookform/resolvers/zod"
 import { useRouter } from "next/navigation"
@@ -13,17 +14,8 @@ import { Dispatch, SetStateAction } from "react"
 import { useForm } from "react-hook-form"
 import { z } from "zod"
 import { ArrowLeft, RefreshCw, Send } from "../../../node_modules/lucide-react"
-import { generatePassword } from "../functions/password"
 
-export function EditPassword({
-  setIsEditing,
-  password,
-  recupPasswords = undefined,
-}: {
-  setIsEditing: Dispatch<SetStateAction<boolean>>
-  password: PassBdd
-  recupPasswords: undefined | (() => void)
-}) {
+export function EditPassword({ setIsEditing, password }: { setIsEditing: Dispatch<SetStateAction<boolean>>; password: PassBdd }) {
   const router = useRouter()
   const form = useForm<z.infer<typeof addPasswordSchema>>({
     resolver: zodResolver(addPasswordSchema),
@@ -68,11 +60,7 @@ export function EditPassword({
     })
 
     if (response2.ok) {
-      if (recupPasswords != undefined) {
-        recupPasswords()
-      } else {
-        router.refresh()
-      }
+      router.refresh()
       setIsEditing(false)
       toast({
         description: "Mot de passe modifié avec succes.",
@@ -86,7 +74,7 @@ export function EditPassword({
   }
 
   return (
-    <div className="w-[240px] h-[240px]">
+    <div className="w-[255px] h-[240px]">
       <Form {...form}>
         <form onSubmit={form.handleSubmit(handleSubmit)}>
           <Card>
diff --git a/src/components/forms/master-form-create.tsx b/src/components/forms/master-form-create.tsx
index ddc6d12..0c7c2ba 100644
--- a/src/components/forms/master-form-create.tsx
+++ b/src/components/forms/master-form-create.tsx
@@ -1,119 +1,111 @@
 "use client"
 
-import { robustTest } from "@/components/functions/validators"
-import { PasswordInput } from "@/components/shared/password-input"
+import { InputEye } from "@/components/shared/input-password-eye"
 import { Button } from "@/components/ui/Button"
+import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from "@/components/ui/card"
+import { Form, FormControl, FormField, FormItem, FormMessage } from "@/components/ui/form"
+import { Input } from "@/components/ui/input"
 import { toast } from "@/components/ui/use-toast"
-import { useUser } from "@clerk/nextjs"
+import { newMasterPasswordSchema } from "@/zod/schema.example"
+import { zodResolver } from "@hookform/resolvers/zod"
 import CryptoJS from "crypto-js"
-import { useRouter } from "next/navigation"
-import { useRef, useState } from "react"
-import { Lock } from "../../../node_modules/lucide-react"
+import { useForm } from "react-hook-form"
+import { z } from "zod"
 
-export function MasterFormCreate() {
-  const { isLoaded, isSignedIn, user } = useUser()
-  const formRef = useRef<HTMLFormElement>(null)
-  const router = useRouter()
-  const [isValidForm, setIsValidForm] = useState(false)
-  const [isPaste, setIsPaste] = useState(false)
-  const regex = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{15,}$/
+export function MasterFormCreate({ setIsSignIn }: { setIsSignIn: (value: boolean) => void }) {
+  const form = useForm<z.infer<typeof newMasterPasswordSchema>>({
+    resolver: zodResolver(newMasterPasswordSchema),
+    defaultValues: {
+      email: "",
+      master: "",
+      confirm: "",
+    },
+  })
 
-  async function handleSubmit(e: React.FormEvent) {
-    e.preventDefault()
+  async function handleSubmit(values: z.infer<typeof newMasterPasswordSchema>) {
     toast({
       description: "Création du mot de passe master en cours ...",
     })
-    if (formRef.current) {
-      const formData = new FormData(formRef.current)
-      const master = formData.get("master")
-      const confirm = formData.get("confirm")
 
-      if (master && confirm) {
-        const isMasterSecure = regex.test(String(formData.get("master")))
-        const isConfirmEqualMaster = String(formData.get("master")) === String(formData.get("confirm"))
+    const envSalt = process.env.NEXT_PUBLIC_SUPERMASTERSALT
+    if (!envSalt) return console.error("Probleme d'env")
 
-        if (isMasterSecure && isConfirmEqualMaster) {
-          if (user?.primaryEmailAddress) {
-            const envSalt = process.env.NEXT_PUBLIC_SUPERMASTERSALT
-            if (!envSalt) return console.error("Probleme d&aposenv")
-            const supersalt = envSalt + user.primaryEmailAddress.toString()
-            const response = await fetch("api/user", {
-              method: "POST",
-              body: JSON.stringify({
-                hashMaster: CryptoJS.SHA256(supersalt + String(formData.get("master"))).toString(CryptoJS.enc.Hex),
-              }),
-            })
-
-            if (response.ok) {
-              toast({
-                description: "Réussite !",
-              })
-              router.push("/check")
-            } else {
-              const error: { error: string } = await response.json()
-              toast({
-                variant: "destructive",
-                description: `Erreur : ${error.error}`,
-              })
-            }
-          }
-        }
-      }
-    }
-  }
-
-  function validationFormTest() {
-    if (formRef.current) {
-      const formData = new FormData(formRef.current)
-      const master = formData.get("master")
-      const confirm = formData.get("confirm")
-
-      if (master && confirm) {
-        const isMasterSecure = regex.test(String(formData.get("master")))
-        const isConfirmEqualMaster = String(formData.get("master")) === String(formData.get("confirm"))
-        setIsValidForm(isMasterSecure && isConfirmEqualMaster)
-      }
-    }
-  }
+    const supersalt = envSalt + values.email
+    const response = await fetch("api/user", {
+      method: "POST",
+      body: JSON.stringify({
+        hashMaster: CryptoJS.SHA256(supersalt + values.master).toString(CryptoJS.enc.Hex),
+        email: values.email,
+      }),
+    })
 
-  function samePasswordTest(password: string) {
-    if (!formRef.current) {
-      return true
+    if (response.ok) {
+      toast({
+        description: "Réussite !",
+      })
+      setIsSignIn(true)
+    } else {
+      toast({
+        variant: "destructive",
+        description: "Echec !",
+      })
     }
-
-    const formData = new FormData(formRef.current)
-    const master = String(formData.get("master"))
-
-    return password === master
   }
 
   return (
-    <form ref={formRef} onChange={validationFormTest} onSubmit={handleSubmit} className="flex flex-col items-center">
-      <PasswordInput label="Master" name="master" validate={robustTest} validationMessage="Pas assez robuste." />
-      <PasswordInput
-        label="Confirmation"
-        name="confirm"
-        validate={samePasswordTest}
-        validationMessage="Ne correspond pas."
-        onPaste={() => setIsPaste(true)}
-      />
-
-      <Button type="submit" disabled={!isValidForm}>
-        {isValidForm ? "Commencer" : <Lock />}
-      </Button>
-      <>
-        {isValidForm && (
-          <div className="text-orange-600 text-sm mt-2 text-center max-w-xs">
-            Attention, si vous perdez ce mot de passe. Vous ne pourrez pas le modifier, ni le recuperer, ni acceder à vos eventuels futurs mots de
-            passe enregistrés sur Password Guard.
-          </div>
-        )}
-        {isPaste && (
-          <div className="text-red-600 text-sm mt-2 text-center max-w-xs">
-            DANGER : Vous avez copié votre mot de passe, soyez certain d&aposêtre capable de le réecrire avant de valider.
-          </div>
-        )}
-      </>
-    </form>
+    <Card className="min-w-[350px] w-screen max-w-[700px]">
+      <CardHeader>
+        <CardTitle>Création de ton coffre.</CardTitle>
+        <CardDescription>Créer un compte pour protéger tes mots de passe.</CardDescription>
+      </CardHeader>
+      <CardContent>
+        <Form {...form}>
+          <form onSubmit={form.handleSubmit(handleSubmit)} className="space-y-8">
+            <FormField
+              control={form.control}
+              name="email"
+              render={({ field }) => (
+                <FormItem>
+                  <FormControl>
+                    <Input {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="master"
+              render={({ field }) => (
+                <FormItem>
+                  <FormControl>
+                    <InputEye {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="confirm"
+              render={({ field }) => (
+                <FormItem>
+                  <FormControl>
+                    <InputEye {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <Button type="submit">Créer ton coffre.</Button>
+          </form>
+        </Form>
+      </CardContent>
+      <CardFooter className="justify-end">
+        <div onClick={() => setIsSignIn(true)} className="cursor-pointer">
+          Déjà un coffre ? Clique ici.
+        </div>
+      </CardFooter>
+    </Card>
   )
 }
diff --git a/src/components/generate-password-card.tsx b/src/components/generate-password-card.tsx
new file mode 100644
index 0000000..ad1b7d4
--- /dev/null
+++ b/src/components/generate-password-card.tsx
@@ -0,0 +1,33 @@
+"use client"
+import { generatePassword } from "@/lib/password"
+import { useEffect, useState } from "react"
+import { Button } from "./ui/Button"
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "./ui/card"
+
+export function GeneratePasswordCard() {
+  const [password, setPassword] = useState("")
+
+  const handleClick = () => {
+    const newPassword = generatePassword()
+    setPassword(newPassword)
+  }
+
+  useEffect(() => {
+    handleClick()
+  }, [])
+
+  return (
+    <Card className="min-w-[350px] w-screen max-w-[700px]">
+      <CardHeader>
+        <CardTitle>Générateur de mot de passe fort.</CardTitle>
+        <CardDescription>
+          Génére automatiquement un mot de passe avec 15 caractères aléatoires dont 1 majuscule, 1 minuscule, 1 chiffre et 1 caractère spécial.
+        </CardDescription>
+        <CardContent className="flex flex-col gap-5 items-center">
+          <code className="text-sm">{password}</code>
+          <Button onClick={handleClick}>Générer</Button>
+        </CardContent>
+      </CardHeader>
+    </Card>
+  )
+}
diff --git a/src/components/password-details.tsx b/src/components/password-details.tsx
index 47c0bd7..1d934e2 100644
--- a/src/components/password-details.tsx
+++ b/src/components/password-details.tsx
@@ -1,15 +1,15 @@
-import { PassBdd } from "@/components/types/types"
 import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from "@/components/ui/card"
+import { splitPassword } from "@/lib/password"
+import { PassBdd } from "@/lib/types/types"
 import { Dispatch, SetStateAction } from "react"
 import { ArrowLeft } from "../../node_modules/lucide-react"
-import { splitPassword } from "./functions/password"
 
 export function PasswordDetail({ password, setIsShowDetail }: { password: PassBdd; setIsShowDetail: Dispatch<SetStateAction<boolean>> }) {
   const splitedPassword = splitPassword(password.password)
   const splitedLogin = splitPassword(password.login)
 
   return (
-    <Card className="w-[240px] flex flex-col justify-between">
+    <Card className="w-[255px] flex flex-col justify-between">
       <CardHeader>
         <CardTitle>
           <div>{password.title}</div>
diff --git a/src/components/password_card.tsx b/src/components/password_card.tsx
index 82cf30c..c9845b6 100644
--- a/src/components/password_card.tsx
+++ b/src/components/password_card.tsx
@@ -1,8 +1,8 @@
 "use client"
 import CopyToClipboardButton from "@/components/clipBoardButton"
-import { PassBdd } from "@/components/types/types"
 import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from "@/components/ui/card"
 import { useToast } from "@/components/ui/use-toast"
+import { PassBdd } from "@/lib/types/types"
 import { useRouter } from "next/navigation"
 import { useState } from "react"
 import { Eye, PenBox, Trash2 } from "../../node_modules/lucide-react"
@@ -11,7 +11,7 @@ import { PasswordDetail } from "./password-details"
 import { Button } from "./ui/Button"
 import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle, DialogTrigger } from "./ui/dialog"
 
-export function PasswordCard({ password, recupPasswords = undefined }: { password: PassBdd; recupPasswords: undefined | (() => void) }) {
+export function PasswordCard({ password }: { password: PassBdd }) {
   const [isDeleting, setIsDeleting] = useState(false)
   const [isEditing, setIsEditing] = useState(false)
   const [isShowDetail, setIsShowDetail] = useState(false)
@@ -34,11 +34,7 @@ export function PasswordCard({ password, recupPasswords = undefined }: { passwor
       toast({
         description: "Suppression effectuée avec succès.",
       })
-      if (recupPasswords != undefined) {
-        recupPasswords()
-      } else {
-        router.refresh()
-      }
+      router.refresh()
     } else {
       toast({
         variant: "destructive",
@@ -49,7 +45,7 @@ export function PasswordCard({ password, recupPasswords = undefined }: { passwor
   }
 
   if (isEditing) {
-    return <EditPassword setIsEditing={setIsEditing} password={password} recupPasswords={recupPasswords} />
+    return <EditPassword setIsEditing={setIsEditing} password={password} />
   }
 
   if (isShowDetail) {
@@ -58,7 +54,7 @@ export function PasswordCard({ password, recupPasswords = undefined }: { passwor
 
   return (
     <div key={password.id} className="relative">
-      <Card className="w-[240px] h-[240px] flex flex-col justify-between">
+      <Card className="w-[255px] h-[240px] flex flex-col justify-between">
         <CardHeader>
           <CardTitle>
             <p>{password.title}</p>
diff --git a/src/components/passwords-health.tsx b/src/components/passwords-health.tsx
index faada70..c753187 100644
--- a/src/components/passwords-health.tsx
+++ b/src/components/passwords-health.tsx
@@ -1,9 +1,9 @@
 "use client"
 import { useState } from "react"
 import { Radar } from "../../node_modules/lucide-react"
-import { pluralize } from "./functions/format"
-import { isCompomisedPassword } from "./functions/password"
-import { PassBdd } from "./types/types"
+import { pluralize } from "../lib/format"
+import { isCompomisedPassword } from "../lib/password"
+import { PassBdd } from "../lib/types/types"
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "./ui/card"
 import { useToast } from "./ui/use-toast"
 
diff --git a/src/components/plus-password-card.tsx b/src/components/plus-password-card.tsx
index 8782047..d7ff67f 100644
--- a/src/components/plus-password-card.tsx
+++ b/src/components/plus-password-card.tsx
@@ -5,7 +5,7 @@ import { HoverCard, HoverCardContent, HoverCardTrigger } from "./ui/hover-card"
 
 export function PlusPasswordCard({ setIsShow }: { setIsShow: Dispatch<SetStateAction<boolean>> }) {
   return (
-    <Card className="w-[240px] h-[240px] flex items-center justify-center">
+    <Card className="w-[255px] h-[240px] flex items-center justify-center">
       <HoverCard closeDelay={0.1}>
         <HoverCardTrigger>
           <PlusCircleIcon size={35} strokeWidth={1.3} onClick={() => setIsShow(true)} className="cursor-pointer" />
diff --git a/src/components/pwned-password.tsx b/src/components/pwned-password.tsx
index 8359a4e..f0fd696 100644
--- a/src/components/pwned-password.tsx
+++ b/src/components/pwned-password.tsx
@@ -3,8 +3,8 @@ import { simplePasswordSchema } from "@/zod/schema.example"
 import { zodResolver } from "@hookform/resolvers/zod"
 import { useForm } from "react-hook-form"
 import { z } from "zod"
-import { isCompomisedPassword } from "./functions/password"
-import { useTimedMessage } from "./hooks/timed-message"
+import { useTimedMessage } from "../lib/hooks/timed-message"
+import { isCompomisedPassword } from "../lib/password"
 import { InputEye } from "./shared/input-password-eye"
 import { Button } from "./ui/Button"
 import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from "./ui/card"
@@ -53,7 +53,7 @@ export function PwnedPassword() {
                 <FormItem>
                   <FormLabel>Mot de passe à vérifier</FormLabel>
                   <FormControl>
-                    <InputEye field={field} />
+                    <InputEye {...field} />
                   </FormControl>
                 </FormItem>
               )}
diff --git a/src/components/shared/input-password-eye.tsx b/src/components/shared/input-password-eye.tsx
index 11250d8..6abcc38 100644
--- a/src/components/shared/input-password-eye.tsx
+++ b/src/components/shared/input-password-eye.tsx
@@ -1,26 +1,18 @@
-import { useState } from "react"
-import { ControllerRenderProps } from "react-hook-form"
+"use client"
+
+import React, { useState } from "react"
 import { Eye, EyeOff } from "../../../node_modules/lucide-react"
-import { Input } from "../ui/input"
+import { Input, InputProps } from "../ui/input"
 
-export function InputEye({
-  field,
-}: {
-  field: ControllerRenderProps<
-    {
-      password: string
-    },
-    "password"
-  >
-}) {
+export const InputEye = React.forwardRef<HTMLInputElement, InputProps>(({ className, type, ...props }, ref) => {
   const [isShowPassword, setIsShowPassword] = useState(false)
 
   return (
     <div className="relative">
-      <Input type={isShowPassword ? "text" : "password"} {...field} className="pr-10" />
-      <span className="absolute inset-y-0 right-0 pr-3 flex items-center cursor-pointers" onClick={() => setIsShowPassword(!isShowPassword)}>
+      <Input type={isShowPassword ? "text" : "password"} {...props} className="pr-10" ref={ref} />
+      <span className="absolute inset-y-0 right-0 pr-3 flex items-center cursor-pointer" onClick={() => setIsShowPassword(!isShowPassword)}>
         {isShowPassword ? <Eye strokeWidth={1.3} size={23} /> : <EyeOff strokeWidth={1.3} size={23} />}
       </span>
     </div>
   )
-}
+})
diff --git a/src/components/shared/input.tsx b/src/components/shared/input.tsx
index f18f5e8..e8a61bd 100644
--- a/src/components/shared/input.tsx
+++ b/src/components/shared/input.tsx
@@ -1,4 +1,4 @@
-import { InputProps } from "@/components/types/types"
+import { InputProps } from "@/lib/types/types"
 
 export function Input({ label, ...props }: InputProps) {
   return (
diff --git a/src/components/shared/loader.tsx b/src/components/shared/loader.tsx
index f148858..399cf49 100644
--- a/src/components/shared/loader.tsx
+++ b/src/components/shared/loader.tsx
@@ -1,4 +1,4 @@
-import styles from "@/components/styles/loader.module.css"
+import styles from "@/lib/styles/loader.module.css"
 
 export function Loader() {
   return (
diff --git a/src/components/shared/password-input.tsx b/src/components/shared/password-input.tsx
index e06e9ea..b3975b9 100644
--- a/src/components/shared/password-input.tsx
+++ b/src/components/shared/password-input.tsx
@@ -1,8 +1,8 @@
-import styles from "@/components/styles/password-input.module.css"
 import { Input } from "@/components/ui/input"
+import styles from "@/styles/password-input.module.css"
+import { HoverCard, HoverCardContent, HoverCardTrigger } from "@/ui/hover-card"
 import { ComponentPropsWithoutRef, useState } from "react"
 import { Eye, EyeOff } from "../../../node_modules/lucide-react"
-import { HoverCard, HoverCardContent, HoverCardTrigger } from "../ui/hover-card"
 
 type InputProps = ComponentPropsWithoutRef<"input"> & {
   label: string
diff --git a/src/components/signin_signup.tsx b/src/components/signin_signup.tsx
new file mode 100644
index 0000000..736e480
--- /dev/null
+++ b/src/components/signin_signup.tsx
@@ -0,0 +1,11 @@
+"use client"
+
+import { useState } from "react"
+import { CheckPasswordForm } from "./forms/check-password-form"
+import { MasterFormCreate } from "./forms/master-form-create"
+
+export function SignInUp() {
+  const [isSignIn, setIsSignIn] = useState(true)
+
+  return <>{isSignIn ? <CheckPasswordForm setIsSignIn={setIsSignIn} /> : <MasterFormCreate setIsSignIn={setIsSignIn} />}</>
+}
diff --git a/src/components/ui/card.tsx b/src/components/ui/card.tsx
index dff04b6..87253bc 100644
--- a/src/components/ui/card.tsx
+++ b/src/components/ui/card.tsx
@@ -2,78 +2,34 @@ import * as React from "react"
 
 import { cn } from "@/lib/utils"
 
-const Card = React.forwardRef<
-  HTMLDivElement,
-  React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => (
-  <div
-    ref={ref}
-    className={cn(
-      "rounded-lg border bg-card text-card-foreground shadow-sm",
-      className
-    )}
-    {...props}
-  />
+const Card = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(({ className, ...props }, ref) => (
+  <div ref={ref} className={cn("rounded-lg border bg-card text-card-foreground shadow-sm", className)} {...props} />
 ))
 Card.displayName = "Card"
 
-const CardHeader = React.forwardRef<
-  HTMLDivElement,
-  React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => (
-  <div
-    ref={ref}
-    className={cn("flex flex-col space-y-1.5 p-6", className)}
-    {...props}
-  />
+const CardHeader = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(({ className, ...props }, ref) => (
+  <div ref={ref} className={cn("flex flex-col space-y-1.5 p-6", className)} {...props} />
 ))
 CardHeader.displayName = "CardHeader"
 
-const CardTitle = React.forwardRef<
-  HTMLParagraphElement,
-  React.HTMLAttributes<HTMLHeadingElement>
->(({ className, ...props }, ref) => (
-  <h3
-    ref={ref}
-    className={cn(
-      "text-lg font-semibold leading-none tracking-tight",
-      className
-    )}
-    {...props}
-  />
+const CardTitle = React.forwardRef<HTMLParagraphElement, React.HTMLAttributes<HTMLHeadingElement>>(({ className, ...props }, ref) => (
+  <h3 ref={ref} className={cn("text-lg font-semibold leading-none tracking-tight", className)} {...props} />
 ))
 CardTitle.displayName = "CardTitle"
 
-const CardDescription = React.forwardRef<
-  HTMLParagraphElement,
-  React.HTMLAttributes<HTMLParagraphElement>
->(({ className, ...props }, ref) => (
-  <p
-    ref={ref}
-    className={cn("text-sm text-muted-foreground", className)}
-    {...props}
-  />
+const CardDescription = React.forwardRef<HTMLParagraphElement, React.HTMLAttributes<HTMLParagraphElement>>(({ className, ...props }, ref) => (
+  <p ref={ref} className={cn("text-sm text-muted-foreground", className)} {...props} />
 ))
 CardDescription.displayName = "CardDescription"
 
-const CardContent = React.forwardRef<
-  HTMLDivElement,
-  React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => (
+const CardContent = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(({ className, ...props }, ref) => (
   <div ref={ref} className={cn("p-6 pt-0", className)} {...props} />
 ))
 CardContent.displayName = "CardContent"
 
-const CardFooter = React.forwardRef<
-  HTMLDivElement,
-  React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => (
-  <div
-    ref={ref}
-    className={cn(" flex items-center p-6 pt-0", className)}
-    {...props}
-  />
+const CardFooter = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(({ className, ...props }, ref) => (
+  <div ref={ref} className={cn(" flex items-center p-6 pt-0 text-sm", className)} {...props} />
 ))
 CardFooter.displayName = "CardFooter"
 
-export { Card, CardHeader, CardFooter, CardTitle, CardDescription, CardContent }
+export { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle }
diff --git a/src/components/ui/input.tsx b/src/components/ui/input.tsx
index 6e4a231..fcec56a 100644
--- a/src/components/ui/input.tsx
+++ b/src/components/ui/input.tsx
@@ -9,7 +9,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(({ className, type,
     <input
       type={type}
       className={cn(
-        "flex h-10 w-full rounded-md border border-slate-200 border-slate-200 bg-white px-3 py-2 text-sm ring-offset-white file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-slate-500 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-slate-400 focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 dark:border-slate-800 dark:border-slate-800 dark:bg-slate-950 dark:ring-offset-slate-950 dark:placeholder:text-slate-400 dark:focus-visible:ring-slate-800",
+        "flex h-10 w-full rounded-md border  border-slate-200 bg-white px-3 py-2 text-sm ring-offset-white file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-slate-500 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-slate-400 focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 dark:border-slate-800  dark:bg-slate-950 dark:ring-offset-slate-950 dark:placeholder:text-slate-400 dark:focus-visible:ring-slate-800",
         className
       )}
       ref={ref}
diff --git a/src/components/functions/format.ts b/src/lib/format.ts
similarity index 100%
rename from src/components/functions/format.ts
rename to src/lib/format.ts
diff --git a/src/lib/hooks/auth.ts b/src/lib/hooks/auth.ts
new file mode 100644
index 0000000..d360459
--- /dev/null
+++ b/src/lib/hooks/auth.ts
@@ -0,0 +1,25 @@
+import { verifyAccessToken } from "@/lib/services/auth.service"
+import { cookies } from "next/headers"
+
+export const currentUser: () => { email: string | null; privateKey?: string | null } = () => {
+  const cookieStore = cookies()
+  const accessToken = cookieStore.get("accessToken")
+
+  let email = null
+  let privateKey = null
+
+  if (!accessToken) {
+    return { email, privateKey }
+  }
+
+  const payload = verifyAccessToken(accessToken.value)
+  if (!payload) {
+    return { email, privateKey }
+  }
+
+  const { sub, private_key } = payload
+  email = sub
+  privateKey = private_key
+
+  return { email, privateKey }
+}
diff --git a/src/components/hooks/timed-message.ts b/src/lib/hooks/timed-message.ts
similarity index 100%
rename from src/components/hooks/timed-message.ts
rename to src/lib/hooks/timed-message.ts
diff --git a/src/components/functions/password.ts b/src/lib/password.ts
similarity index 100%
rename from src/components/functions/password.ts
rename to src/lib/password.ts
diff --git a/src/services/GuardedPassword.service.ts b/src/lib/services/GuardedPassword.service.ts
similarity index 100%
rename from src/services/GuardedPassword.service.ts
rename to src/lib/services/GuardedPassword.service.ts
diff --git a/src/lib/services/auth.service.ts b/src/lib/services/auth.service.ts
new file mode 100644
index 0000000..b5d6b1f
--- /dev/null
+++ b/src/lib/services/auth.service.ts
@@ -0,0 +1,56 @@
+import jwt, { JwtPayload } from "jsonwebtoken"
+
+const JWT_SECRET = process.env.JWT_SECRET
+const JWT_REFRESH_SECRET = process.env.JWT_REFRESH_SECRET
+
+if (!JWT_SECRET) {
+  throw new Error("JWT_SECRET is not defined in the envronement.")
+}
+
+if (!JWT_REFRESH_SECRET) {
+  throw new Error("JWT_REFRESH_SECRET is not defined in the envronement.")
+}
+
+interface AccessTokenPayload extends JwtPayload {
+  sub: string
+  type: "access" | "refresh"
+  private_key: string
+}
+
+export const generateAccessToken = (userEmail: string, privateKey: string) => {
+  const payload: AccessTokenPayload = {
+    sub: userEmail,
+    type: "access",
+    private_key: privateKey,
+  }
+
+  return jwt.sign(payload, JWT_SECRET, { expiresIn: "1h" })
+}
+
+export const generateRefreshToken = (userEmail: string, privateKey: string): string => {
+  const payload: AccessTokenPayload = {
+    sub: userEmail,
+    type: "refresh",
+    private_key: privateKey,
+  }
+
+  return jwt.sign(payload, JWT_REFRESH_SECRET, { expiresIn: "1h" })
+}
+
+export const verifyAccessToken = (token: string): AccessTokenPayload | null => {
+  try {
+    const payload = jwt.verify(token, JWT_SECRET) as AccessTokenPayload
+    return payload
+  } catch (err) {
+    return null
+  }
+}
+
+export const verifyRefreshToken = (token: string): AccessTokenPayload | null => {
+  try {
+    const payload = jwt.verify(token, JWT_REFRESH_SECRET) as AccessTokenPayload
+    return payload
+  } catch (err) {
+    return null
+  }
+}
diff --git a/src/services/security.service.ts b/src/lib/services/security.service.ts
similarity index 97%
rename from src/services/security.service.ts
rename to src/lib/services/security.service.ts
index e1d0596..55a27f4 100644
--- a/src/services/security.service.ts
+++ b/src/lib/services/security.service.ts
@@ -1,4 +1,4 @@
-import { encryptData } from "@/components/types/types"
+import { encryptData } from "@/lib/types/types"
 import crypto from "crypto"
 
 // Générer une paire de clés RSA (privée et publique)
diff --git a/src/services/userApp.service.ts b/src/lib/services/userApp.service.ts
similarity index 100%
rename from src/services/userApp.service.ts
rename to src/lib/services/userApp.service.ts
diff --git a/src/components/styles/loader.module.css b/src/lib/styles/loader.module.css
similarity index 100%
rename from src/components/styles/loader.module.css
rename to src/lib/styles/loader.module.css
diff --git a/src/components/styles/password-input.module.css b/src/lib/styles/password-input.module.css
similarity index 100%
rename from src/components/styles/password-input.module.css
rename to src/lib/styles/password-input.module.css
diff --git a/src/components/types/types.ts b/src/lib/types/types.ts
similarity index 100%
rename from src/components/types/types.ts
rename to src/lib/types/types.ts
diff --git a/src/components/functions/validators.ts b/src/lib/validators.ts
similarity index 100%
rename from src/components/functions/validators.ts
rename to src/lib/validators.ts
diff --git a/src/middleware.ts b/src/middleware.ts
deleted file mode 100644
index 62e74ba..0000000
--- a/src/middleware.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { authMiddleware } from "@clerk/nextjs"
-
-export default authMiddleware({
-  publicRoutes: ["/", "/sandbox", "/api/get-public-key", "/api/passwords", "/api/passwords/:id*"],
-})
-
-export const config = {
-  matcher: ["/((?!.*\\..*|_next).*)", "/", "/(api|trpc)(.*)"],
-}
diff --git a/src/services/auth.service.ts b/src/services/auth.service.ts
deleted file mode 100644
index dd7c694..0000000
--- a/src/services/auth.service.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import jwt from 'jsonwebtoken'
-
-if (!process.env.JWT_SECRET) {
-  throw new Error('JWT_SECRET is not defined in the envronement.')
-}
-
-if (!process.env.JWT_REFRESH_SECRET) {
-  throw new Error('JWT_REFRESH_SECRET is not defined in the envronement.')
-}
-
-const JWT_SECRET = process.env.JWT_SECRET
-const JWT_REFRESH_SECRET = process.env.JWT_REFRESH_SECRET
-
-export const generateAccessToken = (userEmail: string) => {
-  const payload = {
-    sub: userEmail,
-    type: 'access',
-  }
-
-  return jwt.sign(payload, JWT_SECRET, { expiresIn: '1h' })
-}
-
-export const generateRefreshToken = (userEmail: string) => {
-  const payload = {
-    sub: userEmail,
-    type: 'refresh',
-  }
-
-  return jwt.sign(payload, JWT_REFRESH_SECRET, { expiresIn: '1h' })
-}
-
-export const verifyAccessToken = (token: string) => {
-  return jwt.verify(token, JWT_SECRET)
-}
-
-export const verifyRefreshToken = (token: string) => {
-  return jwt.verify(token, JWT_REFRESH_SECRET)
-}
diff --git a/src/zod/schema.example.ts b/src/zod/schema.example.ts
index 7061daf..1b51a70 100644
--- a/src/zod/schema.example.ts
+++ b/src/zod/schema.example.ts
@@ -18,3 +18,23 @@ export const addPasswordSchema = z.object({
 export const simplePasswordSchema = z.object({
   password: z.string(),
 })
+
+export const newMasterPasswordSchema = z
+  .object({
+    email: z.string().email({ message: "L'email n'est pas valide" }),
+    master: z.string().regex(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{15,}$/, {
+      message: "Le mot de passe doit contenir au moins 15 caractères, une majuscule, une minuscule, un chiffre et un caractère spécial",
+    }),
+    confirm: z.string(),
+  })
+  .refine((data) => data.master === data.confirm, {
+    message: "Les mots de passe ne correspondent pas",
+    path: ["confirm"],
+  })
+
+export const checkMasterPasswordSchema = z.object({
+  email: z.string().email({ message: "L'email n'est pas valide" }),
+  master: z.string().regex(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{15,}$/, {
+    message: "Le mot de passe doit contenir au moins 15 caractères, une majuscule, une minuscule, un chiffre et un caractère spécial",
+  }),
+})