Merge branch 'log_activity'

4 files changed, 39 insertions, 3 deletions

diff --git a/pages/api/login.js b/pages/api/login.js
index 1e9f816..283f185 100644
--- a/pages/api/login.js
+++ b/pages/api/login.js
@@ -1,10 +1,10 @@
 import withSession from 'hocs/withSession'
 import dbConnect from 'configs/dbConnect'
 import User from 'models/User'
+import log from 'helpers/log'
 
 export default withSession(async (req, res) => {
   const { method } = req
-
   await dbConnect()
 
   switch (method) {
@@ -17,8 +17,14 @@ export default withSession(async (req, res) => {
         const user = { _id, email, isVerified, isLoggedIn: true, noteList, theme, language }
         req.session.set('user', user)
         await req.session.save()
+        log({ email, action: 'login' })
         res.status(201).json(user)
       } catch (error) {
+        log({
+          email: JSON.parse(req.body)?.email,
+          action: 'login',
+          error,
+        })
         res.status(400).json({ isLoggedIn: false })
       }
       break
diff --git a/pages/api/password.js b/pages/api/password.js
index 871c9e6..a491e15 100644
--- a/pages/api/password.js
+++ b/pages/api/password.js
@@ -3,6 +3,7 @@ import withSession from 'hocs/withSession'
 import sendMail from 'configs/sendMail'
 import mailData from 'helpers/email'
 import User from 'models/User'
+import log from 'helpers/log'
 
 export default withSession(async (req, res) => {
   await dbConnect()
@@ -16,11 +17,19 @@ export default withSession(async (req, res) => {
           req.session.set('user', user)
           await req.session.save()
 
-          sendMail({to: user.email, ...mailData('p', user.language)})
+          try {
+            sendMail({to: user.email, ...mailData('p', user.language)})
+          } finally {}
 
+          log({ email: user.email, action: 'change password' })
           res.status(200).json(user)
         }
       } catch (error) {
+        log({
+          error,
+          email: req.session?.get('user')?.email,
+          action: 'change password',
+        })
         if (error?.message === 'Wrong password') {
           res.status(401).send({ error: 'Wrong password' })
         } else {
diff --git a/pages/api/register.js b/pages/api/register.js
index 56c8ba9..1ff12e1 100644
--- a/pages/api/register.js
+++ b/pages/api/register.js
@@ -4,6 +4,7 @@ import withSession from 'hocs/withSession'
 import mailData from 'helpers/email'
 import User from 'models/User'
 import NoteList from 'apps/Notes/models/NoteList'
+import log from 'helpers/log'
 
 export default withSession(async (req, res) => {
   const conn = await dbConnect()
@@ -20,16 +21,27 @@ export default withSession(async (req, res) => {
 
           if (!email) { throw new Error('Something went wrong') }
 
-          sendMail({to: body.email, ...mailData('v', language, key)})
+          try {
+            sendMail({to: email, ...mailData('v', language, key)})
+          } catch (e) {
+            log({ email, action: 'register_mail', error: e })
+          }
 
           const user = { _id, email, noteList, theme, language, isVerified: false, isLoggedIn: true }
           req.session.set('user', user)
           await req.session.save()
 
           session.endSession()
+
+          log({ email, action: 'register' })
           res.status(201).json(user)
         })
       } catch (error) {
+        log({
+          email: JSON.parse(req.body)?.email,
+          action: 'register',
+          error,
+        })
         res.status(400).json({ isLoggedIn: false })
       }
       break
diff --git a/pages/api/verify.js b/pages/api/verify.js
index edcc7a9..623d087 100644
--- a/pages/api/verify.js
+++ b/pages/api/verify.js
@@ -3,6 +3,7 @@ import sendMail from 'configs/sendMail'
 import User from 'models/User'
 import withSession from 'hocs/withSession'
 import mailData from 'helpers/email'
+import log from 'helpers/log'
 
 export default withSession(async (req, res) => {
   await dbConnect()
@@ -19,8 +20,10 @@ export default withSession(async (req, res) => {
         const response = await sendMail({to: email, ...mailData('v', l, key)})
         if (!response?.accepted?.length) { throw new Error('Something went wrong') }
 
+        log({ email, action: 'verify_mail' })
         res.status(204).send()
       } catch (error) {
+        log({ email: req.session.get('user'), action: 'verify_mail', error })
         res.status(400).send()
       }
       break
@@ -30,9 +33,15 @@ export default withSession(async (req, res) => {
           const user = await User.verifyUser(req.body._id, req.body.key)
           req.session.set('user', user)
           await req.session.save()
+          log({ email: user.email, action: 'verify' })
           res.status(200).json(user)
         }
       } catch (error) {
+        log({
+          email: req.session.get('user')?.email,
+          action: 'verify',
+          error,
+        })
         res.status(400).send()
       }
       break