Merge pull request #22 from atlp-rwanda/ft-user-login-email-pwd

Ft user login email pwd

Author: furebo

Diff for: .circleci/config.yml

@@ -27,6 +27,11 @@ jobs:
       - run:
           name: Build Project
           command: tsc
+      - run:
+          name: Compile TypeScript
+          command: ./node_modules/.bin/tsc
+          
+      
 
 workflows:
   version: 2

Diff for: .gitignore

@@ -1,4 +1,8 @@
 /node_modules
 .env
 /coverage
-/dist
+/dist
+
+
+
+

Diff for: src/__test__/user.test.ts

@@ -1,12 +1,12 @@
 import request from "supertest";
 import app from "../../app";
-import db from '../database/config/database.config';
+import db from "../database/config/database.config";
 
 describe("User", () => {
-  let sequelizeInstance:any;
+  let sequelizeInstance: any;
 
   beforeAll(async () => {
-    jest.setTimeout(60000); 
+    jest.setTimeout(60000);
     sequelizeInstance = await db();
     await sequelizeInstance.query('TRUNCATE TABLE users RESTART IDENTITY CASCADE;');
   });
@@ -111,6 +111,57 @@ describe("User", () => {
       expect(res.body.data.message).toBe('Email address is required');
     });
   });
+
+  describe("Test user login", () => {
+    test("user logs in with correct credentials", async () => {
+      const loginUser = {
+        email: "[email protected]",
+        password: "Walmond@123"
+      };
+      const res = await request(app).post('/api/users/login').send(loginUser);
+      expect(res.statusCode).toBe(200);
+      expect(res.body.message).toBe('Login successful');
+      expect(res.body).toHaveProperty('token');
+    });
+
+    test("user logs in with incorrect password", async () => {
+      const loginUser = {
+        email: "[email protected]",
+        password: "wrongpassword"
+      };
+      const res = await request(app).post('/api/users/login').send(loginUser);
+      expect(res.statusCode).toBe(401);
+      expect(res.body.message).toBe('Invalid email or password');
+    });
+
+    test("user logs in with non-existing email", async () => {
+      const loginUser = {
+        email: "[email protected]",
+        password: "Password@123"
+      };
+      const res = await request(app).post('/api/users/login').send(loginUser);
+      expect(res.statusCode).toBe(401);
+      expect(res.body.message).toBe('Invalid email or password');
+    });
+
+    test("user logs in without email", async () => {
+      const loginUser = {
+        password: "Password@123"
+      };
+      const res = await request(app).post('/api/users/login').send(loginUser);
+      expect(res.statusCode).toBe(400);
+      expect(res.body.data.message).toBe('Email address is required');
+    });
+
+    test("user logs in without password", async () => {
+      const loginUser = {
+        email: "[email protected]"
+      };
+      const res = await request(app).post('/api/users/login').send(loginUser);
+      expect(res.statusCode).toBe(400);
+      expect(res.body.data.message).toBe('Password is required.');
+    });
+  });
 });
 
 describe("Testing endpoint", () => {

Diff for: src/controllers/user.controller.ts

@@ -5,6 +5,9 @@ import { hashPassword } from "../utils/password.utils";
 import { generateToken } from "../utils/tokenGenerator.utils";
 import { sendVerificationEmail } from "../utils/email.utils";
 
+
+import { comparePassword } from "../utils/password.utils";
+
 export const userSignup = async (req: Request, res: Response) => {
   const subject = "Email Verification";
   const text = `Please verify your email by clicking on the following link:`;
@@ -41,3 +44,46 @@ export const userSignup = async (req: Request, res: Response) => {
     console.log(error, "Error in creating account");
   }
 };
+
+
+//User Login Controller
+const userLogin = async (req: Request, res: Response) => {
+  try {
+    const { email, password } = req.body;
+
+    const user = await UserService.getUserByEmail(email);
+    if (!user) {
+      return res.status(401).json({
+        status: "fail",
+        message: "Invalid email or password",
+      });
+    }
+
+    const isPasswordValid = await comparePassword(password, user.password);
+    if (!isPasswordValid) {
+      return res.status(401).json({
+        status: "fail",
+        message: "Invalid email or password",
+      });
+    }
+
+    const token = await generateToken(user);
+
+    return res.status(200).json({
+      status: "success",
+      message: "Login successful",
+      token: token,
+      data: {
+        user,
+      },
+    });
+  } catch (error) {
+    console.error("Error during login:", error);
+    return res.status(500).json({
+      status: "error",
+      message: "An error occurred during login",
+    });
+  }
+};
+
+export default userLogin;

Diff for: src/routes/user.route.ts

@@ -1,9 +1,10 @@
 import express from 'express';
 import { userSignup } from '../controllers/user.controller';
-import { validateUser } from '../validations/user.validate';
+import userLogin from '../controllers/user.controller';
+import { validateUser,validateUserLogin } from '../validations/user.validate';
 
 const userRoutes = express.Router();
 
 userRoutes.post('/signup',validateUser,userSignup);
-
+userRoutes.post('/login', validateUserLogin, userLogin);
 export default userRoutes;

Diff for: src/utils/password.utils.ts

@@ -3,4 +3,8 @@ export async function hashPassword(password:any) {
     const salt = await bcrypt.genSalt(10)
     const hash = await bcrypt.hash(password, salt);
     return hash;
-}
+}
+
+export const comparePassword = async (password: string, hashedPassword: string) => {
+    return await bcrypt.compare(password, hashedPassword);
+  };

Diff for: src/validations/user.validate.ts

@@ -74,4 +74,31 @@ export const validateUser = async(
     });
   }
   next();
+};
+
+
+const loginValidation = Joi.object({
+  email: Joi.string()
+    .email({ minDomainSegments: 2, tlds: { allow: ["com", "net"] } })
+    .required()
+    .messages({
+      "string.email": "Please enter a valid email address",
+      "any.required": "Email address is required",
+    }),
+  password: Joi.string().required().messages({
+    "any.required": "Password is required.",
+  }),
+});
+
+export const validateUserLogin = (req: Request, res: Response, next: NextFunction) => {
+  const { error } = loginValidation.validate(req.body, { abortEarly: false });
+  if (error) {
+    return res.status(400).json({
+      status: "fail",
+      data: {
+        message: error.details.map(detail => detail.message).join(", "),
+      },
+    });
+  }
+  next();
 };

Diff for: swagger.config.ts

@@ -118,6 +118,63 @@ const options = {
             }
           }
         }
+      },
+
+      //User Login Route Documentation
+      '/api/users/login': {
+        post: {
+          summary: 'Login with Email and Password',
+          tags: ['Authentication'],
+          security: [],
+          requestBody: {
+            content: {
+              'application/json': {
+                schema: {
+                  type: 'object',
+                  properties: {
+
+                    email: {
+                      type: 'string',
+                      example: '[email protected]'
+                    },
+                    password: {
+                      type: 'string',
+                      example: 'Test@123'
+                    }
+                  },
+                  required: ['email', 'password']
+                }
+              }
+            }
+          },
+          responses: {
+            201: {
+              description: 'OK',
+              content: {
+                'application/json': {
+                  schema: {
+                    type: 'object',
+                    properties: {
+    
+                      email: { type: 'string' },
+                      password: { type: 'string' },
+                      
+                    },
+                    required: [
+                      
+                      'email',
+                      'password',
+                      
+                    ]
+                  }
+                }
+              }
+            },
+            400: {
+              description: 'Bad Request'
+            }
+          }
+        }
       }
     }
   },