Co-authored-by: dbroqua <contact@darkou.fr> Reviewed-on: #59
This commit is contained in:
parent
2da6afa06d
commit
da08aa0222
4 changed files with 83 additions and 37 deletions
|
@ -67,6 +67,7 @@
|
||||||
"passport-local": "^1.0.0",
|
"passport-local": "^1.0.0",
|
||||||
"rimraf": "^3.0.2",
|
"rimraf": "^3.0.2",
|
||||||
"sass": "^1.49.7",
|
"sass": "^1.49.7",
|
||||||
|
"svg-captcha": "^1.4.0",
|
||||||
"uuid": "^8.3.2",
|
"uuid": "^8.3.2",
|
||||||
"vue": "^3.2.31"
|
"vue": "^3.2.31"
|
||||||
},
|
},
|
||||||
|
|
|
@ -197,7 +197,11 @@ class Albums extends Pages {
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!album) {
|
if (!album) {
|
||||||
throw new ErrorEvent(404, "Impossible de trouver cet album");
|
throw new ErrorEvent(
|
||||||
|
404,
|
||||||
|
"Mise à jour",
|
||||||
|
"Impossible de trouver cet album"
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const values = await getAlbumDetails(album.discogsId);
|
const values = await getAlbumDetails(album.discogsId);
|
||||||
|
@ -221,7 +225,11 @@ class Albums extends Pages {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
throw new ErrorEvent(404, "Impossible de trouver cet album");
|
throw new ErrorEvent(
|
||||||
|
404,
|
||||||
|
"Suppression",
|
||||||
|
"Impossible de trouver cet album"
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import express from "express";
|
import express from "express";
|
||||||
import nodemailer from "nodemailer";
|
import nodemailer from "nodemailer";
|
||||||
|
import svgCaptcha from "svg-captcha";
|
||||||
|
|
||||||
import { sendResponse } from "../../../libs/format";
|
import { sendResponse } from "../../../libs/format";
|
||||||
|
|
||||||
|
@ -9,42 +10,68 @@ import ErrorEvent from "../../../libs/error";
|
||||||
// eslint-disable-next-line new-cap
|
// eslint-disable-next-line new-cap
|
||||||
const router = express.Router();
|
const router = express.Router();
|
||||||
|
|
||||||
router.route("/").post(async (req, res, next) => {
|
router
|
||||||
try {
|
.route("/")
|
||||||
if (mailMethod === "smtp") {
|
.get(async (req, res, next) => {
|
||||||
const { email, name, message } = req.body;
|
try {
|
||||||
|
const captcha = svgCaptcha.create({
|
||||||
|
size: 4,
|
||||||
|
noise: 2,
|
||||||
|
color: true,
|
||||||
|
});
|
||||||
|
req.session.captcha = captcha.text;
|
||||||
|
|
||||||
if (!email || !message) {
|
res.type("svg");
|
||||||
throw new ErrorEvent(
|
return res.status(200).send(captcha.data);
|
||||||
406,
|
} catch (err) {
|
||||||
"Le formulaire n'est pas correctement saisi"
|
return next(err);
|
||||||
);
|
}
|
||||||
|
})
|
||||||
|
.post(async (req, res, next) => {
|
||||||
|
try {
|
||||||
|
if (mailMethod === "smtp") {
|
||||||
|
const { email, name, message, captcha } = req.body;
|
||||||
|
|
||||||
|
if (!captcha || captcha !== req.session.captcha) {
|
||||||
|
throw new ErrorEvent(
|
||||||
|
406,
|
||||||
|
"Captcha",
|
||||||
|
"Le captcha n'est pas valide"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!email || !message) {
|
||||||
|
throw new ErrorEvent(
|
||||||
|
406,
|
||||||
|
"Erreur de saisie",
|
||||||
|
"Le formulaire n'est pas correctement saisi"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const transporter = nodemailer.createTransport(smtpConfig);
|
||||||
|
|
||||||
|
const text = `Bonjour,
|
||||||
|
Vous venez de recevoir un nouveau message de ${name} (${email}) :
|
||||||
|
|
||||||
|
${message}
|
||||||
|
`;
|
||||||
|
|
||||||
|
const data = await transporter.sendMail({
|
||||||
|
from: smtpConfig.auth.user,
|
||||||
|
to: mailTo,
|
||||||
|
subject: `${siteName} : Nouveau message`,
|
||||||
|
text,
|
||||||
|
});
|
||||||
|
|
||||||
|
const { messageId, response } = data;
|
||||||
|
|
||||||
|
return sendResponse(req, res, { messageId, response });
|
||||||
}
|
}
|
||||||
|
|
||||||
const transporter = nodemailer.createTransport(smtpConfig);
|
throw new ErrorEvent(500, "Routeur", "Méthode non configurée");
|
||||||
|
} catch (err) {
|
||||||
const text = `Bonjour,
|
return next(err);
|
||||||
Vous venez de recevoir un nouveau message de ${name} (${email}) :
|
|
||||||
|
|
||||||
${message}
|
|
||||||
`;
|
|
||||||
|
|
||||||
const data = await transporter.sendMail({
|
|
||||||
from: smtpConfig.auth.user,
|
|
||||||
to: mailTo,
|
|
||||||
subject: `${siteName} : Nouveau message`,
|
|
||||||
text,
|
|
||||||
});
|
|
||||||
|
|
||||||
const { messageId, response } = data;
|
|
||||||
|
|
||||||
return sendResponse(req, res, { messageId, response });
|
|
||||||
}
|
}
|
||||||
|
});
|
||||||
throw new ErrorEvent(500, "Méthode non configurée");
|
|
||||||
} catch (err) {
|
|
||||||
return next(err);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
export default router;
|
export default router;
|
||||||
|
|
|
@ -17,6 +17,14 @@
|
||||||
<textarea name="message" id="message" rows="6" required v-model="message" ></textarea>
|
<textarea name="message" id="message" rows="6" required v-model="message" ></textarea>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<% if (config.mailMethod !== 'formspree' ) { %>
|
||||||
|
<img src="/api/v1/contact" alt="Captcha" />
|
||||||
|
<div class="field">
|
||||||
|
<label for="captcha">Captcha</label>
|
||||||
|
<input type="text" name="captcha" id="captcha" v-model="captcha" required />
|
||||||
|
</div>
|
||||||
|
<% } %>
|
||||||
|
|
||||||
<button type="submit" class="button is-primary" :disabled="loading">
|
<button type="submit" class="button is-primary" :disabled="loading">
|
||||||
<% if (config.mailMethod !== 'formspree' ) { %>
|
<% if (config.mailMethod !== 'formspree' ) { %>
|
||||||
<i class="icon-spin animate-spin" v-if="loading"></i>
|
<i class="icon-spin animate-spin" v-if="loading"></i>
|
||||||
|
@ -34,6 +42,7 @@
|
||||||
email: '',
|
email: '',
|
||||||
name: '',
|
name: '',
|
||||||
message: '',
|
message: '',
|
||||||
|
captcha: '',
|
||||||
loading: false,
|
loading: false,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -50,10 +59,11 @@
|
||||||
const {
|
const {
|
||||||
email,
|
email,
|
||||||
message,
|
message,
|
||||||
name
|
name,
|
||||||
|
captcha,
|
||||||
} = this;
|
} = this;
|
||||||
|
|
||||||
axios.post('/api/v1/contact', {email, name, message})
|
axios.post('/api/v1/contact', {email, name, message, captcha})
|
||||||
.then( () => {
|
.then( () => {
|
||||||
showToastr("Message correctement envoyé", true);
|
showToastr("Message correctement envoyé", true);
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in a new issue