Fixed some typos

Author: Nil2000

app/(app)/settings/_client.tsx

@@ -13,7 +13,7 @@ import { saveSettingsSchema } from "@/schema/profile";
 import { uploadFile } from "@/utils/s3helpers";
 import type { user } from "@/server/db/schema";
 import { Button } from "@/components/ui-components/button";
-import { CheckCheck, Loader } from "lucide-react";
+import { CheckCheck, Loader2 } from "lucide-react";
 
 function classNames(...classes: string[]) {
   return classes.filter(Boolean).join(" ");
@@ -49,7 +49,6 @@ const Settings = ({ profile }: { profile: User }) => {
     defaultValues: {
       ...profile,
       username: profile.username || "",
-      email: profile.email || "",
     },
   });
 
@@ -140,22 +139,23 @@ const Settings = ({ profile }: { profile: User }) => {
 
   const handleNewEmailUpdate = async () => {
     setLoading(true);
-    try {
-      await updateEmail({ newEmail });
-
-      toast.success("Verification link sent to your email.");
-      setSendForVerification(true);
-    } catch (error: any) {
-      if (
-        error.data.code === "BAD_REQUEST" ||
-        error.data?.code === "INTERNAL_SERVER_ERROR"
-      ) {
-        toast.error(error.data.message);
-      } else {
-        toast.error("Something went wrong");
-      }
-    }
-    setLoading(false);
+    await updateEmail(
+      { newEmail },
+      {
+        onError(error) {
+          setLoading(false);
+          if (error) return toast.error(error.message);
+          return toast.error(
+            "Something went wrong sending the verification link.",
+          );
+        },
+        onSuccess() {
+          setLoading(false);
+          toast.success("Verification link sent to your email.");
+          setSendForVerification(true);
+        },
+      },
+    );
   };
 
   return (
@@ -381,7 +381,7 @@ const Settings = ({ profile }: { profile: User }) => {
                         <input
                           type="email"
                           id="currEmail"
-                          {...register("email")}
+                          value={profile.email!}
                           disabled
                         />
                       </div>
@@ -404,7 +404,7 @@ const Settings = ({ profile }: { profile: User }) => {
                         onClick={handleNewEmailUpdate}
                       >
                         {loading && (
-                          <Loader className="text-primary h-4 w-4 animate-spin" />
+                          <Loader2 className="text-primary h-6 w-6 animate-spin" />
                         )}
                         Send verification link
                       </Button>
@@ -415,12 +415,12 @@ const Settings = ({ profile }: { profile: User }) => {
                           Verification link sent
                         </h2>
                         <Button
-                          className="w-[200px]"
+                          className="w-[250px]"
                           disabled={!(newEmail || loading)}
                           onClick={handleNewEmailUpdate}
                         >
                           {loading && (
-                            <Loader className="text-primary h-8 w-8 animate-spin" />
+                            <Loader2 className="text-primary h-6 w-6 animate-spin" />
                           )}
                           Resend verification link
                         </Button>

…_added-emailtokenverification-schema.sql …_added_emailtokenverification_schema.sqldrizzle/0007_added-emailtokenverification-schema.sql renamed to drizzle/0007_added_emailtokenverification_schema.sql drizzle/0007_added-emailtokenverification-schema.sql renamed to drizzle/0007_added_emailtokenverification_schema.sql

@@ -5,7 +5,8 @@ CREATE TABLE IF NOT EXISTS "EmailVerificationToken" (
 	"expiresAt" timestamp NOT NULL,
 	"email" text NOT NULL,
 	"userId" text NOT NULL,
-	CONSTRAINT "EmailVerificationToken_token_unique" UNIQUE("token")
+	CONSTRAINT "EmailVerificationToken_token_unique" UNIQUE("token"),
+	CONSTRAINT "EmailVerificationToken_email_unique" UNIQUE("email")
 );
 --> statement-breakpoint
 DROP INDEX IF EXISTS "BannedUsers_userId_key";--> statement-breakpoint

drizzle/meta/0007_snapshot.json

@@ -1,5 +1,5 @@
 {
-  "id": "450f331b-d62b-44e2-b764-2002398417d7",
+  "id": "91f7060d-273a-41ac-9ab5-c1822239be6b",
   "prevId": "73711620-aa4c-4f03-bfbe-08098e17e1ac",
   "version": "7",
   "dialect": "postgresql",
@@ -552,6 +552,13 @@
           "columns": [
             "token"
           ]
+        },
+        "EmailVerificationToken_email_unique": {
+          "name": "EmailVerificationToken_email_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "email"
+          ]
         }
       }
     },

drizzle/meta/_journal.json

@@ -54,8 +54,8 @@
     {
       "idx": 7,
       "version": "7",
-      "when": 1728229457525,
-      "tag": "0007_added-emailtokenverification-schema",
+      "when": 1728398381909,
+      "tag": "0007_added_emailtokenverification_schema",
       "breakpoints": true
     }
   ]

schema/profile.ts

@@ -18,7 +18,6 @@ export const saveSettingsSchema = z.object({
   websiteUrl: z.string().url().optional().or(z.literal("")),
   emailNotifications: z.boolean().optional(),
   newsletter: z.boolean().optional(),
-  email: z.string().email().optional().or(z.literal("")),
 });
 
 export const getProfileSchema = z.object({

server/api/router/profile.ts

@@ -18,11 +18,12 @@ import { nanoid } from "nanoid";
 import { eq } from "drizzle-orm";
 import { emailTokenReqSchema } from "@/schema/token";
 import {
+  checkIfEmailExists,
   generateEmailToken,
   sendVerificationEmail,
   storeTokenInDb,
 } from "@/utils/emailToken";
-import { TOKEN_EXPIRATION_TIME } from "@/config/contants";
+import { TOKEN_EXPIRATION_TIME } from "@/config/constants";
 
 export const profileRouter = createTRPCRouter({
   edit: protectedProcedure
@@ -146,6 +147,15 @@ export const profileRouter = createTRPCRouter({
           });
         }
 
+        const ifEmailExists = await checkIfEmailExists(newEmail);
+
+        if (ifEmailExists) {
+          throw new TRPCError({
+            code: "BAD_REQUEST",
+            message: "Email already exists",
+          });
+        }
+
         const userId = ctx.session.user.id;
 
         const token = generateEmailToken();
@@ -155,10 +165,10 @@ export const profileRouter = createTRPCRouter({
         await sendVerificationEmail(newEmail, token);
 
         return { message: "Verification email sent" };
-      } catch (error) {
+      } catch (error: any) {
         throw new TRPCError({
-          code: "INTERNAL_SERVER_ERROR",
-          message: "Internal server error",
+          code: error.code || "INTERNAL_SERVER_ERROR",
+          message: error.message || "Internal server error",
         });
       }
     }),

server/db/schema.ts

@@ -118,7 +118,7 @@ export const emailVerificationToken = pgTable("EmailVerificationToken", {
   token: text("token").unique().notNull(),
   createdAt: timestamp("createdAt").defaultNow().notNull(),
   expiresAt: timestamp("expiresAt").notNull(),
-  email: text("email").notNull(),
+  email: text("email").notNull().unique(),
   userId: text("userId")
     .notNull()
     .references(() => user.id),

utils/emailToken.ts

@@ -144,3 +144,16 @@ export const deleteTokenFromDb = async (token: string) => {
     throw new Error("Failed to delete email verification token");
   }
 };
+
+export const checkIfEmailExists = async (email: string) => {
+  try {
+    const existingUser = await db.query.user.findFirst({
+      where: (users, { eq }) => eq(users.email, email),
+    });
+
+    return !!existingUser;
+  } catch (error) {
+    console.error("Error checking if email exists:", error);
+    throw new Error("Failed to check if email exists");
+  }
+};