You can now proceed to login.
+ ++ There was an error verifying your email. Please try again later. +
+You can now proceed to login.
) : ( @@ -57,4 +58,4 @@ export default function VerifyEmailPage() { )} ); -} \ No newline at end of file +} From 8aae4ee061fa06cddbf4241b325fe8612a0b99b7 Mon Sep 17 00:00:00 2001 From: Joywin Bennis <107112207+joywin2003@users.noreply.github.com> Date: Thu, 12 Sep 2024 21:57:16 +0530 Subject: [PATCH 05/14] Feat: Added send mail function using node mailer --- package-lock.json | 21 ++++++++++++++++++ package.json | 2 ++ src/app/api/verify-email/route.ts | 36 +++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+) diff --git a/package-lock.json b/package-lock.json index 14b5a2e..709c83a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,12 +16,14 @@ "jest": "^29.7.0", "next": "14.2.6", "next-auth": "^4.24.7", + "nodemailer": "^6.9.15", "react": "^18", "react-dom": "^18", "zod": "^3.23.8" }, "devDependencies": { "@types/node": "^20", + "@types/nodemailer": "^6.4.15", "@types/react": "^18", "@types/react-dom": "^18", "eslint": "^8", @@ -1875,6 +1877,16 @@ "undici-types": "~6.19.2" } }, + "node_modules/@types/nodemailer": { + "version": "6.4.15", + "resolved": "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-6.4.15.tgz", + "integrity": "sha512-0EBJxawVNjPkng1zm2vopRctuWVCxk34JcIlRuXSf54habUWdz1FB7wHDqOqvDa8Mtpt0Q3LTXQkAs2LNyK5jQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/prop-types": { "version": "15.7.12", "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz", @@ -6550,6 +6562,15 @@ "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==", "license": "MIT" }, + "node_modules/nodemailer": { + "version": "6.9.15", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.15.tgz", + "integrity": "sha512-AHf04ySLC6CIfuRtRiEYtGEXgRfa6INgWGluDhnxTZhHSKvrBu7lc1VVchQ0d8nPc4cFaZoPq8vkyNoZr0TpGQ==", + "license": "MIT-0", + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", diff --git a/package.json b/package.json index c7b0a92..f06d574 100644 --- a/package.json +++ b/package.json @@ -19,12 +19,14 @@ "jest": "^29.7.0", "next": "14.2.6", "next-auth": "^4.24.7", + "nodemailer": "^6.9.15", "react": "^18", "react-dom": "^18", "zod": "^3.23.8" }, "devDependencies": { "@types/node": "^20", + "@types/nodemailer": "^6.4.15", "@types/react": "^18", "@types/react-dom": "^18", "eslint": "^8", diff --git a/src/app/api/verify-email/route.ts b/src/app/api/verify-email/route.ts index e69de29..5ea8cbe 100644 --- a/src/app/api/verify-email/route.ts +++ b/src/app/api/verify-email/route.ts @@ -0,0 +1,36 @@ +import nodemailer from "nodemailer"; + +export interface EmailOptions { + from: string; + to: string; + subject: string; + html: string; + text: string; +} + +interface sendEmail { + email: string; + name: string; + emailVeificationLink: string; +} + +export const sendEmail = async (options: sendEmail) => { + const transporter = nodemailer.createTransport({ + service: "gmail", + auth: { + user: process.env.GMAIL_USER, + pass: process.env.GMAIL_PASS, + }, + }); + + const mailOptions: EmailOptions = { + from: `"Tedx SJEC" <${process.env.GMAIL_USER}>`, + to: options.email, + subject: "Tedx SJEC Email verification", + html: `Click on the link below to register for Tiara 2024
Register`, + text: `Click on the link below to register for Tiara 2024 ${options.emailVeificationLink}`, + }; + + const mailResponse = await transporter.sendMail(mailOptions); + return mailResponse; +}; From 0f0decba28b00c9cf2f79f9d9fa1440d3413ec91 Mon Sep 17 00:00:00 2001 From: Joywin Bennis <107112207+joywin2003@users.noreply.github.com> Date: Thu, 12 Sep 2024 22:01:09 +0530 Subject: [PATCH 06/14] Refactor: Move sendEmail function to src/utils/sendMail.ts --- src/app/api/verify-email/route.ts | 36 ------------------------------- src/utils/sendMail.ts | 36 +++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 36 deletions(-) create mode 100644 src/utils/sendMail.ts diff --git a/src/app/api/verify-email/route.ts b/src/app/api/verify-email/route.ts index 5ea8cbe..e69de29 100644 --- a/src/app/api/verify-email/route.ts +++ b/src/app/api/verify-email/route.ts @@ -1,36 +0,0 @@ -import nodemailer from "nodemailer"; - -export interface EmailOptions { - from: string; - to: string; - subject: string; - html: string; - text: string; -} - -interface sendEmail { - email: string; - name: string; - emailVeificationLink: string; -} - -export const sendEmail = async (options: sendEmail) => { - const transporter = nodemailer.createTransport({ - service: "gmail", - auth: { - user: process.env.GMAIL_USER, - pass: process.env.GMAIL_PASS, - }, - }); - - const mailOptions: EmailOptions = { - from: `"Tedx SJEC" <${process.env.GMAIL_USER}>`, - to: options.email, - subject: "Tedx SJEC Email verification", - html: `Click on the link below to register for Tiara 2024
Register`, - text: `Click on the link below to register for Tiara 2024 ${options.emailVeificationLink}`, - }; - - const mailResponse = await transporter.sendMail(mailOptions); - return mailResponse; -}; diff --git a/src/utils/sendMail.ts b/src/utils/sendMail.ts new file mode 100644 index 0000000..5ea8cbe --- /dev/null +++ b/src/utils/sendMail.ts @@ -0,0 +1,36 @@ +import nodemailer from "nodemailer"; + +export interface EmailOptions { + from: string; + to: string; + subject: string; + html: string; + text: string; +} + +interface sendEmail { + email: string; + name: string; + emailVeificationLink: string; +} + +export const sendEmail = async (options: sendEmail) => { + const transporter = nodemailer.createTransport({ + service: "gmail", + auth: { + user: process.env.GMAIL_USER, + pass: process.env.GMAIL_PASS, + }, + }); + + const mailOptions: EmailOptions = { + from: `"Tedx SJEC" <${process.env.GMAIL_USER}>`, + to: options.email, + subject: "Tedx SJEC Email verification", + html: `Click on the link below to register for Tiara 2024
Register`, + text: `Click on the link below to register for Tiara 2024 ${options.emailVeificationLink}`, + }; + + const mailResponse = await transporter.sendMail(mailOptions); + return mailResponse; +}; From 06927e1573e7875e86ea8151c3b37750efaebd4d Mon Sep 17 00:00:00 2001 From: Joywin Bennis <107112207+joywin2003@users.noreply.github.com> Date: Thu, 12 Sep 2024 22:27:01 +0530 Subject: [PATCH 07/14] Feat: successfully tested mailing option with postman --- src/app/api/verify-email/route.ts | 19 +++++++++++++++++++ src/utils/sendMail.ts | 3 +++ 2 files changed, 22 insertions(+) diff --git a/src/app/api/verify-email/route.ts b/src/app/api/verify-email/route.ts index e69de29..5570474 100644 --- a/src/app/api/verify-email/route.ts +++ b/src/app/api/verify-email/route.ts @@ -0,0 +1,19 @@ +import { NextRequest, NextResponse } from "next/server"; +import sendEmail from "@/utils/sendMail"; + +export async function POST(req: NextRequest) { + const body = await req.json(); + console.log(body); + const mailResponse = await sendEmail({ + email: body.email, + name: body.name, + emailVeificationLink: `http://localhost:3000/verify-email?token=${body.token}`, + }); + + return NextResponse.json({ message: "Email sent successfully!", mailResponse }); + +} + +export async function GET() { + return NextResponse.json({ message: "Hello from the Send mail!" }); +} \ No newline at end of file diff --git a/src/utils/sendMail.ts b/src/utils/sendMail.ts index 5ea8cbe..139eb4d 100644 --- a/src/utils/sendMail.ts +++ b/src/utils/sendMail.ts @@ -34,3 +34,6 @@ export const sendEmail = async (options: sendEmail) => { const mailResponse = await transporter.sendMail(mailOptions); return mailResponse; }; + + +export default sendEmail; \ No newline at end of file From 0812e653f8ac865e0b8041698590fdac2be20803 Mon Sep 17 00:00:00 2001 From: Joywin Bennis <107112207+joywin2003@users.noreply.github.com> Date: Thu, 12 Sep 2024 23:11:17 +0530 Subject: [PATCH 08/14] Refactor: verify email through otp process --- src/app/api/send-mail/route.ts | 19 +++++++++++++++++++ src/app/api/verify-email/route.ts | 12 ++++++------ src/app/page.tsx | 29 +++++++++++++++++++++++------ src/app/verify-email/page.tsx | 7 ++++--- src/utils/sendMail.ts | 6 +++--- 5 files changed, 55 insertions(+), 18 deletions(-) create mode 100644 src/app/api/send-mail/route.ts diff --git a/src/app/api/send-mail/route.ts b/src/app/api/send-mail/route.ts new file mode 100644 index 0000000..f272cf6 --- /dev/null +++ b/src/app/api/send-mail/route.ts @@ -0,0 +1,19 @@ +import { NextRequest, NextResponse } from "next/server"; +import sendEmail from "@/utils/sendMail"; + +export async function POST(req: NextRequest) { + const body = await req.json(); + console.log(body); + const mailResponse = await sendEmail({ + email: body.email, + name: body.name, + OTP: `http://localhost:3000/verify-email?token=${body.token}`, + }); + + return NextResponse.json({ message: "Email sent successfully!",mailResponse }); + +} + +export async function GET() { + return NextResponse.json({ message: "Hello from the Send mail!" }); +} \ No newline at end of file diff --git a/src/app/api/verify-email/route.ts b/src/app/api/verify-email/route.ts index 5570474..0c47a07 100644 --- a/src/app/api/verify-email/route.ts +++ b/src/app/api/verify-email/route.ts @@ -4,13 +4,13 @@ import sendEmail from "@/utils/sendMail"; export async function POST(req: NextRequest) { const body = await req.json(); console.log(body); - const mailResponse = await sendEmail({ - email: body.email, - name: body.name, - emailVeificationLink: `http://localhost:3000/verify-email?token=${body.token}`, - }); + // const mailResponse = await sendEmail({ + // email: body.email, + // name: body.name, + // emailVeificationLink: `http://localhost:3000/verify-email?token=${body.token}`, + // }); - return NextResponse.json({ message: "Email sent successfully!", mailResponse }); + return NextResponse.json({ message: "Email sent successfully!" }); } diff --git a/src/app/page.tsx b/src/app/page.tsx index 9e73346..c8d799c 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,8 +1,25 @@ +"use client"; + import { getServerSideSession } from "@/lib/get-server-session"; -export default async function Home() { - const session = await getServerSideSession(); - if (!session) { - returnYou can now proceed to login.
- */}Click on the link below to register for Tiara 2024
Register`, - text: `Click on the link below to register for Tiara 2024 ${options.emailVeificationLink}`, + html: `Click on the link below to register for Tiara 2024
Register`, + text: `Click on the link below to register for Tiara 2024 ${options.OTP}`, }; const mailResponse = await transporter.sendMail(mailOptions); From 4c16376c8af872a13968f079486275e2f33a873d Mon Sep 17 00:00:00 2001 From: Joywin Bennis <107112207+joywin2003@users.noreply.github.com> Date: Thu, 12 Sep 2024 23:19:20 +0530 Subject: [PATCH 09/14] Refactor: Add OTP generator for email verification --- package-lock.json | 18 ++++++++++++++++++ package.json | 2 ++ src/app/api/send-mail/route.ts | 17 +++++++++++++---- 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 709c83a..65f8ecb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,6 +17,7 @@ "next": "14.2.6", "next-auth": "^4.24.7", "nodemailer": "^6.9.15", + "otp-generator": "^4.0.1", "react": "^18", "react-dom": "^18", "zod": "^3.23.8" @@ -24,6 +25,7 @@ "devDependencies": { "@types/node": "^20", "@types/nodemailer": "^6.4.15", + "@types/otp-generator": "^4.0.2", "@types/react": "^18", "@types/react-dom": "^18", "eslint": "^8", @@ -1887,6 +1889,13 @@ "@types/node": "*" } }, + "node_modules/@types/otp-generator": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@types/otp-generator/-/otp-generator-4.0.2.tgz", + "integrity": "sha512-9+qqWzuFb332hXPbLgjUyOXlbcaTQkmkmqQjTduvNuOmPV5fW+iLv70JsVEhdUy0DWi4kY34++HDCaWl6N0AYg==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/prop-types": { "version": "15.7.12", "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz", @@ -6818,6 +6827,15 @@ "node": ">= 0.8.0" } }, + "node_modules/otp-generator": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/otp-generator/-/otp-generator-4.0.1.tgz", + "integrity": "sha512-2TJ52vUftA0+J3eque4wwVtpaL4/NdIXDL0gFWFJFVUAZwAN7+9tltMhL7GCNYaHJtuONoier8Hayyj4HLbSag==", + "license": "MIT", + "engines": { + "node": ">=14.10.0" + } + }, "node_modules/p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", diff --git a/package.json b/package.json index f06d574..26c0063 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "next": "14.2.6", "next-auth": "^4.24.7", "nodemailer": "^6.9.15", + "otp-generator": "^4.0.1", "react": "^18", "react-dom": "^18", "zod": "^3.23.8" @@ -27,6 +28,7 @@ "devDependencies": { "@types/node": "^20", "@types/nodemailer": "^6.4.15", + "@types/otp-generator": "^4.0.2", "@types/react": "^18", "@types/react-dom": "^18", "eslint": "^8", diff --git a/src/app/api/send-mail/route.ts b/src/app/api/send-mail/route.ts index f272cf6..333a750 100644 --- a/src/app/api/send-mail/route.ts +++ b/src/app/api/send-mail/route.ts @@ -1,19 +1,28 @@ import { NextRequest, NextResponse } from "next/server"; import sendEmail from "@/utils/sendMail"; +import otpGenerator from "otp-generator"; export async function POST(req: NextRequest) { const body = await req.json(); + const otp = otpGenerator.generate(6, { + upperCaseAlphabets: false, + lowerCaseAlphabets: false, + specialChars: false, + }); + console.log(body); const mailResponse = await sendEmail({ email: body.email, name: body.name, - OTP: `http://localhost:3000/verify-email?token=${body.token}`, + OTP: otp, }); - return NextResponse.json({ message: "Email sent successfully!",mailResponse }); - + return NextResponse.json({ + message: "Email sent successfully!", + mailResponse, + }); } export async function GET() { return NextResponse.json({ message: "Hello from the Send mail!" }); -} \ No newline at end of file +} From 8444f84ac3783a79a9836f0fc02a644129456c55 Mon Sep 17 00:00:00 2001 From: Joywin Bennis <107112207+joywin2003@users.noreply.github.com> Date: Thu, 12 Sep 2024 23:19:42 +0530 Subject: [PATCH 10/14] Feat: Successful email verification through otp --- src/utils/sendMail.ts | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/src/utils/sendMail.ts b/src/utils/sendMail.ts index e8c6fa0..ab88457 100644 --- a/src/utils/sendMail.ts +++ b/src/utils/sendMail.ts @@ -26,14 +26,33 @@ export const sendEmail = async (options: sendEmail) => { const mailOptions: EmailOptions = { from: `"Tedx SJEC" <${process.env.GMAIL_USER}>`, to: options.email, - subject: "Tedx SJEC Email verification", - html: `Click on the link below to register for Tiara 2024
Register`, - text: `Click on the link below to register for Tiara 2024 ${options.OTP}`, + subject: "Tedx SJEC - Your OTP for Email Verification", + html: ` +Thank you for registering for Tedx 2024.
+Your One-Time Password (OTP) for email verification is:
+Please enter this OTP to complete your registration. The OTP is valid for 10 minutes.
+Thank you!
+Tedx SJEC Team
+ `, + text: ` + Hello ${options.name}, + + Thank you for registering for Tedx 2024. + + Your One-Time Password (OTP) for email verification is: ${options.OTP} + + Please enter this OTP to complete your registration. The OTP is valid for 10 minutes. + + Thank you! + + Tedx SJEC Team + `, }; const mailResponse = await transporter.sendMail(mailOptions); return mailResponse; }; - -export default sendEmail; \ No newline at end of file +export default sendEmail; From bfe181c6078535a24c1bd247d7b24e887dc5a455 Mon Sep 17 00:00:00 2001 From: Joywin Bennis <107112207+joywin2003@users.noreply.github.com> Date: Thu, 12 Sep 2024 23:26:28 +0530 Subject: [PATCH 11/14] Refactor: Update VerificationRequest model to include OTP for email verification --- prisma/dev.db | Bin 94208 -> 102400 bytes prisma/dev.db-journal | Bin 8720 -> 25136 bytes .../20240912175524_email/migration.sql | 24 ++++++++++++++++++ prisma/schema.prisma | 8 +++--- 4 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 prisma/migrations/20240912175524_email/migration.sql diff --git a/prisma/dev.db b/prisma/dev.db index 2b1122dcb81ab6f678d52c4f62ff7033632fe088..d4a05b3574799bfede85e7191e8c44770211209a 100644 GIT binary patch delta 648 zcmZp8z}m2YZGyDmR0akHNgx&nVrC!~oTy{WICW#f5`GRQz6T8ag?tY-3kqD}t8e6E z;tFl#Wi@4BVC76PH8(afN;B29G)qa=H8C|v*0nG)HPSUrv@l6AG%`v|Gc~a^GB!&} zF-tZ!NKP~|vrIEJO*2n5v@l9cN=h*|HB2=zw6HL?ut+pWH8M^$GDYou can now proceed to login.
- {/* */} -- There was an error verifying your email. Please try again later. -
-