Merge pull request #15 from Nandgopal-R/hotfix/googleOAuth

Hotfix:GoogleOAuth

Author: Yaswanth1832K

bun.lock

@@ -16,12 +16,14 @@
     "@prisma/client": "^7.3.0",
     "better-auth": "^1.4.18",
     "elysia": "^1.4.22",
+    "nodemailer": "^8.0.0",
     "pg": "^8.18.0",
     "pino": "^10.3.0"
   },
   "devDependencies": {
     "@biomejs/biome": "^2.3.14",
     "@types/bun": "latest",
+    "@types/nodemailer": "^7.0.9",
     "@types/pg": "^8.16.0",
     "husky": "^9.1.7",
     "lint-staged": "^16.2.7",

package.json

@@ -0,0 +1,4 @@
+-- AlterTable
+ALTER TABLE "account" ADD COLUMN     "accessTokenExpiresAt" TIMESTAMP(3),
+ADD COLUMN     "idToken" TEXT,
+ADD COLUMN     "scope" TEXT;

prisma/migrations/20260205174652_add_oauth_account_fields/migration.sql

@@ -45,14 +45,17 @@ model Session {
 }
 
 model Account {
-  id           String    @id @default(uuid())
-  userId       String
-  accountId    String
-  providerId   String
-  accessToken  String? // <--- Needed for OAuth
-  refreshToken String? // <--- Needed for OAuth
-  expiresAt    DateTime? // <--- Needed for OAuth
-  password     String? // <--- Needed for Email/Password
+  id                   String    @id @default(uuid())
+  userId               String
+  accountId            String
+  providerId           String
+  accessToken          String?
+  refreshToken         String?
+  idToken              String?
+  scope                String?
+  accessTokenExpiresAt DateTime?
+  expiresAt            DateTime?
+  password             String?
 
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt

prisma/schema.prisma

@@ -1,7 +1,18 @@
 import { betterAuth } from "better-auth";
 import { prismaAdapter } from "better-auth/adapters/prisma";
+import nodemailer from "nodemailer";
 import { prisma } from "../../db/prisma";
 
+const transporter = nodemailer.createTransport({
+  host: process.env.SMTP_HOST,
+  port: parseInt(process.env.SMTP_PORT || "587"),
+  secure: false, // true for 465, false for other ports
+  auth: {
+    user: process.env.SMTP_USER,
+    pass: process.env.SMTP_PASSWORD,
+  },
+});
+
 export const auth = betterAuth({
   database: prismaAdapter(prisma, {
     provider: "postgresql",
@@ -20,7 +31,30 @@ export const auth = betterAuth({
   emailAndPassword: {
     enabled: true,
   },
+
+  emailVerification: {
+    sendOnSignUp: true,
+    autoSignInAfterVerification: true,
+    sendVerificationEmail: async ({ user, url }) => {
+      await transporter.sendMail({
+        from: `"My App" <${process.env.FROM_EMAIL}>`,
+
+        to: user.email,
+        subject: "Verify your email address",
+        html: `
+          <h1>Welcome, ${user.name}!</h1>
+          <p>Click the link below to verify your email:</p>
+          <a href="${url}">Verify Email</a>
+        `,
+      });
+      console.log(`Verification email sent to ${user.email}`);
+    },
+  },
+
   baseURL: process.env.BETTER_AUTH_URL,
+  trustedOrigins: process.env.BETTER_AUTH_TRUSTED_ORIGINS?.split(",").map((o) =>
+    o.trim(),
+  ),
   socialProviders: {
     google: {
       prompt: "select_account",