diff --git a/config/constant.js b/config/constant.js index 0918e54..2565e3b 100644 --- a/config/constant.js +++ b/config/constant.js @@ -19,4 +19,5 @@ exports.PASS = process.env.password exports.CLIENT_ID = process.env.CLIENT_ID exports.CLIENT_SECERET = process.env.CLIENT_SECERET exports.REDIRECT_URI = process.env.REDIRECT_URI -exports.REFRESH_TOKEN = process.env.REFRESH_TOKEN \ No newline at end of file +exports.REFRESH_TOKEN = process.env.REFRESH_TOKEN +exports.USER = process.env.USER \ No newline at end of file diff --git a/controllers/userController.js b/controllers/userController.js index 59d5f78..f7eb70c 100644 --- a/controllers/userController.js +++ b/controllers/userController.js @@ -58,10 +58,10 @@ exports.forgetPass = async (req, res) => { exports.updateuser = async (req, res) => { try { - await userServices.updateuser1(req.data.email , req.body); - res.status(201).send({success: "true", message: "user updated successfully" }); + const resp = await userServices.updateuser1(req.data.email , req.body); + res.status(201).send({success: "true", message: "user updated successfully", resposne:resp }); } catch (error) { - res.status(402).send({success: "false", message: "user not updated" }); + res.status(402).send({success: "false", message:"user not updated"}); } }; diff --git a/models/user.js b/models/user.js index af8f100..0de4e05 100644 --- a/models/user.js +++ b/models/user.js @@ -36,5 +36,16 @@ module.exports = (sequelize, DataTypes) => { console.log(error) } }); + + User.beforeUpdate(async function(user){ + try { + const salt = 10; + const hashedpassword = await bcrypt.hash(user.password, salt); + user.password = hashedpassword + } catch (error) { + console.log(error) + } + }); + return User; }; \ No newline at end of file diff --git a/routes/userRoute.js b/routes/userRoute.js index 716769c..c5bbdd0 100644 --- a/routes/userRoute.js +++ b/routes/userRoute.js @@ -9,6 +9,14 @@ router.post("/auth/signin",controller.signin); router.post("/address",mid.checkAuth,controller.user_address); router.put("/delete",mid.checkAuth,controller.deluser); router.put("/refresh",mid.verifyRT,controller.refreshuser); - +router.put("/changePassword",mid.checkAuth,controller.changePass); +router.post("/forgot-password",controller.verifyuser); +router.put("/verify-reset-password",mid.checkAuth,controller.forgetPass); +router.put("/updateuser",mid.checkAuth,controller.updateuser); +router.get("/list/:page",controller.userlist); +router.put("/profile-image",mid.upload,controller.profileImg); +router.post("/fetch/flipkart/mobile",controller.flipkartMob); +router.post("/fetch/flipkart/mobile/all",controller.flipkartAllMob); +router.post("/fetch/snapdeal/t-shirt",controller.snapdealTshirt); module.exports = router \ No newline at end of file diff --git a/services/userservices.js b/services/userservices.js index 17f778b..1de23f3 100644 --- a/services/userservices.js +++ b/services/userservices.js @@ -21,11 +21,11 @@ const transport = nodemailer.createTransport({ service:'gmail', auth: { type: 'OAuth2', - user: config.USERNAME, + user: config.USER, clientId: config.CLIENT_ID, clientSecret: config.CLIENT_SECERET, refreshToken: config.REFRESH_TOKEN, - accessToken: accessToken + accessToken: accessToken() }, }); @@ -57,8 +57,8 @@ await User.destroy({where:{id: id}}) } }; -const updateuser1 = async (data, body_data) => { - await users.updateOne(data.email, body_data); +const updateuser1 = async (email, body_data) => { + await User.update(body_data,{where:{email:email}}); }; const matchpass = async (data) => { @@ -66,11 +66,11 @@ const matchpass = async (data) => { }; const verifyemail = async (data) => { - const emailexist = await users.findOne({ email: data.email }); + const emailexist = await User.findOne({where: {email: data.email}}); if (emailexist) { const token = jwt.sign( - { email: emailexist.email, id: emailexist._id }, + { email: emailexist.email,id:emailexist._id,username:emailexist.username }, config.ACCESS_TOKEN_SECRET, { expiresIn: config.FPASS_EXPIRESIN } ); @@ -89,10 +89,9 @@ const verifyemail = async (data) => { }; const modifyPass = async (email, data) => { - await users.updateOne( - { email }, - { - password: data.password, + await User.update({password: data.password}, + { + where:{email:email} } ); const mailOption = { @@ -152,7 +151,7 @@ const usersignup = async (data) => { const user_list = async (page) => { const firstindex = (page - 1) * 10; const lastindex = page * 10; - const data = await users.find(); + const data = await User.findAll(); const sliced_data = data.slice(firstindex, lastindex); return sliced_data; };