feat : admin user rights updated.
feat : update for otp sent for registration. feat: login Api updated passes "rights" in response
This commit is contained in:
@@ -111,7 +111,7 @@ async function UserRights(req, res) {
|
|||||||
await db.query('INSERT INTO users (customer_no, password_hash,ib_access_level,mb_access_level) VALUES ($1, $2, $3, $4)',
|
await db.query('INSERT INTO users (customer_no, password_hash,ib_access_level,mb_access_level) VALUES ($1, $2, $3, $4)',
|
||||||
[CIF, password, ib_access_level, mb_access_level]
|
[CIF, password, ib_access_level, mb_access_level]
|
||||||
);
|
);
|
||||||
res.json({message:'User created and Rights Updated.'});
|
res.json({otp:`${first_time_pass}`});
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.log(err);
|
console.log(err);
|
||||||
logger.error(err, 'Right Update failed');
|
logger.error(err, 'Right Update failed');
|
||||||
|
@@ -18,17 +18,22 @@ async function login(req, res) {
|
|||||||
const user = await authService.validateUser(customerNo, password);
|
const user = await authService.validateUser(customerNo, password);
|
||||||
if (!user || !password)
|
if (!user || !password)
|
||||||
return res.status(401).json({ error: 'invalid credentials' });
|
return res.status(401).json({ error: 'invalid credentials' });
|
||||||
const token = generateToken(user.customer_no, '1d');
|
|
||||||
const FirstTimeLogin = await authService.CheckFirstTimeLogin(customerNo);
|
const FirstTimeLogin = await authService.CheckFirstTimeLogin(customerNo);
|
||||||
// For registration : if try to login first time after 7 days.
|
// For registration : if try to login first time after 7 days.
|
||||||
if (FirstTimeLogin && dayjs(user.created_at).diff(currentTime, "day") > 8)
|
if (FirstTimeLogin && dayjs(user.created_at).diff(currentTime, "day") > 8)
|
||||||
return res.status(401).json({ error: 'Password Expired.Please Contact with Administrator' });
|
return res.status(401).json({ error: 'Password Expired.Please Contact with Administrator' });
|
||||||
|
|
||||||
|
const token = generateToken(user.customer_no, '1d');
|
||||||
const loginPswExpiry = user.password_hash_expiry;
|
const loginPswExpiry = user.password_hash_expiry;
|
||||||
|
const rights = {
|
||||||
|
ibAccess: user.ib_access_level,
|
||||||
|
mbAccess: user.mb_access_level,
|
||||||
|
};
|
||||||
await db.query('UPDATE users SET last_login = $1 WHERE customer_no = $2', [
|
await db.query('UPDATE users SET last_login = $1 WHERE customer_no = $2', [
|
||||||
currentTime,
|
currentTime,
|
||||||
customerNo,
|
customerNo,
|
||||||
]);
|
]);
|
||||||
res.json({ token, FirstTimeLogin, loginPswExpiry });
|
res.json({ token, FirstTimeLogin, loginPswExpiry, rights });
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
logger.error(err, 'login failed');
|
logger.error(err, 'login failed');
|
||||||
res.status(500).json({ error: 'something went wrong' });
|
res.status(500).json({ error: 'something went wrong' });
|
||||||
|
@@ -7,14 +7,15 @@ const templates = require('../util/sms_template');
|
|||||||
|
|
||||||
// Send OTP
|
// Send OTP
|
||||||
async function SendOtp(req, res) {
|
async function SendOtp(req, res) {
|
||||||
const { mobileNumber, type, amount, beneficiary, ifsc, acctFrom, acctTo, ref, date } = req.body;
|
const { mobileNumber, type, amount, beneficiary, ifsc, acctFrom, acctTo, ref, date,userOtp } = req.body;
|
||||||
|
|
||||||
if (!mobileNumber || !type) {
|
if (!mobileNumber || !type) {
|
||||||
return res.status(400).json({ error: 'Mobile number and type are required' });
|
return res.status(400).json({ error: 'Mobile number and type are required' });
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const otp = generateOTP(6);
|
// const otp = generateOTP(6);
|
||||||
|
const otp = type === 'REGISTRATION' && userOtp ? userOtp : generateOTP(6);
|
||||||
let message;
|
let message;
|
||||||
|
|
||||||
// Pick template based on type
|
// Pick template based on type
|
||||||
|
Reference in New Issue
Block a user