From d845f699ce0b07edd24a16c34e4089218e9dec1e Mon Sep 17 00:00:00 2001 From: philc Date: Tue, 9 Dec 2025 21:32:22 +0100 Subject: [PATCH] modif notif --- apxtri/apxtri.js | 6 ++---- apxtri/middlewares/checkHeaders.js | 4 ++-- apxtri/middlewares/isAuthenticated.js | 2 +- apxtri/models/Articles.js | 2 +- apxtri/models/Notifications.js | 26 ++++++++++++++++---------- apxtri/models/Odmdb.js | 2 +- apxtri/models/Pagans.js | 2 +- apxtri/models/PagansPeter.js | 2 +- apxtri/models/Wwws.js | 2 +- apxtri/routes/articles.js | 2 +- apxtri/routes/pagans.js | 2 +- apxtri/routes/trackings.js | 2 +- 12 files changed, 29 insertions(+), 25 deletions(-) diff --git a/apxtri/apxtri.js b/apxtri/apxtri.js index d0573fa..c9cf4b5 100755 --- a/apxtri/apxtri.js +++ b/apxtri/apxtri.js @@ -14,7 +14,7 @@ SEE README.md to start const apxtri = {}; apxtri.main = async () => { - if (!fs.existsSync("/etc/nginx/nginx.conf")) { + if (process.env.NODE_MODE !== 'dev' && !fs.existsSync("/etc/nginx/nginx.conf")) { console.log( "\x1b[31m Check documentation, nginx have to be installed on this server first, no /etc/nginx/nginx.conf available, install then rerun yarn command." ); @@ -275,9 +275,7 @@ apxtri.runexpress = async (tribesdns, conf) => { app.disable("x-powered-by"); // for security app.locals.tribeids = tribeIds; const currentmod = "apxtri"; - const log = process.env.ACTIVELOG.split(',') - ? process.env.ACTIVELOG.split(',').includes(currentmod) - : false; + const log = process.env.ACTIVELOG ? process.env.ACTIVELOG.split(',').includes(currentmod) : false; console.log( currentmod, " Allowed DOMs to access to this apxtri server:", diff --git a/apxtri/middlewares/checkHeaders.js b/apxtri/middlewares/checkHeaders.js index 9dfde0b..5517dd4 100755 --- a/apxtri/middlewares/checkHeaders.js +++ b/apxtri/middlewares/checkHeaders.js @@ -1,7 +1,7 @@ const path=require('path') const conf = require(`../../../adminapi/objects/tribes/itm/adminapi.json`); const currentmod='checkHeaders'; -const log = process.env.ACTIVELOG.split(',').includes(currentmod) +const log = process.env.ACTIVELOG ? process.env.ACTIVELOG ? process.env.ACTIVELOG.split(',').includes(currentmod) : false : false /** * @api {get} / - CheckHeaders * @apiGroup Middlewares @@ -19,7 +19,7 @@ const log = process.env.ACTIVELOG.split(',').includes(currentmod) * @apiHeader {integer} xtrkversion a version number link to tracking system * @apiHeaderExample {json} Headeconst conf = require(`../../../adminapi/objects/tribes/itm/adminapi.json`); const currentmod='checkHeaders'; -const log = process.env.ACTIVELOG.split(',').includes(currentmod)r-Example for anonymous: +const log = process.env.ACTIVELOG ? process.env.ACTIVELOG.split(',').includes(currentmod) : falser-Example for anonymous: * { * "xtrkversion":1, * "xtribe":"smatchit", diff --git a/apxtri/middlewares/isAuthenticated.js b/apxtri/middlewares/isAuthenticated.js index 0efb5fa..1192261 100755 --- a/apxtri/middlewares/isAuthenticated.js +++ b/apxtri/middlewares/isAuthenticated.js @@ -8,7 +8,7 @@ const openpgp = require("openpgp"); const conf = require(`../../../adminapi/objects/tribes/itm/adminapi.json`); const currentmod='isAuthenticated'; -const log = process.env.ACTIVELOG.split(',').includes(currentmod) +const log = process.env.ACTIVELOG ? process.env.ACTIVELOG.split(',').includes(currentmod) : false /** * @api {get} / - isAuthenticated * @apiGroup Middlewares diff --git a/apxtri/models/Articles.js b/apxtri/models/Articles.js index 92358be..bb63d5c 100644 --- a/apxtri/models/Articles.js +++ b/apxtri/models/Articles.js @@ -7,7 +7,7 @@ const Odmdb = require(`./Odmdb.js`); const Checkjson = require(`./Checkjson`); const conf = require(`../../objects/tribes/itm/adminapi.json`); const currentmod = "Articles"; -const log = process.env.ACTIVELOG.split(',').includes(currentmod); +const log = process.env.ACTIVELOG ? process.env.ACTIVELOG.split(',').includes(currentmod) : false; const Articles={} diff --git a/apxtri/models/Notifications.js b/apxtri/models/Notifications.js index 3b40f20..38b71b6 100644 --- a/apxtri/models/Notifications.js +++ b/apxtri/models/Notifications.js @@ -9,7 +9,7 @@ const Checkjson = require(`./Checkjson.js`); const nodemailer = require("nodemailer"); const conf = require(`../../../adminapi/objects/tribes/itm/adminapi.json`); const currentmod = "Notifications"; -const log = process.env.ACTIVELOG.split(',').includes(currentmod); +const log = process.env.ACTIVELOG ? process.env.ACTIVELOG.split(',').includes(currentmod) : false; /** * To manage any communication between Pagan * mayor druid emailing/sms/paper from tribe register smtp, simcard, mail api to Person(s) / Pagan(s) @@ -440,21 +440,27 @@ Notifications.sendmail = async (data, tribe) => { //console.log(confsmtp); const transporter = await nodemailer.createTransport(confsmtp); if (data.filelist) { - data.attachments = []; + data.attachments = data.attachments || []; let missingfile = []; data.filelist.forEach((fo) => { if (fs.existsSync(fo.pathfile)) { + data.attachments.push({ + filename: fo.filename || path.basename(fo.pathfile), + path: fo.pathfile, + contentType: fo.contenttype || 'application/octet-stream' + }); } else { missingfile.push(fo.pathfile); } - }); - if (missingk.length > 0) { - return { - status: 428, - ref: "Notifications", - msg: "missingdata", - data: { missingk: missingk }, - }; + }); + if (missingfile.length > 0) { + return { + status: 428, + ref: "Notifications", + msg: "missingfiles", + data: { missingfiles: missingfile }, + }; + } } //console.log("data:", data); let res; diff --git a/apxtri/models/Odmdb.js b/apxtri/models/Odmdb.js index 815b980..39255e2 100644 --- a/apxtri/models/Odmdb.js +++ b/apxtri/models/Odmdb.js @@ -7,7 +7,7 @@ const conf = require(`../../../adminapi/objects/tribes/itm/adminapi.json`); const Checkjson = require(`./Checkjson.js`); const { promiseHooks } = require("v8"); const currentmod = "Odmdb"; -const log = process.env.ACTIVELOG.split(',').includes(currentmod); +const log = process.env.ACTIVELOG ? process.env.ACTIVELOG.split(',').includes(currentmod) : false; /** * This manage Objects for indexing, searching, checking and act to CRUD * @objectPathName = objectpath/objectname diff --git a/apxtri/models/Pagans.js b/apxtri/models/Pagans.js index 7ba99ad..526ec35 100644 --- a/apxtri/models/Pagans.js +++ b/apxtri/models/Pagans.js @@ -10,7 +10,7 @@ const Odmdb = require("./Odmdb.js"); const conf = require(`../../../adminapi/objects/tribes/itm/adminapi.json`); const currentmod = "Pagans"; -const log = process.env.ACTIVELOG.split(',').includes(currentmod); +const log = process.env.ACTIVELOG ? process.env.ACTIVELOG.split(',').includes(currentmod) : false; /** * Pagan Management numeric Identity and Person (Person = Pagan Id + tribe) * diff --git a/apxtri/models/PagansPeter.js b/apxtri/models/PagansPeter.js index 149bac7..7f6b2ed 100644 --- a/apxtri/models/PagansPeter.js +++ b/apxtri/models/PagansPeter.js @@ -10,7 +10,7 @@ const Odmdb = require("./Odmdb.js"); const conf = require(`../../../adminapi/objects/tribes/itm/adminapi.json`); const currentmod = "Pagans"; -const log = process.env.ACTIVELOG.split(',').includes(currentmod); +const log = process.env.ACTIVELOG ? process.env.ACTIVELOG.split(',').includes(currentmod) : false; /** * Pagan Management numeric Identity and Person (Person = Pagan Id + tribe) * diff --git a/apxtri/models/Wwws.js b/apxtri/models/Wwws.js index 4f5f878..2fe00fc 100644 --- a/apxtri/models/Wwws.js +++ b/apxtri/models/Wwws.js @@ -12,7 +12,7 @@ const readlineSync = require("readline-sync"); const Odmdb = require("./Odmdb.js"); const conf = require(`../../../adminapi/objects/tribes/itm/adminapi.json`); const currentmod = "Wwws"; -const log = process.env.ACTIVELOG.split(',').includes(currentmod); +const log = process.env.ACTIVELOG ? process.env.ACTIVELOG.split(',').includes(currentmod) : false; const Wwws = {}; Wwws.getwco = (wconame, ctx) => { diff --git a/apxtri/routes/articles.js b/apxtri/routes/articles.js index 1d130cd..ece966e 100644 --- a/apxtri/routes/articles.js +++ b/apxtri/routes/articles.js @@ -9,7 +9,7 @@ const Articles = require(`../models/Articles`); const conf = require(`../../../adminapi/objects/tribes/itm/adminapi.json`); const currentmod = "Articles"; -const log = process.env.ACTIVELOG.split(',').includes(currentmod); +const log = process.env.ACTIVELOG ? process.env.ACTIVELOG.split(',').includes(currentmod) : false; const router = express.Router(); diff --git a/apxtri/routes/pagans.js b/apxtri/routes/pagans.js index 0925d31..1ea0fc0 100755 --- a/apxtri/routes/pagans.js +++ b/apxtri/routes/pagans.js @@ -11,7 +11,7 @@ const isAuthenticated = require("../middlewares/isAuthenticated.js"); const conf = require(`../../../adminapi/objects/tribes/itm/adminapi.json`); const currentmod = "Pagans"; -const log = process.env.ACTIVELOG.split(',').includes(currentmod); +const log = process.env.ACTIVELOG ? process.env.ACTIVELOG.split(',').includes(currentmod) : false; const router = express.Router(); diff --git a/apxtri/routes/trackings.js b/apxtri/routes/trackings.js index f011934..c18de50 100644 --- a/apxtri/routes/trackings.js +++ b/apxtri/routes/trackings.js @@ -4,7 +4,7 @@ const fs = require("fs-extra"); const path = require("path"); const conf = require(`../../../adminapi/objects/tribes/itm/adminapi.json`); const currentmod = "Trackings"; -const log = process.env.ACTIVELOG.split(',').includes(currentmod); +const log = process.env.ACTIVELOG ? process.env.ACTIVELOG.split(',').includes(currentmod) : false; const Odmdb = require("../models/Odmdb.js"); // Middlewares const checkHeaders = require("../middlewares/checkHeaders");