cleaning code

Author: Annine

src/config/googleToken.ts

@@ -1,7 +1,6 @@
 import GoogleTokenStrategy from 'passport-google-id-token'
 import { CLIENT_ID } from '../util/secrets'
-import User from 'src/models/User'
-import { nextTick } from 'async'
+import User from '../models/User'
 
 export const passportGoogleIdToken = () =>
   new GoogleTokenStrategy(
@@ -10,7 +9,7 @@ export const passportGoogleIdToken = () =>
     },
     async function (parsedToken: any, googleId: any, done: any) {
       //Create newUser Account here
-      const user = await User.findEmailandCreate(parsedToken)
+      const user = await User.findEmailandCreate(parsedToken.payload)
       done(null, user)
     }
   )

src/middlewares/jwt.ts

@@ -0,0 +1,23 @@
+import jwt from 'jsonwebtoken'
+import { SESSION_SECRET } from '../util/secrets'
+import user from 'src/services/user'
+
+export type Data = {
+  name: string;
+  email: string;
+  isAdmin: boolean;
+}
+
+const data: Data = { name: user.name, email: user.email, isAdmin: user.isAdmin }
+
+const createJWT = jwt.sign(data, SESSION_SECRET, { expiresIn: '1h' })
+
+const verifyJWT = jwt.verify(createJWT, SESSION_SECRET)
+
+const checkAdmin: boolean = verifyJWT.isAdmin
+
+export default {
+  createJWT,
+  verifyJWT,
+  checkAdmin,
+}

src/middlewares/validator.ts

@@ -1,22 +1,22 @@
-import { Request, Response, NextFunction } from 'express'
-import { body, validationResult } from 'express-validator'
+// import { Request, Response, NextFunction } from 'express'
+// import { body, validationResult } from 'express-validator'
 
-export const userValidationRules = () => {
-  return [
-    // must have an email
-    body('email').isEmail(),
-    //pass at least 8 chars long
-    body('password').isLength({ min: 8 }),
-  ]
-}
+// export const userValidationRules = () => {
+//   return [
+//     // must have an email
+//     body('email').isEmail(),
+//     //pass at least 8 chars long
+//     body('password').isLength({ min: 8 }),
+//   ]
+// }
 
-export const validate = (validations: any) => {
-  return async (req: Request, res: Response, next: NextFunction) => {
-    await Promise.all(validations.map((validation: any) => validation.run(req)))
-    const errors = validationResult(req)
-    if (errors.isEmpty()) {
-      return next()
-    }
-    res.status(422).json({ errors: errors.array() })
-  }
-}
+// export const validate = (validations: any) => {
+//   return async (req: Request, res: Response, next: NextFunction) => {
+//     await Promise.all(validations.map((validation: any) => validation.run(req)))
+//     const errors = validationResult(req)
+//     if (errors.isEmpty()) {
+//       return next()
+//     }
+//     res.status(422).json({ errors: errors.array() })
+//   }
+// }

src/routers/eCommerce.ts

@@ -1,5 +1,6 @@
 import express from 'express'
 
+import verifyJWT from '../middlewares/jwt'
 import {
   findAll,
   createProduct,
@@ -15,7 +16,7 @@ const router = express.Router()
 router.get('/', findAll)
 router.get('/:id', findById)
 router.get('/:search', findByQuery)
-// router.post('/', verifyToken ,createProduct)//admin need token
+router.post('/', verifyJWT, createProduct) //admin need token
 router.put('/:id', updateProduct)
 router.delete('/:id', deleteProduct)