Fix merge conflicts with auth changes

This commit is contained in:
Tuan Dang
2023-06-05 21:27:01 +01:00
119 changed files with 12692 additions and 11206 deletions
@@ -294,6 +294,8 @@ export const verifyMfaToken = async (req: Request, res: Response) => {
if (!user) throw new Error('Failed to find user');
await LoginSRPDetail.deleteOne({ userId: user.id })
await checkUserDevice({
user,
ip: req.ip,