Feat: user login with email and password PR

.env.example

@@ -1,13 +1,20 @@
 PORT= ********************************
 APP_ENV= ********************************
-PDN_DB_NAME= *****************************
+
+TEST_DB_HOST= ********************************
+TEST_DB_PORT= ********************************
+TEST_DB_USER= ********************************
+TEST_DB_PASS= ********************************
+TEST_DB_NAME= ********************************
+
 DEV_DB_HOST= ********************************
 DEV_DB_PORT= ********************************
 DEV_DB_USER= ********************************
 DEV_DB_PASS= ***************************** 
-DEV_DB_TYPE= *******************************
+DEV_DB_NAME= *******************************
 
 PDN_DB_HOST= ********************************
 PDN_DB_PORT= ********************************
 PDN_DB_USER= ********************************
-PDN_DB_PASS= ********************************
+PDN_DB_PASS= ********************************
+PDN_DB_NAME= *****************************

.eslintrc.js

@@ -3,10 +3,7 @@ module.exports = {
  root: true,
  parser: '@typescript-eslint/parser',
  plugins: ['@typescript-eslint'],
- extends: [
- 'eslint:recommended',
- 'plugin:@typescript-eslint/recommended'
- ],
+ extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended'],
  rules: {
  '@typescript-eslint/no-explicit-any': 'off',
  '@typescript-eslint/no-unused-vars': [
@@ -28,8 +25,14 @@ module.exports = {
  'space-before-function-paren': ['warn', 'always'],
  'func-style': ['warn', 'declaration', { allowArrowFunctions: true }],
  'camelcase': 'warn',
- '@typescript-eslint/explicit-function-return-type': ['warn', { allowExpressions: true }],
- '@typescript-eslint/explicit-member-accessibility': ['off', { accessibility: 'explicit' }],
+ '@typescript-eslint/explicit-function-return-type': [
+ 'warn',
+ { allowExpressions: true },
+ ],
+ '@typescript-eslint/explicit-member-accessibility': [
+ 'off',
+ { accessibility: 'explicit' },
+ ],
  'no-unused-vars': 'warn',
  'no-extra-semi': 'warn',
  },

.github/workflows/ci.yml

@@ -3,11 +3,20 @@ name: knights-ecomm-be CI
 on: [push, pull_request]
 
 env:
- DEV_DB_HOST: ${{secrets.DEV_DB_HOST}}
- DEV_DB_PORT: ${{secrets.DEV_DB_PORT}}
- DEV_DB_USER: ${{secrets.DEV_DB_USER}}
- DEV_DB_PASS: ${{secrets.DEV_DB_PASS}}
- DEV_DB_NAME: ${{secrets.DEV_DB_NAME}}
+ TEST_DB_HOST: ${{secrets.TEST_DB_HOST}}
+ TEST_DB_PORT: ${{secrets.TEST_DB_PORT}}
+ TEST_DB_USER: ${{secrets.TEST_DB_USER}}
+ TEST_DB_PASS: ${{secrets.TEST_DB_PASS}}
+ TEST_DB_NAME: ${{secrets.TEST_DB_NAME}}
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+ HOST: ${{secrets.HOST}}
+ AUTH_EMAIL: ${{secrets.AUTH_EMAIL}}
+ AUTH_PASSWORD: ${{secrets.AUTH_PASSWORD}}
+>>>>>>> 2b118c3 (Implemented user registration feature with input validation, password hashing, and database integration)
+=======
+>>>>>>> c7b1dc4 (fix(user registration): resolve registration bug)
 
 jobs:
  build-lint-test-coverage:

.gitignore

@@ -5,4 +5,4 @@ package-lock.json
 coverage/
 dist
 /src/logs
-.DS_Stor
+.DS_Store

README.md

@@ -1,5 +1,18 @@
 # E-commerse Backend API
-[![knights-ecomm-be CI](https://github.com/atlp-rwanda/knights-ecomm-be/actions/workflows/ci.yml/badge.svg)](https://github.com/atlp-rwanda/knights-ecomm-be/actions/workflows/ci.yml)    [![Coverage Status](https://coveralls.io/repos/github/atlp-rwanda/knights-ecomm-be/badge.svg?branch=ch-ci-setup)](https://coveralls.io/github/atlp-rwanda/knights-ecomm-be?branch=ch-ci-setup)    [![Version](https://img.shields.io/badge/version-1.0.0-blue)](https://github.com/your-username/your-repo-name/releases/tag/v1.0.0)
+
+<<<<<<< HEAD
+<<<<<<< HEAD
+[![knights-ecomm-be CI](https://github.com/atlp-rwanda/knights-ecomm-be/actions/workflows/ci.yml/badge.svg)](https://github.com/atlp-rwanda/knights-ecomm-be/actions/workflows/ci.yml)
+=======
+[![Coverage Status](https://coveralls.io/repos/github/atlp-rwanda/knights-ecomm-be/badge.svg?branch=develop)](https://coveralls.io/github/atlp-rwanda/knights-ecomm-be?branch=develop)
+>>>>>>> 2b118c3 (Implemented user registration feature with input validation, password hashing, and database integration)
+=======
+[![knights-ecomm-be CI](https://github.com/atlp-rwanda/knights-ecomm-be/actions/workflows/ci.yml/badge.svg)](https://github.com/atlp-rwanda/knights-ecomm-be/actions/workflows/ci.yml)
+>>>>>>> c7b1dc4 (fix(user registration): resolve registration bug)
+&nbsp;&nbsp;
+[![Coverage Status](https://coveralls.io/repos/github/atlp-rwanda/knights-ecomm-be/badge.svg?branch=develop)](https://coveralls.io/github/atlp-rwanda/knights-ecomm-be?branch=develop)
+&nbsp;&nbsp;
+[![Version](https://img.shields.io/badge/version-1.0.0-blue)](https://github.com/your-username/your-repo-name/releases/tag/v1.0.0)
 
 ## Description
 

migrations/1714595134552-UserMigration.ts

@@ -0,0 +1,29 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class CreateUserMigration1614495123940 implements MigrationInterface {
+ public async up (queryRunner: QueryRunner): Promise<void> {
+ await queryRunner.query(`
+ CREATE TABLE "user" (
+ "id" uuid NOT NULL DEFAULT uuid_generate_v4(),
+ "firstName" character varying NOT NULL,
+ "lastName" character varying NOT NULL,
+ "email" character varying NOT NULL,
+ "password" character varying NOT NULL,
+ "gender" character varying NOT NULL,
+ "phoneNumber" character varying NOT NULL,
+ "photoUrl" character varying,
+ "verified" boolean NOT NULL,
+ "status" character varying NOT NULL CHECK (status IN ('active', 'suspended')),
+ "userType" character varying NOT NULL DEFAULT 'Buyer' CHECK (userType IN ('Admin', 'Buyer', 'Vendor')),
+ "createdAt" TIMESTAMP NOT NULL DEFAULT now(),
+ "updatedAt" TIMESTAMP NOT NULL DEFAULT now(),
+ CONSTRAINT "UQ_e12875dfb3b1d92d7d7c5377e22" UNIQUE ("email"),
+ CONSTRAINT "PK_cace4a159ff9f2512dd42373760" PRIMARY KEY ("id")
+ )
+ `);
+ }
+
+ public async down (queryRunner: QueryRunner): Promise<void> {
+ await queryRunner.query(`DROP TABLE "user"`);
+ }
+}

ormconfig.js

@@ -1,24 +1,39 @@
-module.exports = {
- "type": "postgres",
- "host": `${process.env.DEV_DB_HOST}`,
- "port": `${process.env.DEV_DB_PORT}`,
- "username": `${process.env.DEV_DB_USER}`,
- "password": `${process.env.DEV_DB_PASS}`,
- "database": `${process.env.DEV_DB_NAME}`,
- "synchronize": true,
- "logging": false,
- "entities": [
- "src/entities/**/*.ts"
- ],
- "migrations": [
- "src/migrations/**/*.ts"
- ],
- "subscribers": [
- "src/subscribers/**/*.ts"
- ],
- "cli": {
- "entitiesDir": "src/entities",
- "migrationsDir": "src/migrations",
- "subscribersDir": "src/subscribers"
- }
-};
+const devConfig = {
+ type: 'postgres',
+ host: process.env.DEV_DB_HOST,
+ port: process.env.DEV_DB_PORT,
+ username: process.env.DEV_DB_USER,
+ password: process.env.DEV_DB_PASS,
+ database: process.env.DEV_DB_NAME,
+ synchronize: true,
+ logging: false,
+ entities: ['src/entities/**/*.ts'],
+ migrations: ['src/migrations/**/*.ts'],
+ subscribers: ['src/subscribers/**/*.ts'],
+ cli: {
+ entitiesDir: 'src/entities',
+ migrationsDir: 'src/migrations',
+ subscribersDir: 'src/subscribers',
+ },
+};
+
+const testConfig = {
+ type: 'postgres',
+ host: process.env.TEST_DB_HOST,
+ port: process.env.TEST_DB_PORT,
+ username: process.env.TEST_DB_USER,
+ password: process.env.TEST_DB_PASS,
+ database: process.env.TEST_DB_NAME,
+ synchronize: true,
+ logging: false,
+ entities: ['src/entities/**/*.ts'],
+ migrations: ['src/migrations/**/*.ts'],
+ subscribers: ['src/subscribers/**/*.ts'],
+ cli: {
+ entitiesDir: 'src/entities',
+ migrationsDir: 'src/migrations',
+ subscribersDir: 'src/subscribers',
+ },
+};
+
+module.exports = process.env.NODE_ENV === 'test' ? testConfig : devConfig;

package.json

@@ -4,13 +4,15 @@
  "description": "E-commerce backend",
  "main": "index.js",
  "scripts": {
- "test": "jest --coverage --detectOpenHandles --verbose --runInBand",
- "dev": "nodemon src/index.ts",
+ "test": "cross-env APP_ENV=test jest --coverage --detectOpenHandles --verbose --runInBand ",
+ "dev": "cross-env APP_ENV=dev nodemon src/index.ts",
  "build": "tsc -p .",
  "start": "node dist/index.js",
  "lint": "eslint .",
  "lint:fix": "eslint --fix .",
- "format": "prettier --write ."
+ "format": "prettier --write .",
+ "typeorm": "typeorm-ts-node-commonjs",
+ "migration": " npm run typeorm migration:run -- -d ./ormconfig.js"
  },
  "keywords": [],
  "author": "Scrum master",
@@ -19,13 +21,18 @@
  "@types/express-winston": "^4.0.0",
  "@types/swagger-jsdoc": "^6.0.4",
  "@types/swagger-ui-express": "^4.1.6",
+ "bcrypt": "^5.1.1",
+ "class-validator": "^0.14.1",
+ "cookie-parser": "^1.4.6",
  "cors": "^2.8.5",
+ "cross-env": "^7.0.3",
  "dotenv": "^16.4.5",
  "express": "^4.19.2",
- "highlight.js": "^11.9.0",
  "express-winston": "^4.2.0",
+ "highlight.js": "^11.9.0",
  "jsend": "^1.1.0",
  "morgan": "^1.10.0",
+ "nodemailer": "^6.9.13",
  "nodemon": "^3.1.0",
  "pg": "^8.11.5",
  "reflect-metadata": "^0.2.2",
@@ -42,26 +49,34 @@
  },
  "devDependencies": {
  "@eslint/js": "^9.1.1",
+ "@types/bcrypt": "^5.0.2",
  "@types/body-parser": "^1.19.5",
+ "@types/cookie-parser": "^1.4.7",
  "@types/cors": "^2.8.17",
  "@types/dotenv": "^8.2.0",
  "@types/eslint": "^8.56.10",
  "@types/eslint__js": "^8.42.3",
  "@types/express": "^4.17.21",
  "@types/jest": "^29.5.12",
  "@types/jsend": "^1.0.32",
- "@types/node": "^20.12.7",
+ "@types/jsonwebtoken": "^9.0.6",
  "@types/morgan": "^1.9.9",
+ "@types/node": "^20.12.7",
+ "@types/nodemailer": "^6.4.15",
+ "@types/reflect-metadata": "^0.1.0",
  "@types/supertest": "^6.0.2",
  "@types/winston": "^2.4.4",
  "@typescript-eslint/eslint-plugin": "^7.7.1",
  "@typescript-eslint/parser": "^7.7.1",
+ "cross-env": "^7.0.3",
  "eslint": "^8.57.0",
  "eslint-config-prettier": "^9.1.0",
  "eslint-plugin-custom-plugin": "^1.0.0",
  "eslint-plugin-eslint-comments": "^3.2.0",
  "eslint-plugin-prettier": "^5.1.3",
  "jest": "^29.7.0",
+ "jest-mock-extended": "^3.0.6",
+ "jsonwebtoken": "^9.0.2",
  "prettier": "^3.2.5",
  "supertest": "^7.0.0",
  "ts-jest": "^29.1.2",