KK
/
customer-dashboard-api
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated login

main
alex 2024-03-27 23:21:06 +01:00
parent 692114878a
commit 6eb711f673
1 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/controllers/userController.ts
View File

@ -46,7 +46,6 @@ import rabbitmq from "../rabbitmq/rabbitmq";
import verifyCaptcha from "../utils/recaptcha"; import verifyCaptcha from "../utils/recaptcha";
import EmailVerification from "../models/emailVerification"; import EmailVerification from "../models/emailVerification";
import UserPendingEmailChange from "../models/userPendingEmailChange"; import UserPendingEmailChange from "../models/userPendingEmailChange";
import UserPendingPayment from "../models/userPendingPayment";
import StoreServiceActivity from "../models/storeServiceActivity"; import StoreServiceActivity from "../models/storeServiceActivity";
import StoreService from "../models/storeService"; import StoreService from "../models/storeService";
import StoreServiceActivityUsers from "../models/storeServiceActivityUsers"; import StoreServiceActivityUsers from "../models/storeServiceActivityUsers";
@ -238,6 +237,7 @@ export async function Login(req: Request, res: Response) {
// user is on the login page on the first step of the login process // user is on the login page on the first step of the login process
// and only needs to enter their email to get the user state to know what to do next // and only needs to enter their email to get the user state to know what to do next
/*
if (password === undefined) { if (password === undefined) {
// user has signed up but not completed payment // user has signed up but not completed payment
// happens when user closed stripe checkout before completing payment // happens when user closed stripe checkout before completing payment
@ -270,7 +270,7 @@ export async function Login(req: Request, res: Response) {
} }
return res.status(200).send({ state: user.state }); return res.status(200).send({ state: user.state });
} } */
// validate recaptcha // validate recaptcha
@ -330,6 +330,10 @@ export async function Login(req: Request, res: Response) {
}); });
} }
if (user.state === ACCOUNT_STATE.ACTIVE) {
// create session
saveSession(req, res, user.user_id, rememberMe);
rabbitmq.sendEmail( rabbitmq.sendEmail(
email, email,
"dashboardSecurityInfoNewAccountLogin", "dashboardSecurityInfoNewAccountLogin",
@ -341,13 +345,18 @@ export async function Login(req: Request, res: Response) {
); );
userLogger.info(user.user_id, "User logged in"); userLogger.info(user.user_id, "User logged in");
} else {
res.status(200).send({ state: user.state });
// create session userLogger.info(
saveSession(req, res, user.user_id, rememberMe); user.user_id,
"User logged in, but account state is not active"
);
}
telegramNotification( telegramNotification(
1, 1,
`User logged in: user_id: ${user.user_id} email: ${email}` `User logged in: user_id: ${user.user_id} email: ${email} state: ${user.state}`
); );
} catch (error) { } catch (error) {
logger.error("login error", error as string); logger.error("login error", error as string);
@ -361,7 +370,7 @@ export async function ForgotPassword(req: Request, res: Response) {
// validate request // validate request
if (!email || !recaptcha || (await isEmailValid(email))) { if (!email || !recaptcha || !(await isEmailValid(email, false))) {
return res.status(400).send({ err: "invalid request" }); return res.status(400).send({ err: "invalid request" });
} }
@ -388,7 +397,8 @@ export async function ForgotPassword(req: Request, res: Response) {
}); });
if (!user) { if (!user) {
return res.status(400).send({ err: "invalid request" }); // sending success to prevent email enumeration
return res.status(200).send({ msg: "success" });
} }
// create email verification // create email verification