feat: added new branch for 6th homework hw06-email. feat: added PATCH method for verify email

Author: Alexandrbig1

controllers/auth-controller.js

@@ -1,4 +1,4 @@
-import { HttpError } from "../helpers/index.js";
+import { HttpError, sendEmail } from "../helpers/index.js";
 import { ctrlWrapper } from "../decorators/index.js";
 import User from "../models/Users.js";
 import bcrypt from "bcrypt";
@@ -8,10 +8,11 @@ import gravatar from "gravatar";
 import fs from "fs/promises";
 import path from "path";
 import Jimp from "jimp";
+import { v4 as uuid4 } from "uuid";
 
 const avatarPath = path.resolve("public", "avatars");
 
-const { JWT_SECRET } = process.env;
+const { JWT_SECRET, BASE_URL } = process.env;
 
 const signUp = async (req, res) => {
   const { password, email } = req.body;
@@ -22,12 +23,23 @@ const signUp = async (req, res) => {
   }
   const hashPassword = await bcrypt.hash(password, 10);
   const avatarURL = gravatar.url(email, { s: "200", r: "pg", d: "mm" });
+  const verificationCode = uuid4();
   const newUser = await User.create({
     email,
     password: hashPassword,
     avatarURL,
+    verificationCode,
   });
 
+  const verifyEmail = {
+    to: email,
+    subject: "Verify Email",
+    html: `<a target="_blank" href="http://${BASE_URL}/api/auth/${verificationCode}">Click to verify email</a>`,
+    // html: `<a target="_blank" href="http://HOST/api/auth/${verificationCode}">Click to verify email</a>`,
+  };
+
+  await sendEmail(verifyEmail);
+
   res.status(201).json({
     message:
       "Registration successful. You can now sign in with your new account.",
@@ -47,6 +59,10 @@ const signIn = async (req, res) => {
     throw HttpError(401, "Incorrect login or password");
   }
 
+  if (!user.verify) {
+    throw HttpError(401, "Email not verify");
+  }
+
   const passwordCompare = await bcrypt.compare(password, user.password);
   if (!passwordCompare) {
     throw HttpError(401, "Incorrect login or password");
@@ -118,11 +134,49 @@ const updateAvatar = async (req, res) => {
   });
 };
 
+const verify = async (req, res) => {
+  const { verificationCode } = req.params;
+  const user = await User.findOne({ verificationCode });
+  if (!user) {
+    throw HttpError(400, "Email not found or already verified");
+  }
+
+  await User.findByIdAndUpdate(user._id, {
+    verify: true,
+    verificationCode: "",
+  });
+  res.json({ message: "Email verify success" });
+};
+
+const resendVerifyEmail = async (req, res) => {
+  const { email } = req.body;
+  const user = await User.findOne({ email });
+  if (!user) {
+    throw HttpError(404, "Email not found");
+  }
+  if (user.verify) {
+    throw HttpError(400, "Email already verified");
+  }
+
+  const verifyEmail = {
+    to: email,
+    subject: "Verify Email",
+    html: `<a target="_blank" href="http://${BASE_URL}/api/auth/${verificationCode}">Click to verify email</a>`,
+    // html: `<a target="_blank" href="http://HOST/api/auth/${verificationCode}">Click to verify email</a>`,
+  };
+
+  await sendEmail(verifyEmail);
+
+  res.json({ message: "Verify email send success" });
+};
+
 export default {
   signUp: ctrlWrapper(signUp),
   signIn: ctrlWrapper(signIn),
   getCurrent: ctrlWrapper(getCurrent),
   logOut: ctrlWrapper(logOut),
   updateSubscription: ctrlWrapper(updateSubscription),
   updateAvatar: ctrlWrapper(updateAvatar),
+  verify: ctrlWrapper(verify),
+  resendVerifyEmail: ctrlWrapper(resendVerifyEmail),
 };

helpers/index.js

@@ -1 +1,2 @@
 export { HttpError } from "./HttpError.js";
+export { sendEmail } from "./sendEmail.js";

helpers/sendEmail.js

@@ -0,0 +1,38 @@
+import nodemailer from "nodemailer";
+import "dotenv/config";
+
+const { MAIL_API_KEY, MAIL_FROM } = process.env;
+
+const nodemailerConfig = {
+  host: "smtp.ukr.net",
+  port: 465,
+  secure: true,
+  auth: {
+    user: MAIL_API_KEY,
+    pass: MAIL_FROM,
+  },
+};
+
+const transport = nodemailer.createTransport(nodemailerConfig);
+
+// const data = {
+//   from: MAIL_API_KEY,
+//   to: "email address for who",
+//   subject: "topic of the letter",
+//   html: "<stron>Hi!</stron>",
+// };
+
+// transport
+//   .sendMail(email)
+//   .then(() => {
+//     console.log("Email sent!");
+//   })
+//   .catch((err) => {
+//     console.log(err.message);
+//   });
+
+const sendEmail = (data) => {
+  const email = { ...data, from: MAIL_FROM };
+  return transport.sendEmail(email);
+};
+export { sendEmail };

lala.js

@@ -0,0 +1,32 @@
+import nodemailer from "nodemailer";
+import "dotenv/config";
+
+const { MAIL_API_KEY, MAIL_FROM } = process.env;
+
+const nodemailerConfig = {
+  host: "smtp.ukr.net",
+  port: 465,
+  secure: true,
+  auth: {
+    user: MAIL_API_KEY,
+    pass: MAIL_FROM,
+  },
+};
+
+const transport = nodemailer.createTransport(nodemailerConfig);
+
+const email = {
+  from: MAIL_API_KEY,
+  to: "email address for who",
+  subject: "topic of the letter",
+  html: "<stron>Hi!</stron>",
+};
+
+transport
+  .sendMail(email)
+  .then(() => {
+    console.log("Email sent!");
+  })
+  .catch((err) => {
+    console.log(err.message);
+  });

models/Users.js

@@ -26,6 +26,14 @@ const userSchema = new Schema(
     token: {
       type: String,
     },
+    verify: {
+      type: Boolean,
+      default: false,
+    },
+    verificationToken: {
+      type: String,
+      // required: [true, "Verify token is required"],
+    },
   },
   { versionKey: false, timestamps: true }
 );

package-lock.json

@@ -36,6 +36,7 @@
     "mongoose": "^8.0.3",
     "morgan": "^1.10.0",
     "multer": "^1.4.5-lts.1",
+    "nodemailer": "^6.9.8",
     "uuid": "^9.0.1"
   },
   "devDependencies": {

package.json

@@ -5,6 +5,7 @@ import { isEmptyBody, authenticate, upload } from "../../middleware/index.js";
 import {
   userAuthSchema,
   updateSubscriptionSchema,
+  verificationEmailSchema,
 } from "../../schemas/auth-schema.js";
 
 const authRouter = express.Router();
@@ -16,6 +17,15 @@ authRouter.post(
   authController.signUp
 );
 
+authRouter.get("/verify/:verificationCode", authController.verify);
+
+authRouter.post(
+  "/verify",
+  isEmptyBody,
+  validateBody(verificationEmailSchema),
+  authController.resendVerifyEmail
+);
+
 authRouter.post(
   "/signin",
   isEmptyBody,

routes/api/auth-router.js

@@ -23,4 +23,8 @@ const updateSubscriptionSchema = Joi.object({
   subscription: Joi.string().required(),
 });
 
-export { userAuthSchema, updateSubscriptionSchema };
+const verificationEmailSchema = Joi.object({
+  email: Joi.string().required(),
+});
+
+export { userAuthSchema, updateSubscriptionSchema, verificationEmailSchema };