disAccount

Author: KABANOFESTO

Diff for: package-lock.json

@@ -55,7 +55,9 @@
   },
   "devDependencies": {
     "@types/bcrypt": "^5.0.0",
+    "@types/connect-redis": "^0.0.20",
     "@types/express": "^4.17.16",
+    "@types/express-session": "^1.17.6",
     "@types/jest": "^29.4.0",
     "@types/jsonwebtoken": "^9.0.1",
     "@types/nodemailer": "^6.4.7",

Diff for: package.json

@@ -3,7 +3,6 @@ import USER from '../models/User'
 import {Request, Response} from 'express'
 import {Twilio} from 'twilio'
 import {encode} from '../helper/jwtTokenize'
-const {User} = require('../db/models')
 import bcrypt from 'bcrypt'
 
 import {config} from 'dotenv'

Diff for: src/controllers/authController.ts

@@ -10,18 +10,7 @@ export const encode = (claims: any) => {
   return token
 }
 
-<<<<<<< HEAD
-export const encode = (claims)=>{
-    const token= jwt.sign(claims, process.env.JWT_SECRET as string, { expiresIn: "7d"});
-    return token;
-};
-
-export const decode=(token:string)=>{
-    const payload=jwt.verify(token, process.env.JWT_SECRET as string) 
-    return payload;
-=======
 export const decode = (token: string) => {
   const payload = jwt.verify(token, process.env.JWT_SECRET as string)
   return payload
->>>>>>> 055cb4d (disAccount)
-}
+}

Diff for: src/helper/jwtTokenize.ts

@@ -13,7 +13,6 @@ const isAdmin = async (req: Request, res: Response, next: NextFunction) => {
     if (decoded.role.toString() != 'admin') {
       return res.status(403).send('Your are not admin')
     }
-    // req.user = decoded;
 
     return next()
   } catch (error) {

Diff for: src/middlewares/checkAdmin.ts

@@ -1,21 +1,19 @@
-import { Request, Response, NextFunction} from "express";
-import Joi, { any } from "joi";
-
-const logiValidation =(req:Request, res:Response, next:NextFunction)=>{
-        
-    const Schemas = Joi.object().keys({
-        password: Joi.string().min(6).max(6).required(),
-        email: Joi.string().email().required()
-    });
-    const {error} = Schemas.validate(req.body)
-    if(error){
-        return res.status(400).json({
-          status: 400,
-          error: error.details[0].message,
-        })
-    }
-    next()
+import {Request, Response, NextFunction} from 'express'
+import Joi, {any} from 'joi'
 
+const logiValidation = (req: Request, res: Response, next: NextFunction) => {
+  const Schemas = Joi.object().keys({
+    password: Joi.string().min(6).max(6).required(),
+    email: Joi.string().email().required(),
+  })
+  const {error} = Schemas.validate(req.body)
+  if (error) {
+    return res.status(400).json({
+      status: 400,
+      error: error.details[0].message,
+    })
+  }
+  next()
 }
 
-export default logiValidation
+export default logiValidation

Diff for: src/middlewares/loginValidation.ts

@@ -1,23 +1,21 @@
-import { NextFunction, Request, Response } from "express";
-import Joi from "joi";
+import {NextFunction, Request, Response} from 'express'
+import Joi from 'joi'
 
-const signupValidation =(req:Request, res:Response, next:NextFunction)=>{
-        
-    const Schemas = Joi.object().keys({
-      firstName: Joi.string().min(3).max(20).required(),
-      lastName: Joi.string().min(3).max(20).required(),
-      email: Joi.string().email().required(),
-      password: Joi.string().min(4).max(8).required(),
+const signupValidation = (req: Request, res: Response, next: NextFunction) => {
+  const Schemas = Joi.object().keys({
+    firstName: Joi.string().min(3).max(20).required(),
+    lastName: Joi.string().min(3).max(20).required(),
+    email: Joi.string().email().required(),
+    password: Joi.string().min(4).max(8).required(),
+  })
+  const {error} = Schemas.validate(req.body)
+  if (error) {
+    return res.status(400).json({
+      status: 400,
+      error: error.details[0].message,
     })
-    const {error} = Schemas.validate(req.body)
-    if(error){
-        return res.status(400).json({
-            status:400,
-            error:error.details[0].message
-        });
-    }
-    next()
-
+  }
+  next()
 }
 
-export default signupValidation
+export default signupValidation

Diff for: src/middlewares/signupValidation.ts

@@ -1,13 +1,8 @@
-<<<<<<< HEAD
-import { sequelizedb } from "../db/database";
-import {DataTypes} from "sequelize";
-import bcrypt from "bcrypt"
-import Profile from "./profilemodels/profile";
-=======
 import {sequelizedb} from '../db/database'
 import {DataTypes} from 'sequelize'
 import bcrypt from 'bcrypt'
->>>>>>> 1e531f7 (disAccount)
+import Profile from './profilemodels/profile'
+
 const USER = sequelizedb.define('user', {
   firstName: {
     type: DataTypes.STRING,
@@ -41,10 +36,6 @@ const USER = sequelizedb.define('user', {
 })
 USER.sync()
 
-<<<<<<< HEAD
-USER.hasOne(Profile, { foreignKey: 'userId', as: 'profile' });
-Profile.belongsTo(Profile, { foreignKey: 'userId' });
-export default USER 
-=======
+USER.hasOne(Profile, {foreignKey: 'userId', as: 'profile'})
+Profile.belongsTo(Profile, {foreignKey: 'userId'})
 export default USER
->>>>>>> 1e531f7 (disAccount)