Fix some issues
All checks were successful
Build and Push to Registry / build-and-push (push) Successful in 31s
All checks were successful
Build and Push to Registry / build-and-push (push) Successful in 31s
This commit is contained in:
parent
3855c739bc
commit
1632720e1b
@ -13,7 +13,8 @@
|
|||||||
"dotenv": "^17.2.0",
|
"dotenv": "^17.2.0",
|
||||||
"express": "^4.18.2",
|
"express": "^4.18.2",
|
||||||
"node-fetch": "^2.6.7",
|
"node-fetch": "^2.6.7",
|
||||||
"ovh": "^2.0.3"
|
"ovh": "^2.0.3",
|
||||||
|
"uuid": "^11.1.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"nodemon": "^3.0.1"
|
"nodemon": "^3.0.1"
|
||||||
|
749
src/server.js
749
src/server.js
@ -1,6 +1,7 @@
|
|||||||
const express = require('express');
|
const express = require('express');
|
||||||
const cors = require('cors');
|
const cors = require('cors');
|
||||||
const fetch = require('node-fetch');
|
const fetch = require('node-fetch');
|
||||||
|
const { v4: uuidv4 } = require('uuid');
|
||||||
const ovh = require('ovh');
|
const ovh = require('ovh');
|
||||||
const mailchimp = require('@mailchimp/mailchimp_transactional');
|
const mailchimp = require('@mailchimp/mailchimp_transactional');
|
||||||
require('dotenv').config();
|
require('dotenv').config();
|
||||||
@ -19,52 +20,99 @@ const corsOptions = {
|
|||||||
app.use(cors(corsOptions));
|
app.use(cors(corsOptions));
|
||||||
app.use(express.json());
|
app.use(express.json());
|
||||||
|
|
||||||
|
const authTokens = [];
|
||||||
|
|
||||||
|
const ECivility = {
|
||||||
|
MALE: 'MALE',
|
||||||
|
FEMALE: 'FEMALE',
|
||||||
|
OTHERS: 'OTHERS'
|
||||||
|
};
|
||||||
|
|
||||||
|
const EOfficeStatus = {
|
||||||
|
ACTIVATED: 'ACTIVATED',
|
||||||
|
DESACTIVATED: 'DESACTIVATED'
|
||||||
|
};
|
||||||
|
|
||||||
|
const EIdnotRole = {
|
||||||
|
DIRECTEUR: "Directeur général du CSN",
|
||||||
|
NOTAIRE_TITULAIRE: "Notaire titulaire",
|
||||||
|
NOTAIRE_ASSOCIE: "Notaire associé",
|
||||||
|
NOTAIRE_SALARIE: "Notaire salarié",
|
||||||
|
COLLABORATEUR: "Collaborateur",
|
||||||
|
SECRETAIRE_GENERAL: "Secrétaire général",
|
||||||
|
SUPPLEANT: "Suppléant",
|
||||||
|
ADMINISTRATEUR: "Administrateur",
|
||||||
|
RESPONSABLE: "Responsable",
|
||||||
|
CURATEUR: "Curateur",
|
||||||
|
}
|
||||||
|
|
||||||
function getOfficeStatus(statusName) {
|
function getOfficeStatus(statusName) {
|
||||||
switch (statusName) {
|
switch (statusName) {
|
||||||
case 'Pourvu':
|
case "Pourvu":
|
||||||
return 'ACTIVATED';
|
return EOfficeStatus.ACTIVATED;
|
||||||
case 'Pourvu mais décédé':
|
case "Pourvu mais décédé":
|
||||||
return 'ACTIVATED';
|
return EOfficeStatus.ACTIVATED;
|
||||||
case 'Sans titulaire':
|
case "Sans titulaire":
|
||||||
return 'ACTIVATED';
|
return EOfficeStatus.ACTIVATED;
|
||||||
case 'Vacance':
|
case "Vacance":
|
||||||
return 'ACTIVATED';
|
return EOfficeStatus.ACTIVATED;
|
||||||
case 'En activité':
|
case "En activité":
|
||||||
return 'ACTIVATED';
|
return EOfficeStatus.ACTIVATED;
|
||||||
default:
|
default:
|
||||||
return 'DESACTIVATED';
|
return EOfficeStatus.DESACTIVATED;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function getOfficeRole(roleName) {
|
||||||
|
switch (roleName) {
|
||||||
|
case EIdnotRole.NOTAIRE_TITULAIRE:
|
||||||
|
return { name: 'Notaire' };
|
||||||
|
case EIdnotRole.NOTAIRE_ASSOCIE:
|
||||||
|
return { name: 'Notaire' };
|
||||||
|
case EIdnotRole.NOTAIRE_SALARIE:
|
||||||
|
return { name: 'Notaire' };
|
||||||
|
case EIdnotRole.COLLABORATEUR:
|
||||||
|
return { name: 'Collaborateur' };
|
||||||
|
case EIdnotRole.SUPPLEANT:
|
||||||
|
return { name: 'Collaborateur' };
|
||||||
|
case EIdnotRole.ADMINISTRATEUR:
|
||||||
|
return { name: 'Collaborateur' };
|
||||||
|
case EIdnotRole.CURATEUR:
|
||||||
|
return { name: 'Collaborateur' };
|
||||||
|
default:
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function getRole(roleName) {
|
function getRole(roleName) {
|
||||||
switch (roleName) {
|
switch (roleName) {
|
||||||
case 'Notaire titulaire':
|
case EIdnotRole.NOTAIRE_TITULAIRE:
|
||||||
return { name: 'admin', label: 'Administrateur' };
|
return { name: 'admin' };
|
||||||
case 'Notaire associé':
|
case EIdnotRole.NOTAIRE_ASSOCIE:
|
||||||
return { name: 'admin', label: 'Administrateur' };
|
return { name: 'admin' };
|
||||||
case 'Notaire salarié':
|
case EIdnotRole.NOTAIRE_SALARIE:
|
||||||
return { name: 'notary', label: 'Notaire' };
|
return { name: 'notary' };
|
||||||
case 'Collaborateur':
|
case EIdnotRole.COLLABORATEUR:
|
||||||
return { name: 'notary', label: 'Notaire' };
|
return { name: 'notary' };
|
||||||
case 'Suppléant':
|
case EIdnotRole.SUPPLEANT:
|
||||||
return { name: 'notary', label: 'Notaire' };
|
return { name: 'notary' };
|
||||||
case 'Administrateur':
|
case EIdnotRole.ADMINISTRATEUR:
|
||||||
return { name: 'admin', label: 'Administrateur' };
|
return { name: 'admin' };
|
||||||
case 'Curateur':
|
case EIdnotRole.CURATEUR:
|
||||||
return { name: 'notary', label: 'Notaire' };
|
return { name: 'notary' };
|
||||||
default:
|
default:
|
||||||
return { name: 'default', label: 'Défaut' };
|
return { name: 'default' };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function getCivility(civility) {
|
function getCivility(civility) {
|
||||||
switch (civility) {
|
switch (civility) {
|
||||||
case 'Monsieur':
|
case 'Monsieur':
|
||||||
return 'MALE';
|
return ECivility.MALE;
|
||||||
case 'Madame':
|
case 'Madame':
|
||||||
return 'FEMALE';
|
return ECivility.FEMALE;
|
||||||
default:
|
default:
|
||||||
return 'OTHERS';
|
return ECivility.OTHERS;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -138,7 +186,7 @@ app.post('/api/v1/idnot/user/:code', async (req, res) => {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
const idnotUser = {
|
const idNotUser = {
|
||||||
idNot: payload.sub,
|
idNot: payload.sub,
|
||||||
office: {
|
office: {
|
||||||
idNot: payload.entity_idn,
|
idNot: payload.entity_idn,
|
||||||
@ -160,15 +208,19 @@ app.post('/api/v1/idnot/user/:code', async (req, res) => {
|
|||||||
phone_number: userData.numeroTelephone,
|
phone_number: userData.numeroTelephone,
|
||||||
cell_phone_number: userData.numeroMobile ?? userData.numeroTelephone,
|
cell_phone_number: userData.numeroMobile ?? userData.numeroTelephone,
|
||||||
civility: getCivility(userData.personne.civilite)
|
civility: getCivility(userData.personne.civilite)
|
||||||
}
|
},
|
||||||
|
office_role: getOfficeRole(userData.typeLien.name)
|
||||||
};
|
};
|
||||||
|
|
||||||
if (!idnotUser.contact.email) {
|
if (!idNotUser.contact.email) {
|
||||||
console.error("User pro email empty");
|
console.error('User pro email empty');
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
res.json(idnotUser);
|
const authToken = uuidv4();
|
||||||
|
authTokens.push({ idNot: idNotUser.idNot, authToken });
|
||||||
|
|
||||||
|
res.json({ idNotUser, authToken });
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
res.status(500).json({
|
res.status(500).json({
|
||||||
error: 'Internal Server Error',
|
error: 'Internal Server Error',
|
||||||
@ -198,69 +250,69 @@ const verificationCodes = new Map();
|
|||||||
// Service SMS
|
// Service SMS
|
||||||
class SmsService {
|
class SmsService {
|
||||||
static generateCode() {
|
static generateCode() {
|
||||||
return Math.floor(100000 + Math.random() * 900000);
|
return Math.floor(100000 + Math.random() * 900000);
|
||||||
}
|
}
|
||||||
|
|
||||||
// OVH Service
|
// OVH Service
|
||||||
static sendSmsWithOvh(phoneNumber, message) {
|
static sendSmsWithOvh(phoneNumber, message) {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
const ovhClient = ovh({
|
const ovhClient = ovh({
|
||||||
appKey: configSms.OVH_APP_KEY,
|
appKey: configSms.OVH_APP_KEY,
|
||||||
appSecret: configSms.OVH_APP_SECRET,
|
appSecret: configSms.OVH_APP_SECRET,
|
||||||
consumerKey: configSms.OVH_CONSUMER_KEY
|
consumerKey: configSms.OVH_CONSUMER_KEY
|
||||||
});
|
|
||||||
|
|
||||||
ovhClient.request('POST', `/sms/${configSms.OVH_SMS_SERVICE_NAME}/jobs`, {
|
|
||||||
message: message,
|
|
||||||
receivers: [phoneNumber],
|
|
||||||
senderForResponse: false,
|
|
||||||
sender: "not.IT Fact",
|
|
||||||
noStopClause: true
|
|
||||||
}, (error, result) => {
|
|
||||||
if (error) {
|
|
||||||
console.error('Erreur OVH SMS:', error);
|
|
||||||
resolve({ success: false, error: 'Échec de l\'envoi du SMS via OVH' });
|
|
||||||
} else {
|
|
||||||
resolve({ success: true });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
ovhClient.request('POST', `/sms/${configSms.OVH_SMS_SERVICE_NAME}/jobs`, {
|
||||||
|
message: message,
|
||||||
|
receivers: [phoneNumber],
|
||||||
|
senderForResponse: false,
|
||||||
|
sender: 'not.IT Fact',
|
||||||
|
noStopClause: true
|
||||||
|
}, (error, result) => {
|
||||||
|
if (error) {
|
||||||
|
console.error('Erreur OVH SMS:', error);
|
||||||
|
resolve({ success: false, error: 'Échec de l\'envoi du SMS via OVH' });
|
||||||
|
} else {
|
||||||
|
resolve({ success: true });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// SMS Factor Service
|
// SMS Factor Service
|
||||||
static async sendSmsWithSmsFactor(phoneNumber, message) {
|
static async sendSmsWithSmsFactor(phoneNumber, message) {
|
||||||
try {
|
try {
|
||||||
const url = new URL('https://api.smsfactor.com/send/simulate');
|
const url = new URL('https://api.smsfactor.com/send/simulate');
|
||||||
url.searchParams.append('to', phoneNumber);
|
url.searchParams.append('to', phoneNumber);
|
||||||
url.searchParams.append('text', message);
|
url.searchParams.append('text', message);
|
||||||
url.searchParams.append('sender', 'LeCoffre');
|
url.searchParams.append('sender', 'LeCoffre');
|
||||||
url.searchParams.append('token', configSms.SMS_FACTOR_TOKEN);
|
url.searchParams.append('token', configSms.SMS_FACTOR_TOKEN);
|
||||||
|
|
||||||
const response = await fetch(url.toString());
|
const response = await fetch(url.toString());
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error(`HTTP error! status: ${response.status}`);
|
throw new Error(`HTTP error! status: ${response.status}`);
|
||||||
}
|
|
||||||
|
|
||||||
return { success: true };
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Erreur SMS Factor:', error);
|
|
||||||
return { success: false, error: 'Échec de l\'envoi du SMS via SMS Factor' };
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return { success: true };
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Erreur SMS Factor:', error);
|
||||||
|
return { success: false, error: 'Échec de l\'envoi du SMS via SMS Factor' };
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Main method
|
// Main method
|
||||||
static async sendSms(phoneNumber, message) {
|
static async sendSms(phoneNumber, message) {
|
||||||
// Try first with OVH
|
// Try first with OVH
|
||||||
const ovhResult = await this.sendSmsWithOvh(phoneNumber, message);
|
const ovhResult = await this.sendSmsWithOvh(phoneNumber, message);
|
||||||
|
|
||||||
if (ovhResult.success) {
|
if (ovhResult.success) {
|
||||||
return ovhResult;
|
return ovhResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
// If OVH fails, try with SMS Factor
|
// If OVH fails, try with SMS Factor
|
||||||
console.log('OVH SMS failed, trying SMS Factor...');
|
console.log('OVH SMS failed, trying SMS Factor...');
|
||||||
return await this.sendSmsWithSmsFactor(phoneNumber, message);
|
return await this.sendSmsWithSmsFactor(phoneNumber, message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -269,19 +321,19 @@ const validatePhoneNumber = (req, res, next) => {
|
|||||||
const { phoneNumber } = req.body;
|
const { phoneNumber } = req.body;
|
||||||
|
|
||||||
if (!phoneNumber) {
|
if (!phoneNumber) {
|
||||||
return res.status(400).json({
|
return res.status(400).json({
|
||||||
success: false,
|
success: false,
|
||||||
message: 'Le numéro de téléphone est requis'
|
message: 'Le numéro de téléphone est requis'
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Validation basique du format
|
// Validation basique du format
|
||||||
const phoneRegex = /^\+?[1-9]\d{1,14}$/;
|
const phoneRegex = /^\+?[1-9]\d{1,14}$/;
|
||||||
if (!phoneRegex.test(phoneNumber)) {
|
if (!phoneRegex.test(phoneNumber)) {
|
||||||
return res.status(400).json({
|
return res.status(400).json({
|
||||||
success: false,
|
success: false,
|
||||||
message: 'Format de numéro de téléphone invalide'
|
message: 'Format de numéro de téléphone invalide'
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
next();
|
next();
|
||||||
@ -292,49 +344,49 @@ app.post('/api/send-code', validatePhoneNumber, async (req, res) => {
|
|||||||
const { phoneNumber } = req.body;
|
const { phoneNumber } = req.body;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Check if a code already exists and is not expired
|
// Check if a code already exists and is not expired
|
||||||
const existingVerification = verificationCodes.get(phoneNumber);
|
const existingVerification = verificationCodes.get(phoneNumber);
|
||||||
if (existingVerification) {
|
if (existingVerification) {
|
||||||
const timeSinceLastSend = Date.now() - existingVerification.timestamp;
|
const timeSinceLastSend = Date.now() - existingVerification.timestamp;
|
||||||
if (timeSinceLastSend < 30000) { // 30 secondes
|
if (timeSinceLastSend < 30000) { // 30 secondes
|
||||||
return res.status(429).json({
|
return res.status(429).json({
|
||||||
success: false,
|
|
||||||
message: 'Veuillez attendre 30 secondes avant de demander un nouveau code'
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Generate a new code
|
|
||||||
const code = SmsService.generateCode();
|
|
||||||
|
|
||||||
// Store the code
|
|
||||||
verificationCodes.set(phoneNumber, {
|
|
||||||
code,
|
|
||||||
timestamp: Date.now(),
|
|
||||||
attempts: 0
|
|
||||||
});
|
|
||||||
|
|
||||||
// Send the SMS
|
|
||||||
const message = `Votre code de vérification LeCoffre est : ${code}`;
|
|
||||||
const result = await SmsService.sendSms(phoneNumber, message);
|
|
||||||
|
|
||||||
if (result.success) {
|
|
||||||
res.json({
|
|
||||||
success: true,
|
|
||||||
message: 'Code envoyé avec succès',
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
res.status(500).json({
|
|
||||||
success: false,
|
|
||||||
message: 'Échec de l\'envoi du SMS via les deux fournisseurs'
|
|
||||||
});
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Erreur:', error);
|
|
||||||
res.status(500).json({
|
|
||||||
success: false,
|
success: false,
|
||||||
message: 'Erreur serveur lors de l\'envoi du code'
|
message: 'Veuillez attendre 30 secondes avant de demander un nouveau code'
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Generate a new code
|
||||||
|
const code = SmsService.generateCode();
|
||||||
|
|
||||||
|
// Store the code
|
||||||
|
verificationCodes.set(phoneNumber, {
|
||||||
|
code,
|
||||||
|
timestamp: Date.now(),
|
||||||
|
attempts: 0
|
||||||
|
});
|
||||||
|
|
||||||
|
// Send the SMS
|
||||||
|
const message = `Votre code de vérification LeCoffre est : ${code}`;
|
||||||
|
const result = await SmsService.sendSms(phoneNumber, message);
|
||||||
|
|
||||||
|
if (result.success) {
|
||||||
|
res.json({
|
||||||
|
success: true,
|
||||||
|
message: 'Code envoyé avec succès',
|
||||||
});
|
});
|
||||||
|
} else {
|
||||||
|
res.status(500).json({
|
||||||
|
success: false,
|
||||||
|
message: 'Échec de l\'envoi du SMS via les deux fournisseurs'
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Erreur:', error);
|
||||||
|
res.status(500).json({
|
||||||
|
success: false,
|
||||||
|
message: 'Erreur serveur lors de l\'envoi du code'
|
||||||
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -342,52 +394,52 @@ app.post('/api/verify-code', validatePhoneNumber, (req, res) => {
|
|||||||
const { phoneNumber, code } = req.body;
|
const { phoneNumber, code } = req.body;
|
||||||
|
|
||||||
if (!code) {
|
if (!code) {
|
||||||
return res.status(400).json({
|
return res.status(400).json({
|
||||||
success: false,
|
success: false,
|
||||||
message: 'Le code est requis'
|
message: 'Le code est requis'
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
const verification = verificationCodes.get(phoneNumber);
|
const verification = verificationCodes.get(phoneNumber);
|
||||||
|
|
||||||
if (!verification) {
|
if (!verification) {
|
||||||
return res.status(400).json({
|
return res.status(400).json({
|
||||||
success: false,
|
success: false,
|
||||||
message: 'Aucun code n\'a été envoyé à ce numéro'
|
message: 'Aucun code n\'a été envoyé à ce numéro'
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if the code has not expired (5 minutes)
|
// Check if the code has not expired (5 minutes)
|
||||||
if (Date.now() - verification.timestamp > 5 * 60 * 1000) {
|
if (Date.now() - verification.timestamp > 5 * 60 * 1000) {
|
||||||
verificationCodes.delete(phoneNumber);
|
verificationCodes.delete(phoneNumber);
|
||||||
return res.status(400).json({
|
return res.status(400).json({
|
||||||
success: false,
|
success: false,
|
||||||
message: 'Le code a expiré'
|
message: 'Le code a expiré'
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if the code is correct
|
// Check if the code is correct
|
||||||
if (verification.code.toString() === code.toString()) {
|
if (verification.code.toString() === code.toString()) {
|
||||||
verificationCodes.delete(phoneNumber);
|
verificationCodes.delete(phoneNumber);
|
||||||
res.json({
|
res.json({
|
||||||
success: true,
|
success: true,
|
||||||
message: 'Code vérifié avec succès'
|
message: 'Code vérifié avec succès'
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
verification.attempts += 1;
|
verification.attempts += 1;
|
||||||
|
|
||||||
if (verification.attempts >= 3) {
|
if (verification.attempts >= 3) {
|
||||||
verificationCodes.delete(phoneNumber);
|
verificationCodes.delete(phoneNumber);
|
||||||
res.status(400).json({
|
res.status(400).json({
|
||||||
success: false,
|
success: false,
|
||||||
message: 'Trop de tentatives. Veuillez demander un nouveau code'
|
message: 'Trop de tentatives. Veuillez demander un nouveau code'
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
res.status(400).json({
|
res.status(400).json({
|
||||||
success: false,
|
success: false,
|
||||||
message: 'Code incorrect'
|
message: 'Code incorrect'
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -410,103 +462,103 @@ const pendingEmails = new Map();
|
|||||||
|
|
||||||
// Email service
|
// Email service
|
||||||
class EmailService {
|
class EmailService {
|
||||||
static async sendTransactionalEmail(to, templateName, subject, templateVariables) {
|
static async sendTransactionalEmail(to, templateName, subject, templateVariables) {
|
||||||
|
try {
|
||||||
|
const mailchimpClient = mailchimp(configEmail.MAILCHIMP_API_KEY);
|
||||||
|
|
||||||
|
const message = {
|
||||||
|
template_name: templateName,
|
||||||
|
template_content: [],
|
||||||
|
message: {
|
||||||
|
global_merge_vars: this.buildVariables(templateVariables),
|
||||||
|
from_email: configEmail.FROM_EMAIL,
|
||||||
|
from_name: configEmail.FROM_NAME,
|
||||||
|
subject: subject,
|
||||||
|
to: [
|
||||||
|
{
|
||||||
|
email: to,
|
||||||
|
type: 'to'
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const result = await mailchimpClient.messages.sendTemplate(message);
|
||||||
|
return { success: true, result };
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Erreur envoi email:', error);
|
||||||
|
return { success: false, error: 'Échec de l\'envoi de l\'email' };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static buildVariables(templateVariables) {
|
||||||
|
return Object.keys(templateVariables).map(key => ({
|
||||||
|
name: key,
|
||||||
|
content: templateVariables[key]
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add to Mailchimp diffusion list
|
||||||
|
static async addToMailchimpList(email) {
|
||||||
|
try {
|
||||||
|
const url = `https://us17.api.mailchimp.com/3.0/lists/${configEmail.MAILCHIMP_LIST_ID}/members`;
|
||||||
|
|
||||||
|
const response = await fetch(url, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Authorization': `apikey ${configEmail.MAILCHIMP_KEY}`,
|
||||||
|
'Content-Type': 'application/json'
|
||||||
|
},
|
||||||
|
body: JSON.stringify({
|
||||||
|
email_address: email,
|
||||||
|
status: 'subscribed'
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error(`HTTP error! status: ${response.status}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
const data = await response.json();
|
||||||
|
return { success: true, data };
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Erreur ajout à la liste:', error);
|
||||||
|
return { success: false, error: 'Échec de l\'ajout à la liste Mailchimp' };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static async retryFailedEmails() {
|
||||||
|
for (const [emailId, emailData] of pendingEmails) {
|
||||||
|
if (emailData.attempts >= 10) {
|
||||||
|
pendingEmails.delete(emailId);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
const nextRetryDate = new Date(emailData.lastAttempt);
|
||||||
|
nextRetryDate.setMinutes(nextRetryDate.getMinutes() + Math.pow(emailData.attempts, 2));
|
||||||
|
|
||||||
|
if (Date.now() >= nextRetryDate) {
|
||||||
try {
|
try {
|
||||||
const mailchimpClient = mailchimp(configEmail.MAILCHIMP_API_KEY);
|
const result = await this.sendTransactionalEmail(
|
||||||
|
emailData.to,
|
||||||
|
emailData.templateName,
|
||||||
|
emailData.subject,
|
||||||
|
emailData.templateVariables
|
||||||
|
);
|
||||||
|
|
||||||
const message = {
|
if (result.success) {
|
||||||
template_name: templateName,
|
pendingEmails.delete(emailId);
|
||||||
template_content: [],
|
} else {
|
||||||
message: {
|
emailData.attempts += 1;
|
||||||
global_merge_vars: this.buildVariables(templateVariables),
|
emailData.lastAttempt = Date.now();
|
||||||
from_email: configEmail.FROM_EMAIL,
|
}
|
||||||
from_name: configEmail.FROM_NAME,
|
|
||||||
subject: subject,
|
|
||||||
to: [
|
|
||||||
{
|
|
||||||
email: to,
|
|
||||||
type: 'to'
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const result = await mailchimpClient.messages.sendTemplate(message);
|
|
||||||
return { success: true, result };
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Erreur envoi email:', error);
|
emailData.attempts += 1;
|
||||||
return { success: false, error: 'Échec de l\'envoi de l\'email' };
|
emailData.lastAttempt = Date.now();
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static buildVariables(templateVariables) {
|
|
||||||
return Object.keys(templateVariables).map(key => ({
|
|
||||||
name: key,
|
|
||||||
content: templateVariables[key]
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add to Mailchimp diffusion list
|
|
||||||
static async addToMailchimpList(email) {
|
|
||||||
try {
|
|
||||||
const url = `https://us17.api.mailchimp.com/3.0/lists/${configEmail.MAILCHIMP_LIST_ID}/members`;
|
|
||||||
|
|
||||||
const response = await fetch(url, {
|
|
||||||
method: 'POST',
|
|
||||||
headers: {
|
|
||||||
'Authorization': `apikey ${configEmail.MAILCHIMP_KEY}`,
|
|
||||||
'Content-Type': 'application/json'
|
|
||||||
},
|
|
||||||
body: JSON.stringify({
|
|
||||||
email_address: email,
|
|
||||||
status: 'subscribed'
|
|
||||||
})
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(`HTTP error! status: ${response.status}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
const data = await response.json();
|
|
||||||
return { success: true, data };
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Erreur ajout à la liste:', error);
|
|
||||||
return { success: false, error: 'Échec de l\'ajout à la liste Mailchimp' };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static async retryFailedEmails() {
|
|
||||||
for (const [emailId, emailData] of pendingEmails) {
|
|
||||||
if (emailData.attempts >= 10) {
|
|
||||||
pendingEmails.delete(emailId);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
const nextRetryDate = new Date(emailData.lastAttempt);
|
|
||||||
nextRetryDate.setMinutes(nextRetryDate.getMinutes() + Math.pow(emailData.attempts, 2));
|
|
||||||
|
|
||||||
if (Date.now() >= nextRetryDate) {
|
|
||||||
try {
|
|
||||||
const result = await this.sendTransactionalEmail(
|
|
||||||
emailData.to,
|
|
||||||
emailData.templateName,
|
|
||||||
emailData.subject,
|
|
||||||
emailData.templateVariables
|
|
||||||
);
|
|
||||||
|
|
||||||
if (result.success) {
|
|
||||||
pendingEmails.delete(emailId);
|
|
||||||
} else {
|
|
||||||
emailData.attempts += 1;
|
|
||||||
emailData.lastAttempt = Date.now();
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
emailData.attempts += 1;
|
|
||||||
emailData.lastAttempt = Date.now();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Email validation middleware
|
// Email validation middleware
|
||||||
@ -514,18 +566,18 @@ const validateEmail = (req, res, next) => {
|
|||||||
const { email } = req.body;
|
const { email } = req.body;
|
||||||
|
|
||||||
if (!email) {
|
if (!email) {
|
||||||
return res.status(400).json({
|
return res.status(400).json({
|
||||||
success: false,
|
success: false,
|
||||||
message: 'L\'adresse email est requise'
|
message: 'L\'adresse email est requise'
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
|
const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
|
||||||
if (!emailRegex.test(email)) {
|
if (!emailRegex.test(email)) {
|
||||||
return res.status(400).json({
|
return res.status(400).json({
|
||||||
success: false,
|
success: false,
|
||||||
message: 'Format d\'email invalide'
|
message: 'Format d\'email invalide'
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
next();
|
next();
|
||||||
@ -533,12 +585,12 @@ const validateEmail = (req, res, next) => {
|
|||||||
|
|
||||||
// Email templates
|
// Email templates
|
||||||
const ETemplates = {
|
const ETemplates = {
|
||||||
DOCUMENT_ASKED: "DOCUMENT_ASKED",
|
DOCUMENT_ASKED: "DOCUMENT_ASKED",
|
||||||
DOCUMENT_REFUSED: "DOCUMENT_REFUSED",
|
DOCUMENT_REFUSED: "DOCUMENT_REFUSED",
|
||||||
DOCUMENT_RECAP: "DOCUMENT_RECAP",
|
DOCUMENT_RECAP: "DOCUMENT_RECAP",
|
||||||
SUBSCRIPTION_INVITATION: "SUBSCRIPTION_INVITATION",
|
SUBSCRIPTION_INVITATION: "SUBSCRIPTION_INVITATION",
|
||||||
DOCUMENT_REMINDER: "DOCUMENT_REMINDER",
|
DOCUMENT_REMINDER: "DOCUMENT_REMINDER",
|
||||||
DOCUMENT_SEND: "DOCUMENT_SEND",
|
DOCUMENT_SEND: "DOCUMENT_SEND",
|
||||||
};
|
};
|
||||||
|
|
||||||
// Routes
|
// Routes
|
||||||
@ -546,43 +598,43 @@ app.post('/api/send-email', validateEmail, async (req, res) => {
|
|||||||
const { email, firstName, lastName, officeName, template } = req.body;
|
const { email, firstName, lastName, officeName, template } = req.body;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const templateVariables = {
|
const templateVariables = {
|
||||||
first_name: firstName || '',
|
first_name: firstName || '',
|
||||||
last_name: lastName || '',
|
last_name: lastName || '',
|
||||||
office_name: officeName || '',
|
office_name: officeName || '',
|
||||||
link: `${process.env.APP_HOST}`
|
link: `${process.env.APP_HOST}`
|
||||||
};
|
};
|
||||||
|
|
||||||
const result = await EmailService.sendTransactionalEmail(
|
const result = await EmailService.sendTransactionalEmail(
|
||||||
email,
|
email,
|
||||||
ETemplates[template],
|
ETemplates[template],
|
||||||
'Votre notaire vous envoie un message',
|
'Votre notaire vous envoie un message',
|
||||||
templateVariables
|
templateVariables
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!result.success) {
|
if (!result.success) {
|
||||||
// Add to pending emails to retry later
|
// Add to pending emails to retry later
|
||||||
const emailId = `${email}-${Date.now()}`;
|
const emailId = `${email}-${Date.now()}`;
|
||||||
pendingEmails.set(emailId, {
|
pendingEmails.set(emailId, {
|
||||||
to: email,
|
to: email,
|
||||||
templateName: ETemplates[template],
|
templateName: ETemplates[template],
|
||||||
subject: 'Votre notaire vous envoie un message',
|
subject: 'Votre notaire vous envoie un message',
|
||||||
templateVariables,
|
templateVariables,
|
||||||
attempts: 1,
|
attempts: 1,
|
||||||
lastAttempt: Date.now()
|
lastAttempt: Date.now()
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
res.json({
|
|
||||||
success: true,
|
|
||||||
message: 'Email envoyé avec succès'
|
|
||||||
});
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
res.json({
|
||||||
|
success: true,
|
||||||
|
message: 'Email envoyé avec succès'
|
||||||
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Erreur:', error);
|
console.error('Erreur:', error);
|
||||||
res.status(500).json({
|
res.status(500).json({
|
||||||
success: false,
|
success: false,
|
||||||
message: 'Erreur serveur lors de l\'envoi de l\'email'
|
message: 'Erreur serveur lors de l\'envoi de l\'email'
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -590,25 +642,92 @@ app.post('/api/subscribe-to-list', validateEmail, async (req, res) => {
|
|||||||
const { email } = req.body;
|
const { email } = req.body;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const result = await EmailService.addToMailchimpList(email);
|
const result = await EmailService.addToMailchimpList(email);
|
||||||
|
|
||||||
if (result.success) {
|
if (result.success) {
|
||||||
res.json({
|
res.json({
|
||||||
success: true,
|
success: true,
|
||||||
message: 'Inscription à la liste réussie'
|
message: 'Inscription à la liste réussie'
|
||||||
});
|
|
||||||
} else {
|
|
||||||
res.status(500).json({
|
|
||||||
success: false,
|
|
||||||
message: 'Échec de l\'inscription à la liste'
|
|
||||||
});
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Erreur:', error);
|
|
||||||
res.status(500).json({
|
|
||||||
success: false,
|
|
||||||
message: 'Erreur serveur lors de l\'inscription'
|
|
||||||
});
|
});
|
||||||
|
} else {
|
||||||
|
res.status(500).json({
|
||||||
|
success: false,
|
||||||
|
message: 'Échec de l\'inscription à la liste'
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Erreur:', error);
|
||||||
|
res.status(500).json({
|
||||||
|
success: false,
|
||||||
|
message: 'Erreur serveur lors de l\'inscription'
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
app.post('/api/:uid/send_reminder', validateEmail, async (req, res) => {
|
||||||
|
const { email, documentsUid } = req.body;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const uid = req.params["uid"];
|
||||||
|
if (!uid) {
|
||||||
|
//this.httpBadRequest(response, "No uid provided");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!documentsUid || !Array.isArray(documentsUid)) {
|
||||||
|
//this.httpBadRequest(response, "Invalid or missing documents");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
const documentEntities: Documents[] = [];
|
||||||
|
//For each document uid, use DocumentsService.getByUid to get the document entity and add it to the documents array
|
||||||
|
for (const documentUid of documentsUid) {
|
||||||
|
const documentEntity = await this.documentsService.getByUid(documentUid, { document_type: true, folder: true });
|
||||||
|
|
||||||
|
if (!documentEntity) {
|
||||||
|
this.httpBadRequest(response, "Document not found");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
documentEntities.push(documentEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
const customerEntity = await this.customersService.getByUid(uid, { contact: true, office: true });
|
||||||
|
|
||||||
|
if (!customerEntity) {
|
||||||
|
this.httpNotFoundRequest(response, "customer not found");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
//Hydrate ressource with prisma entity
|
||||||
|
const customer = Customer.hydrate < Customer > (customerEntity, { strategy: "excludeAll" });
|
||||||
|
|
||||||
|
// Call service to send reminder with documents
|
||||||
|
await this.customersService.sendDocumentsReminder(customer, documentEntities);
|
||||||
|
*/
|
||||||
|
|
||||||
|
const templateVariables = {
|
||||||
|
first_name: 'firstName' || '',
|
||||||
|
last_name: 'lastName' || '',
|
||||||
|
office_name: 'officeName' || '',
|
||||||
|
link: `${process.env.APP_HOST}`
|
||||||
|
};
|
||||||
|
|
||||||
|
const result = await EmailService.sendTransactionalEmail(
|
||||||
|
email,
|
||||||
|
ETemplates.DOCUMENT_REMINDER,
|
||||||
|
'Votre notaire vous envoie un message',
|
||||||
|
templateVariables
|
||||||
|
);
|
||||||
|
console.log(result);
|
||||||
|
|
||||||
|
res.json({
|
||||||
|
success: true,
|
||||||
|
message: 'Email envoyé avec succès'
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
console.log(error);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user