Ft: auth (new user needs to verify one's account before login

__test__/cart.test.ts

@@ -26,19 +26,22 @@ describe("testing cart", () => {
         name: "admin123",
         username: "admin123",
         email: "[email protected]",
+        isVerified:true,
         password: await bcrypt.hash("password", 10),
         roleId: 3,
       };
 
       const testBuyer = {
         name: "buyer123",
         username: "buyer123",
+        isVerified:true,
         email: "[email protected]",
         password: await bcrypt.hash("password", 10),
       };
       const testSeller = {
         name: "seller123",
         username: "seller123",
+        isVerified:true,
         email: "[email protected]",
         password: await bcrypt.hash("password", 10),
       };

__test__/payment.test.ts

@@ -22,6 +22,7 @@ describe("test stripe api payment", () => {
       const testAdmin = {
         name: "admin123",
         username: "admin123",
+        isVerified:true,
         email: "[email protected]",
         password: await bcrypt.hash("password", 10),
         roleId: 3,
@@ -30,13 +31,15 @@ describe("test stripe api payment", () => {
       const testBuyer = {
         name: "buyer123",
         username: "buyer123",
+        isVerified:true,
         email: "[email protected]",
         password: await bcrypt.hash("password", 10),
       };
 
       const testSeller = {
         name: "seller123",
         username: "seller123",
+        isVerified:true,
         email: "[email protected]",
         password: await bcrypt.hash("password", 10),
       };

__test__/product.test.ts

@@ -15,10 +15,12 @@ import { placeOrder } from "../src/services/payment.service";
 import Cart from "../src/sequelize/models/Cart";
 import CartItem from "../src/sequelize/models/CartItem";
 import OrderItem from "../src/sequelize/models/orderItems";
+import { generateVerificationToken } from "../src/utils/generateResetToken";
 
 const userData: any = {
   name: "yvanna",
   username: "testuser",
+  isVerified:true,
   email: "[email protected]",
   role:"seller",
   password: "test1234",
@@ -27,6 +29,7 @@ const userData: any = {
 const dummySeller = {
     name: "dummy1234",
     username: "username1234",
+    isVerified:true,
     email: "[email protected]",
     password: "1234567890",
   };
@@ -35,6 +38,7 @@ const product:any = {
     name: "pens",
     images: ["image1.jpg", "image2.jpg", "image3.jpg", "image4.jpg"],
     stockQuantity: 8,
+
     price: 5000,
     discount: 3.5,
     categoryID: 1,
@@ -43,6 +47,7 @@ const product:any = {
   const dummyBuyer = {
     name: "test user",
     username: "testUser",
+    isVerified:true,
     email: "[email protected]",
     password: "soleil00",    
   }
@@ -60,6 +65,7 @@ describe("Testing product Routes", () => {
         await connect();
         const testAdmin = {
             name: "admin123",
+            isVerified:true,
             username: "admin123",
             email: "[email protected]",
             password: await bcrypt.hash("password", 10),
@@ -76,8 +82,8 @@ describe("Testing product Routes", () => {
           ])
 
           await User.create(testAdmin);
-
-          const dummy = await request(app).post("/api/v1/users/register").send(dummySeller);
+          await User.create(dummySeller);
+          // await request(app).post("/api/v1/users/register").send(dummySeller);
         await Product.destroy({});
         await Category.destroy({truncate:true});
       } catch (error) {
@@ -98,12 +104,27 @@ describe("Testing product Routes", () => {
       expect(response.status).toBe(201);
     }, 20000);
 
+    it("It should verify user account.",async()=>{
+      const token = generateVerificationToken(userData.email, 60);
+      const response = await request(app)
+                      .get(`/api/v1/users/verify-user?token=${token}`)
+            expect(response.status).toBe(200)
+            expect(response.body.message).toBe('User verified successfully.')
+    },60000)
+
     test('should return 201 and register a dummy buyer user', async () => {
       const response = await request(app)
         .post("/api/v1/users/register")
         .send(dummyBuyer);
         expect(response.status).toBe(201);
     })
+    it("It should verify user account.",async()=>{
+      const token = generateVerificationToken(dummyBuyer.email, 60);
+      const response = await request(app)
+                      .get(`/api/v1/users/verify-user?token=${token}`)
+            expect(response.status).toBe(200)
+            expect(response.body.message).toBe('User verified successfully.')
+    },60000)
     let buyerToken: any;
 
     test("should login an buyer", async () =>{
@@ -128,6 +149,7 @@ describe("Testing product Routes", () => {
             password: "password"
       })
       adminToken = response.body.token;
+      expect(response.status).toBe(200)
     });
 
     test("should update dummyseller's role to seller", async () => {
@@ -146,6 +168,7 @@ describe("Testing product Routes", () => {
           })
           .set("Authorization", "Bearer " + adminToken);
         expect(response.status).toBe(200);
+        expect(response.body.message).toBe('User role updated successfully');
 
       });
 
@@ -472,7 +495,7 @@ test('It should return status 200 for removed category',async() =>{
   })
   it("changing product availability of product which does not exist", async ()=>{
     const response = await request(app)
-      .patch(`/api/v1/products/${91}/status`)
+      .patch(`/api/v1/products/${4444444}/status`)
       .set("Authorization", "Bearer " + token);
       expect(response.body.message).toBe('Product not found')      
   })

__test__/user.test.ts

@@ -15,14 +15,15 @@ import { QueryTypes } from "sequelize";
 // import redisClient from "../src/config/redis";
 import Redis from "ioredis";
 import { env } from "../src/utils/env";
-import { generateResetToken } from "../src/utils/generateResetToken";
+import { generateResetToken, generateVerificationToken } from "../src/utils/generateResetToken";
 
 let redisClient:any;
 
 
 const userData: any = {
   name: "yvanna5",
   username: "testuser5",
+  isVerified:true,
   email: "[email protected]",
   password: "test12345",
 };
@@ -31,11 +32,13 @@ const userData: any = {
 const dummySeller = {
   name: "dummy1234",
   username: "username1234",
+  isVerified:true,
   email: "[email protected]",
   password: "1234567890",
 };
 const userTestData = {
   newPassword: "Test@123",
+  isVerified:true,
   confirmPassword: "Test@123",
   wrongPassword: "Test456",
 };
@@ -107,6 +110,14 @@ describe("Testing user Routes", () => {
       expect(response.status).toBe(201);
     }, 20000);
 
+    it("It should verify user account.",async()=>{
+      const token = generateVerificationToken(userData.email, 60);
+      const response = await request(app)
+                      .get(`/api/v1/users/verify-user?token=${token}`)
+            expect(response.status).toBe(200)
+            expect(response.body.message).toBe('User verified successfully.')
+    },60000)
+
 
     test("should return 409 when registering with an existing email", async () => {
       User.create(userData);
@@ -135,7 +146,8 @@ describe("Testing user Routes", () => {
         email: userData.email,
         password: userData.password,
       });
-      expect(response.status).toBe(200);
+      // expect(response.status).toBe(200);
+      expect(response.body.message).toBe("Logged in");
       token = response.body.token;
     });
 
@@ -206,7 +218,7 @@ describe("Testing user Routes", () => {
   test("should login an Admin", async () =>{
     const response = await request(app).post("/api/v1/users/login").send({
       email: "[email protected]",
-        password: "password"
+      password: "password"
   })
   adminToken = response.body.token;
 });
@@ -548,6 +560,28 @@ describe('Patch /api/v1/users/reset-password', () => {
   },60000);
 });
 
+describe("Verifying user account",()=>{
+  it("It should verify user account.",async()=>{
+    await User.create(userData)
+    const token = generateVerificationToken(userData.email, 60);
+    const response = await request(app)
+                    .get(`/api/v1/users/verify-user?token=${token}`)
+          expect(response.status).toBe(200)
+          expect(response.body.message).toBe('User verified successfully.')
+  },60000)
+
+  it("It should send a verification link.",async()=>{
+    const response = await request(app)
+                    .post('/api/v1/users/verify-user-email')
+                    .send({
+                      email:userData.email
+                    })
+          expect(response.status).toBe(201)
+          expect(response.body.message).toBe("Verification email sent successfully.")
+  },60000)
+
+})
+
 afterAll(async () => {
   try {
     await sequelize.query('TRUNCATE TABLE profiles, users CASCADE');

src/controllers/userControllers.ts

@@ -105,7 +105,7 @@ export const createUserController = async (req: Request, res: Response) => {
     }
     return res.status(201).json({
       status: 201,
-      message: "User successfully created."
+      message: "User successfully created. check your inbox to verify your email"
     });
   } catch (err: any) {
     if (err.name === "UnauthorizedError" && err.message === "User already exists") {
@@ -190,6 +190,7 @@ export const handleSuccess = async (req: Request, res: Response) => {
         name: user.displayName,
         email: user.emails[0].value,
         username: user.name.familyName,
+        isVerified:true,
         //@ts-ignore
         password: null
       });
@@ -401,3 +402,30 @@ export const resetPasswordController = async (req: Request, res: Response): Prom
       return res.status(500).json({ message: 'Internal server error.' });
   }
 };
+
+export const verifyUserEmailController = async (req: Request, res: Response) => {
+  try {
+    // Extract email from the request body
+    const {email} = req.body;
+
+    const { error } = Emailschema.validate(req.body);
+    if (error) {
+      const cleanErrorMessage = error.details.map(detail => detail.message.replace(/['"]/g, '').trim()).join(', ')
+      return res.status(400).json({ message: cleanErrorMessage });
+    }
+    const result = await userService.verifyUserEmail(email);
+    res.status(result.status).json({ message: result.message });
+  } catch (error) {
+    res.status(500).json({ error: 'Failed to send verification email.' });
+  }
+};
+export const verifyUserController = async (req: Request, res: Response): Promise<void> => {
+  try {
+    // Extract token from the request query
+    const token = req.query.token as string;
+    const result = await userService.verifyNewUser(token);
+    res.status(result.status).json({ message: result.message });
+  } catch (error) {
+    res.status(500).json({ error: 'Failed to verify new user.' });
+  }
+};

src/docs/swagger.ts

@@ -19,6 +19,7 @@ import {
   sendResetLink,
   updateForgotPassword,
   verifyUserAccessToken,
+  verifyUserEmail,
 } from "./users";
 import {
   getProducts,
@@ -39,7 +40,6 @@ import { getCategories, addCategories, getSingleCategory, updateCategories, dele
     deleteRole
   } from "./roledoc";
 import { AddToWishes, deleteWish, getWishes, getWishesByProduct, wishSchema } from "./wishes";
-import { joinChats } from "./chats";
 import { addItemToCartDoc, clearAllProductFromCartDoc, removeProductFromCartDoc, updateProductQuantityDoc, viewCartDoc } from "./cart";
 import { getAllNotifications, readNotification } from "./notifications";
 import { homepage } from "./home";
@@ -115,6 +115,9 @@ const options = {
     "/api/v1/users/reset-password": {
       patch: updateForgotPassword,
     },
+    "/api/v1/users/verify-user-email": {
+      post: verifyUserEmail,
+    },
 
     "/api/v1/users/me": {
       post: verifyUserAccessToken,

src/docs/users.ts

@@ -481,3 +481,39 @@ export const updateForgotPassword = {
     }
   }
 };
+export const verifyUserEmail = {
+  tags: ["Users"],
+  summary: "Verify user email",
+  description: "Verify user email using the provided email address",
+  requestBody: {
+    required: true,
+    content: {
+      "application/json": {
+        schema: {
+          type: "object",
+          properties: {
+            email: {
+              type: "string",
+              description: "The user's email address"
+            }
+          },
+          required: ["email"]
+        }
+      }
+    }
+  },
+  responses: {
+    200: {
+      description: "Verification email sent successfully"
+    },
+    400: {
+      description: "Invalid email address"
+    },
+    404: {
+      description: "User not found"
+    },
+    500: {
+      description: "Internal server error"
+    }
+  }
+};