fix sing in with google issue

Signed-off-by: Amit Amrutiya <[email protected]>

frontend/prisma/migrations/20240628062328_make_some_optional_field/migration.sql

@@ -0,0 +1,44 @@
+/*
+  Warnings:
+
+  - You are about to drop the `users` table. If the table is not empty, all the data it contains will be lost.
+
+*/
+-- DropForeignKey
+ALTER TABLE "chats" DROP CONSTRAINT "chats_userId_fkey";
+
+-- DropTable
+DROP TABLE "users";
+
+-- CreateTable
+CREATE TABLE "user" (
+    "_id" TEXT NOT NULL,
+    "email" TEXT,
+    "password" TEXT,
+    "username" TEXT,
+    "fullname" TEXT,
+    "profile_image" TEXT,
+    "bio" TEXT NOT NULL DEFAULT 'Hey there! I am available on ChatApp',
+    "phone_number" TEXT,
+    "friends" TEXT[],
+    "is_online" BOOLEAN NOT NULL DEFAULT false,
+    "is_verified" BOOLEAN NOT NULL DEFAULT false,
+    "verifyCode" TEXT,
+    "verifyCodeExpiry" TIMESTAMP(3),
+    "created_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updated_at" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "user_pkey" PRIMARY KEY ("_id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "user_email_key" ON "user"("email");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "user_username_key" ON "user"("username");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "user_phone_number_key" ON "user"("phone_number");
+
+-- AddForeignKey
+ALTER TABLE "chats" ADD CONSTRAINT "chats_userId_fkey" FOREIGN KEY ("userId") REFERENCES "user"("_id") ON DELETE SET NULL ON UPDATE CASCADE;

frontend/prisma/migrations/20240628062705_add_account/migration.sql

@@ -0,0 +1,23 @@
+-- CreateTable
+CREATE TABLE "Account" (
+    "id" TEXT NOT NULL,
+    "userId" TEXT NOT NULL,
+    "type" TEXT NOT NULL,
+    "provider" TEXT NOT NULL,
+    "providerAccountId" TEXT NOT NULL,
+    "refresh_token" TEXT,
+    "access_token" TEXT,
+    "expires_at" INTEGER,
+    "token_type" TEXT,
+    "scope" TEXT,
+    "id_token" TEXT,
+    "session_state" TEXT,
+
+    CONSTRAINT "Account_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Account_provider_providerAccountId_key" ON "Account"("provider", "providerAccountId");
+
+-- AddForeignKey
+ALTER TABLE "Account" ADD CONSTRAINT "Account_userId_fkey" FOREIGN KEY ("userId") REFERENCES "user"("_id") ON DELETE CASCADE ON UPDATE CASCADE;

frontend/prisma/migrations/20240629032643_modify_schema/migration.sql

@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE "chats" ALTER COLUMN "senderId" SET DATA TYPE TEXT,
+ALTER COLUMN "receiverId" SET DATA TYPE TEXT;

frontend/prisma/migrations/20240629033144_change_full_name_to_name/migration.sql

@@ -0,0 +1,9 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `fullname` on the `user` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "user" DROP COLUMN "fullname",
+ADD COLUMN     "name" TEXT;

frontend/prisma/migrations/20240629035013_change_profile_image_to_image/migration.sql

@@ -0,0 +1,9 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `profile_image` on the `user` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "user" DROP COLUMN "profile_image",
+ADD COLUMN     "image" TEXT;

frontend/prisma/migrations/20240629035403_change_is_verified_to_email_verified/migration.sql

@@ -0,0 +1,9 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `is_verified` on the `user` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "user" DROP COLUMN "is_verified",
+ADD COLUMN     "emailVerified" BOOLEAN NOT NULL DEFAULT false;

frontend/prisma/migrations/20240629041750_modify_schema/migration.sql

@@ -0,0 +1,9 @@
+/*
+  Warnings:
+
+  - The `emailVerified` column on the `user` table would be dropped and recreated. This will lead to data loss if there is data in the column.
+
+*/
+-- AlterTable
+ALTER TABLE "user" DROP COLUMN "emailVerified",
+ADD COLUMN     "emailVerified" TIMESTAMP(3);

frontend/prisma/schema.prisma

@@ -14,30 +14,50 @@ datasource db {
 }
 
 model User {
-  id               String   @id @default(uuid())
-  email            String   @unique
-  password         String
-  username         String   @unique
-  fullname         String
-  profile_image    String?
-  bio              String   @default("Hey there! I am available on ChatApp")
-  phone_number     String?  @unique
+  id               String    @id @default(uuid()) @map("_id")
+  email            String?   @unique
+  password         String?
+  username         String?   @unique
+  name             String?
+  image            String?
+  bio              String    @default("Hey there! I am available on ChatApp")
+  phone_number     String?   @unique
   friends          String[]
-  is_online        Boolean  @default(false)
-  is_verified      Boolean  @default(false)
-  verifyCode       String
-  verifyCodeExpiry DateTime
+  is_online        Boolean   @default(false)
+  emailVerified    DateTime?
+  verifyCode       String?
+  verifyCodeExpiry DateTime?
+  createdAt        DateTime  @default(now()) @map("created_at")
+  updatedAt        DateTime  @updatedAt @map("updated_at")
   chats            Chat[]
-  createdAt        DateTime @default(now()) @map("created_at")
-  updatedAt        DateTime @updatedAt @map("updated_at")
+  Account          Account[]
 
-  @@map("users")
+  @@map("user")
+}
+
+model Account {
+  id                String  @id @default(cuid())
+  userId            String
+  type              String
+  provider          String
+  providerAccountId String
+  refresh_token     String? @db.Text
+  access_token      String? @db.Text
+  expires_at        Int?
+  token_type        String?
+  scope             String?
+  id_token          String? @db.Text
+  session_state     String?
+
+  user User @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+  @@unique([provider, providerAccountId])
 }
 
 model Chat {
   id         Int      @id @default(autoincrement())
-  senderId   Int
-  receiverId Int
+  senderId   String
+  receiverId String
   message    String
   createdAt  DateTime @default(now()) @map("created_at")
   updatedAt  DateTime @updatedAt @map("updated_at")

frontend/src/actions/check-username-unique.ts

@@ -21,7 +21,9 @@ export async function checkUsernameUnique(
   const existingVerifiedUser = await db.user.findFirst({
     where: {
       username,
-      is_verified: true,
+      emailVerified: {
+        not: null,
+      },
     },
   });
 

frontend/src/actions/login.ts

@@ -25,7 +25,7 @@ export async function login(values: z.infer<typeof signInSchema>) {
     return { success: false, message: "Email does not exist!" };
   }
 
-  if (!existingUser.is_verified) {
+  if (!existingUser.emailVerified) {
     return {
       success: false,
       message: "Email not verified. First verify email",

frontend/src/actions/register.ts

@@ -17,7 +17,9 @@ export async function register(values: z.infer<typeof signUpSchema>) {
   const existingUserVerifiedByUsername = await db.user.findFirst({
     where: {
       username,
-      is_verified: true,
+      emailVerified: {
+        not: null,
+      },
     },
   });
 
@@ -37,7 +39,7 @@ export async function register(values: z.infer<typeof signUpSchema>) {
   expiryDate.setMinutes(expiryDate.getMinutes() + 10);
   const verifyCode = Math.floor(100000 + Math.random() * 900000).toString();
 
-  if (existingUserByEmail && existingUserByEmail.is_verified) {
+  if (existingUserByEmail && existingUserByEmail.emailVerified) {
     // existingUserByEmail.password = hashedPassword;
     // existingUserByEmail.verifyCode = verifyCode;
     // existingUserByEmail.verifyCodeExpiry = expiryDate;
@@ -52,12 +54,12 @@ export async function register(values: z.infer<typeof signUpSchema>) {
     const newUser = await db.user.create({
       data: {
         email,
-        fullname,
+        name: fullname,
         password: hashedPassword,
         username: username,
-        profile_image: `https://api.dicebear.com/5.x/initials/svg?seed=${firstName}+${lastName}`,
+        image: `https://api.dicebear.com/5.x/initials/svg?seed=${firstName}+${lastName}`,
         is_online: true,
-        is_verified: false,
+        emailVerified: new Date(),
         verifyCode: verifyCode,
         verifyCodeExpiry: expiryDate,
         friends: [],

frontend/src/actions/verify-code.ts

@@ -37,7 +37,7 @@ export async function verifyCode(value: verifyCodeType) {
         id: user.id,
       },
       data: {
-        is_verified: true,
+        emailVerified: new Date(),
       },
     });
 

frontend/src/auth.ts

@@ -11,17 +11,24 @@ export const {
   signIn,
   signOut,
 } = NextAuth({
+  events: {
+    async linkAccount({ user }) {
+      await db.user.update({
+        where: {
+          id: user.id,
+        },
+        data: {
+          emailVerified: new Date(),
+        },
+      });
+    },
+  },
   callbacks: {
     async signIn({ account, profile, user }) {
-      if (account?.provider === "google") {
-        console.log("profile", profile);
-        return !!profile?.email_verified;
-      }
       if (account?.provider !== "credentials") return true;
 
       const existingUser: User | null = await getUserById(user.id!);
-      console.log("existingUser", existingUser);
-      if (!existingUser || !existingUser.is_verified) {
+      if (!existingUser || !existingUser.emailVerified) {
         return false;
       }
       return true;
@@ -30,11 +37,10 @@ export const {
       if (token.sub) {
         session.user.id = token.sub;
       }
-      session.user.is_verified = token.is_verified;
       session.user.username = token.username;
       // @ts-ignore
-      session.user.fullname = token.name;
-      session.user.profile_image = token.profile_image;
+      session.user.name = token.name;
+      session.user.image = token.image;
       session.user.bio = token.bio;
       session.user.phone_number = token.phone_number;
       session.user.is_online = token.is_online;
@@ -50,14 +56,15 @@ export const {
       const existingUser = await getUserById(token.sub);
       if (!existingUser) return token;
 
-      token.name = existingUser.fullname;
-      token.email = existingUser.email;
-      token.username = existingUser.username;
+      if (existingUser.email && existingUser.username && existingUser.name) {
+        token.name = existingUser.name;
+        token.email = existingUser.email;
+        token.username = existingUser.username;
+      }
       token.bio = existingUser.bio;
       token.is_online = existingUser.is_online;
-      token.is_verified = existingUser.is_verified;
-      token.username = existingUser.username;
-      token.picture = existingUser.profile_image;
+      token.emailVerified = existingUser.emailVerified;
+      if (existingUser.image) token.image = existingUser.image;
       return token;
     },
   },

frontend/src/components/Navbar.tsx

@@ -19,7 +19,7 @@ const Navbar = async () => {
           <>
             <UserAvatar
               username={user?.name || user?.email || "Someone"}
-              src={user?.profile_image || ""}
+              src={user?.image || ""}
               height={40}
               width={40}
             />

frontend/src/components/RoomNavbar.tsx

@@ -27,8 +27,8 @@ const RoomNavbar: React.FC<RoomNavbarProps> = (props) => {
         <div>
           <div className="mx-5 mt-4 flex items-center text-white">
             <UserAvatar
-              username={user?.fullname || user.email || "Someone"}
-              src={user?.profile_image || ""}
+              username={user?.name || user.email || "Someone"}
+              src={user?.image || ""}
               height={40}
               width={40}
             />
@@ -52,7 +52,7 @@ const RoomNavbar: React.FC<RoomNavbarProps> = (props) => {
           <>
             <UserAvatar
               username={user?.username || user?.email || "Someone"}
-              src={user?.profile_image || ""}
+              src={user?.image || ""}
               height={40}
               width={40}
             />

frontend/src/types/next-auth.d.ts

@@ -5,11 +5,10 @@ import { JWT } from "next-auth/jwt";
 declare module "next-auth" {
   interface User {
     _id?: string;
-    is_verified?: boolean;
     username?: string;
     email?: string;
-    fullname?: string;
-    profile_image?: string;
+    name?: string;
+    image?: string;
     bio?: string;
     phone_number?: string;
     is_online?: boolean;
@@ -18,11 +17,10 @@ declare module "next-auth" {
   interface Session {
     user: {
       _id?: string;
-      is_verified?: boolean;
       username?: string;
       email?: string;
-      fullname?: string;
-      profile_image?: string;
+      name?: string;
+      image?: string;
       bio?: string;
       phone_number?: string;
       is_online?: boolean;
@@ -33,11 +31,10 @@ declare module "next-auth" {
 declare module "next-auth/jwt" {
   interface JWT {
     _id?: string;
-    is_verified?: boolean;
     username?: string;
     email?: string;
-    fullname?: string;
-    profile_image?: string;
+    name?: string;
+    image?: string;
     bio?: string;
     phone_number?: string;
     is_online?: boolean;