diff --git a/src/controllers/authController.js b/src/controllers/authController.js index 45a388f..46be06f 100644 --- a/src/controllers/authController.js +++ b/src/controllers/authController.js @@ -38,7 +38,7 @@ exports.login = async (req, res, next) => { if (user.role === 'caregiver') { // Generate OTP, save to user, send email const otp = generateOTP(); - const otpExpiresAt = new Date(Date.now() + 5 * 60 * 1000); // 5 min + const otpExpiresAt = new Date(Date.now() + 10 * 60 * 1000); // 5 min user.otp = otp; user.otpExpiresAt = otpExpiresAt; await user.save(); @@ -60,7 +60,10 @@ exports.verifyOtp = async (req, res, next) => { if (!user || !user.otp || !user.otpExpiresAt) { return res.status(400).json({ error: 'OTP not requested or expired' }); } - if (user.otp !== otp) { + + console.log("user otp -----",user.otp) + console.log("otp -----",otp) + if ((user.otp || '').trim() !== (otp || '').toString().trim()) { return res.status(401).json({ error: 'Invalid OTP' }); } if (user.otpExpiresAt < new Date()) { diff --git a/src/utils/email.js b/src/utils/email.js index f52bab8..2d00ef0 100644 --- a/src/utils/email.js +++ b/src/utils/email.js @@ -2,17 +2,24 @@ const nodemailer = require('nodemailer'); const { email: emailConfig } = require('../config/config'); const transporter = nodemailer.createTransport({ - host: emailConfig.host, - port: emailConfig.port, + service: 'gmail', auth: { - user: emailConfig.user, - pass: emailConfig.pass, + user: 'rohittech4biz2@gmail.com', + pass: 'laki sqgn txyo lahi' }, + // Set SMTP timeout to 5 minutes (300000 ms) + socketTimeout: 300000, + connectionTimeout: 300000, + greetingTimeout: 300000 }); + exports.sendMail = async (to, subject, text, html) => { - return transporter.sendMail({ - from: emailConfig.from, + console.log("email config-----", emailConfig); + console.log("from----", emailConfig.from); + console.log("to---", to); + return await transporter.sendMail({ + from: 'rohittech4biz2@gmail.com', to, subject, text,