fix(user): fixed registration bug email confirmation restriction

app/api/users/route.ts

@@ -3,31 +3,55 @@ import { z } from "zod"
 
 import { env } from "@/env.mjs"
 import { db } from "@/lib/db"
+import i18n from "@/lib/i18n"
 import sendEmail from "@/lib/mail"
 import emailVerification from "@/lib/mail/templates/emailVerification"
+import { ErrorResponse } from "@/lib/response"
 import { generateEmailVerificationToken, hashPassword } from "@/lib/utils"
 
+import { findUserByEmail } from "./utils"
+
 const userCreateSchema = z.object({
   email: z.string(),
   password: z.string(),
 })
 
+// @ts-ignore
+BigInt.prototype.toJSON = function () {
+  const int = Number.parseInt(this.toString())
+  return int ?? this.toString()
+}
+
 export async function POST(req: Request) {
   try {
     const json = await req.json()
     const body = userCreateSchema.parse(json)
 
+    const userAlreadyExists = await findUserByEmail(body.email)
+
+    if (userAlreadyExists?.emailVerified) {
+      return ErrorResponse({
+        error: i18n.t("Email already exists"),
+      })
+    }
+
     const token = generateEmailVerificationToken()
 
-    const user = await db.user.create({
-      data: {
+    const user = await db.user.upsert({
+      where: {
+        email: body.email,
+      },
+      create: {
         email: body.email,
         password: hashPassword(body.password),
         emailVerificationToken: token,
-        tokens: freePlanTokens,
+        tokens: BigInt(freePlanTokens),
       },
-      select: {
-        id: true,
+      update: {
+        email: body.email,
+        password: hashPassword(body.password),
+        emailVerificationToken: token,
+        tokens: BigInt(freePlanTokens),
       },
     })
 

components/app/login/user-auth-form.tsx

@@ -29,6 +29,7 @@ export function UserAuthForm({ className, type, ...props }: UserAuthFormProps) {
     register,
     handleSubmit,
     formState: { errors },
+    reset,
   } = useForm<FormData>({
     resolver: zodResolver(userAuthSchema),
   })
@@ -78,6 +79,8 @@ export function UserAuthForm({ className, type, ...props }: UserAuthFormProps) {
         })
       }
 
+      reset()
+
       return toast({
         title: i18n.t("Check your email"),
         description: i18n.t(

lib/i18n/languages/en.json

@@ -47,6 +47,7 @@
   "Edit term": "Edit term",
   "Edit word: {keyword}": "Edit word: {{keyword}}",
   "Email": "Email",
+  "Email already exists": "Email already exists",
   "Email verified successfully": "Email verified successfully",
   "Email verified successfully. Please relogin": "Email verified successfully. Please relogin",
   "Enter the old and the new password": "Enter the old and the new password",