aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar piotrruss <mail@pruss.it> 2022-06-01 18:07:07 +0100
committerGravatar piotrruss <mail@pruss.it> 2022-06-01 18:07:07 +0100
commit684377e55cc239aa1f09ef9c65e1f768e8733fa5 (patch)
tree4751ffdfb161e11a77969b915db8cd1e9cf6bc66
parent308d07785f811ff470d0e90b11680926a823027b (diff)
downloadmy_apps-684377e55cc239aa1f09ef9c65e1f768e8733fa5.tar.gz
my_apps-684377e55cc239aa1f09ef9c65e1f768e8733fa5.tar.bz2
my_apps-684377e55cc239aa1f09ef9c65e1f768e8733fa5.zip
log activity
-rw-r--r--helpers/email.js2
-rw-r--r--helpers/log.js13
-rw-r--r--models/Log.js12
-rw-r--r--pages/api/login.js8
-rw-r--r--pages/api/password.js11
-rw-r--r--pages/api/register.js14
-rw-r--r--pages/api/verify.js9
7 files changed, 65 insertions, 4 deletions
diff --git a/helpers/email.js b/helpers/email.js
index 5373d8a..9959c76 100644
--- a/helpers/email.js
+++ b/helpers/email.js
@@ -5,7 +5,7 @@ const mailData = (type, l, d) => {
case 'v': return {
subject: t(l, 'mail_ver_subject'),
text: `${t(l, 'mail_ver_t1')}\n${t(l, 'mail_ver_t2')}\n\n${d}\n\n${t(l, 'mail_ver_t3')}`,
- html: `<p>${t(l, 'mail_ver_t1')}<br/>${t(l, 'mail_ver_t2')}</p><p style="font-size: 150%;padding: 1em;border: 1px solid black">${key}</p><p>${t(l, 'mail_ver_t3')}</p></br>`,
+ html: `<p>${t(l, 'mail_ver_t1')}<br/>${t(l, 'mail_ver_t2')}</p><p style="font-size: 150%;padding: 1em;border: 1px solid black">${d}</p><p>${t(l, 'mail_ver_t3')}</p></br>`,
}
case 'p': return {
subject: t(l, 'mail_pass_subject'),
diff --git a/helpers/log.js b/helpers/log.js
new file mode 100644
index 0000000..5e570c2
--- /dev/null
+++ b/helpers/log.js
@@ -0,0 +1,13 @@
+import Log from 'models/Log'
+
+const log = async ({ email, action, callback, error }) => {
+ try {
+ await Log.create({ email, action, ...(error && {error: error?.message || '-'}) })
+ } finally {
+ if (callback) {
+ return callback()
+ }
+ }
+}
+
+export default log
diff --git a/models/Log.js b/models/Log.js
new file mode 100644
index 0000000..16875ee
--- /dev/null
+++ b/models/Log.js
@@ -0,0 +1,12 @@
+const mongoose = require('mongoose')
+
+const logSchema = new mongoose.Schema({
+ email: { type: String },
+ action: { type: String, required: true },
+ error: { type: String },
+ created_at: { type: Date, default: Date.now },
+})
+
+const Log = mongoose.models.Log || mongoose.model('Log', logSchema)
+
+export default Log
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