zet-lib 1.5.16 → 1.5.18

package/lib/Mail.js

@@ -1,3 +1,4 @@
+require("dotenv").config();
 const nodemailer = require('nodemailer')
 const ejs = require('ejs')
 const Util = require('./Util')
@@ -7,7 +8,7 @@ const moment = require('moment')
 const config = require('dotenv').config()
 
 if (typeof global.dirRoot === 'undefined') {
-    global.dirRoot = Util.dirRoot;
+  global.dirRoot = Util.dirRoot;
 }
 
 const MAIL = {}
@@ -34,8 +35,8 @@ MAIL.gmailTransporter = (user = '', pass = '') => {
 MAIL.send = function (options = {}, transporter = null) {
   let option = Object.assign(mailOptions, options)
   // send mail with defined transport object
-  option.user = option.user || 'aptiwise@gmail.com'
-  option.pass = option.pass || 'affi ftqv ceal zzwe'
+  option.user = option.user || process.env.GOOGLE_EMAIL
+  option.pass = option.pass || process.env.GOOGLE_PASSWORD
   transporter = transporter || MAIL.gmailTransporter(option.user, option.pass)
   transporter.sendMail(options, function (error, info) {
     if (error) {
@@ -69,4 +70,56 @@ MAIL.register = (datas = {}, options = {}) => {
   })
 }
 
+MAIL.approval = (req, res, data, email) => {
+  let obj = {
+    USERNAME: process.env.GOOGLE_EMAIL,
+    PASSWORD: process.env.GOOGLE_PASSWORD,
+    TO: "andif@injani.com",
+    SUBJECT: "Test gmail Subject widget cms",
+    MESSAGE: "Test gmail test message cms",
+  };
+
+  var mail = nodemailer.createTransport({
+    service: "gmail",
+    auth: {
+      user: obj.USERNAME,
+      pass: obj.PASSWORD,
+    },
+  });
+
+  ejs.renderFile(
+      dirRoot + "/views/layouts/email/approval.ejs",
+      { data: data, Util: Util },
+      function (err, html) {
+        if (err) {
+          console.log(err);
+        } else {
+          var mailOptions = {
+            from: obj.USERNAME,
+            to: email,
+            subject: data.subject,
+            html: html,
+          };
+
+          mail.sendMail(mailOptions, function (error, info) {
+            if (error) {
+              debug(req, res, error);
+              io.to(res.locals.token).emit(
+                  "warning",
+                  "email not sent to " + email + " : " + error.toString()
+              );
+            } else {
+              console.log("Email sent: " + info.response);
+              io.to(res.locals.token).emit(
+                  "message",
+                  "email sent to " + email + " : " + info.response
+              );
+            }
+          });
+        }
+      }
+  );
+};
+
+
 module.exports = MAIL

package/lib/zAppRouter.js

@@ -74,8 +74,8 @@ router.get("/profile", csrfProtection, access, async (req, res) => {
     where: { id: res.locals.companyId },
   });
   let verify_signed = result.verify_signed
-    ? "/uploads/zuser/" + result.verify_signed
-    : "/img/user.png";
+      ? "/uploads/zuser/" + result.verify_signed
+      : "/img/user.png";
   res.render("layouts/" + layout, {
     menu: { menu: "profile" },
     data: result,
@@ -144,10 +144,10 @@ router.post("/profile-sign", access, async (req, res) => {
     },
   });
   fs.writeFile(
-    dirRoot + "/public/uploads/zuser/" + filename,
-    base64Image,
-    { encoding: "base64" },
-    function (err) {}
+      dirRoot + "/public/uploads/zuser/" + filename,
+      base64Image,
+      { encoding: "base64" },
+      function (err) {}
   );
   res.json(json);
 });
@@ -186,7 +186,7 @@ router.post("/login", csrfProtection, async (req, res) => {
 
 router.post("/login-ajax", csrfProtection, async (req, res) => {
   res.json(
-    await zRoute.loginAjax(req.body.username, req.body.password, req, res)
+      await zRoute.loginAjax(req.body.username, req.body.password, req, res)
   );
 });
 
@@ -227,8 +227,8 @@ router.post("/signup", async (req, res) => {
       data: dataCompany,
     });
     let dataCache = zCache.myCache.has(body.username)
-      ? zCache.get(body.username)
-      : {
+        ? zCache.get(body.username)
+        : {
           fullname: "",
           email: "",
           image: "",
@@ -481,7 +481,7 @@ router.post("/forgot", csrfProtection, async (req, res) => {
   let data = zRoute.post(req, res, MYMODEL)["zuser"];
   var port = ecosystem.apps[0].env.PORT;
   var url =
-    env == "production" ? process.env.APP_URL : "http://localhost:" + port;
+      env == "production" ? process.env.APP_URL : "http://localhost:" + port;
   let email = data.email || " ";
   email = email.trim();
   if (email.length > 5) {
@@ -524,35 +524,35 @@ router.post("/forgot", csrfProtection, async (req, res) => {
 });
 
 router.get(
-  "/reset-password/:forgot_password",
-  csrfProtection,
-  async (req, res) => {
-    let forgot_password = req.params.forgot_password || "";
-    let activated = false;
-    if (forgot_password != "") {
-      let results = await connection.results({
-        table: "zuser",
-        where: {
-          forgot_password: forgot_password,
-        },
-      });
-      if (results.length > 0) {
-        activated = true;
+    "/reset-password/:forgot_password",
+    csrfProtection,
+    async (req, res) => {
+      let forgot_password = req.params.forgot_password || "";
+      let activated = false;
+      if (forgot_password != "") {
+        let results = await connection.results({
+          table: "zuser",
+          where: {
+            forgot_password: forgot_password,
+          },
+        });
+        if (results.length > 0) {
+          activated = true;
+        }
       }
-    }
-    var script = `submitForm('form-group','','',function(data){
+      var script = `submitForm('form-group','','',function(data){
         if(data.status==1){
             location.href = '/login'
         }
     });`;
-    await moduleLib.custom(req, res, script);
-    res.render("layouts/fronts", {
-      activated: activated,
-      csrfToken: req.csrfToken(),
-      forgot_password: forgot_password,
-      renderBody: "index/reset-password.ejs",
-    });
-  }
+      await moduleLib.custom(req, res, script);
+      res.render("layouts/fronts", {
+        activated: activated,
+        csrfToken: req.csrfToken(),
+        forgot_password: forgot_password,
+        renderBody: "index/reset-password.ejs",
+      });
+    }
 );
 
 router.get("/no-access", async (req, res) => {
@@ -643,8 +643,8 @@ router.post("/zzapproval", async (req, res) => {
   let MYMODEL = MYMODELS["zapprovals"];
   const port = ecosystem.apps[0].env.PORT;
   let users = Util.arrayToObject(
-    await connection.results({ table: "zuser" }),
-    "id"
+      await connection.results({ table: "zuser" }),
+      "id"
   );
   try {
     let userId = res.locals.userId;
@@ -755,16 +755,17 @@ router.post("/zzapproval", async (req, res) => {
         };
         await zRoute.insertSQL(req, res, "zapprovals_details", post);
         let link =
-          env == "production"
-            ? process.env.APP_URL + "/za/" + post.token
-            : `http://localhost:${port}/za/${post.token}`;
+            env == "production"
+                ? process.env.APP_URL + "/za/" + post.token
+                : `http://localhost:${port}/za/${post.token}`;
         let email = users[post.user_id].email;
 
         post.subject = `Need Approve ${data.title}`;
         post.buttonTitle = `Approve Now`;
-        post.title = `NEED APPROVE DOCUMENT`;
+        post.caption = `NEED APPROVE DOCUMENT`;
+        post.title = data.title;
         post.link = link;
-        post.url = CONFIG.app.url;
+        post.url = process.env.APP_URL;
         post.description = `Hai ${users[post.user_id].fullname} <br>
 
                 
@@ -772,18 +773,8 @@ router.post("/zzapproval", async (req, res) => {
                 Please click the link above to view the document.`;
 
         post.note = `If you click the link, it's will be automatically acknowledged`;
-        Mail.gmail(req, res, post, email);
-
-        //send to whatsapp
-        let phone = Util.phoneWA(users[post.user_id].phone);
-        if (phone) {
-          var textWa = "";
-          textWa += `*NEED APPROVE DOCUMENT* \r\n_${data.title}_\r\nHai ${
-            users[post.user_id].fullname
-          } \r\n \r\n`;
-          textWa += "We have some document for you.\r\n";
-          textWa += `Please click the link above to view the document.\r\n${link}`;
-        }
+        Mail.approval(req, res, post, email);
+
         //send notification
         //send toastr using socket.io
         io.to(users[item].token).emit("message", "Need Approve " + data.title);
@@ -799,17 +790,18 @@ router.post("/zzapproval", async (req, res) => {
         };
         await zRoute.insertSQL(req, res, "zapprovals_details", post);
         let link =
-          env == "production"
-            ? process.env.APP_URL + "/za/" + post.token
-            : `http://localhost:${port}/za/${post.token}`;
+            env == "production"
+                ? process.env.APP_URL + "/za/" + post.token
+                : `http://localhost:${port}/za/${post.token}`;
         let email = users[post.user_id].email;
 
         post.subject = `Need acknowledge ${data.title}`;
         post.buttonTitle = `Acknowledge Now`;
-        post.title = `NEED ACKNOWLEDGE DOCUMENT`;
+        post.title = data.title
+        post.caption = `NEED ACKNOWLEDGE DOCUMENT`;
 
         post.link = link;
-        post.url = CONFIG.app.url;
+        post.url = process.env.APP_URL;
         post.description = `Hai ${users[post.user_id].fullname} <br>
 
                 
@@ -817,21 +809,11 @@ router.post("/zzapproval", async (req, res) => {
                 Please click the link above to view the document.`;
 
         post.note = `If you click the link, it's will be automatically acknowledged`;
-        Mail.gmail(req, res, post, email);
-
-        //send to whatsapp
-        let phone = Util.phoneWA(users[post.user_id].phone);
-        if (phone) {
-          var textWa = "";
-          textWa += `*NEED ACKNOWLEDGE DOCUMENT* \r\n_${data.title}_\r\nHai ${
-            users[post.user_id].fullname
-          } \r\n \r\n`;
-          textWa += "We have some document for you.\r\n";
-          textWa += `Please click the link above to view the document.\r\n${link}`;
-        }
+        Mail.approval(req, res, post, email);
+
         io.to(users[item].token).emit(
-          "message",
-          "Need Acknowledge " + data.title
+            "message",
+            "Need Acknowledge " + data.title
         );
       });
     }
@@ -849,30 +831,30 @@ router.post("/zzapproval", async (req, res) => {
 router.get("/za/:token", csrfProtection, async (req, res) => {
   let token = req.params.token;
   let data = {},
-    data2 = {};
+      data2 = {};
   let template = "";
   let result;
   let isClosed = false;
   let footers = "";
   let details = [];
-  let routeName =
-    env == "production" ? process.env.APP_URL : `http://localhost:${port}`;
+  var port = ecosystem.apps[0].env.PORT;
+  let routeName = env == "production" ? process.env.APP_URL : `http://localhost:${port}`;
   let statusLabel = "";
   let knowings = [];
   const MYMODELS = myCache.get("MYMODELS");
   let MYMODEL = MYMODELS["zapprovals"];
   let users = Util.arrayToObject(
-    await connection.results({ table: "zuser" }),
-    "id"
+      await connection.results({ table: "zuser" }),
+      "id"
   );
   try {
     result = await connection.result({
       select:
-        "*, zapprovals.id as ide, zapprovals_details.token as usertoken, zapprovals.status as statuse, zapprovals_details.status as mystatus,  zapprovals_details.type as user_type,  zapprovals_details.updated_at",
+          "*, zapprovals.id as ide, zapprovals_details.token as usertoken, zapprovals.status as statuse, zapprovals_details.status as mystatus,  zapprovals_details.type as user_type,  zapprovals_details.updated_at, zuser.token as usertoken",
       table: "zapprovals_details",
       joins: [
         "LEFT JOIN zapprovals ON (zapprovals_details.title_id = zapprovals.id)",
-        "LEFT JOIN employee ON (zapprovals_details.user_id = employee.id)",
+        "LEFT JOIN zuser ON (zapprovals_details.user_id = zuser.id)",
       ],
       where: { "zapprovals_details.token": token },
     });
@@ -882,10 +864,10 @@ router.get("/za/:token", csrfProtection, async (req, res) => {
     statusLabel = MYMODEL.widgets.status.fields[result.statuse];
     routeName = routeName + "/" + result.table + "/view/" + result.id_data;
     if (
-      result.statuse == 3 ||
-      result.statuse == 4 ||
-      result.mystatus == 3 ||
-      result.mystatus == 4
+        result.statuse == 3 ||
+        result.statuse == 4 ||
+        result.mystatus == 3 ||
+        result.mystatus == 4
     ) {
       isClosed = true;
     }
@@ -938,9 +920,9 @@ router.get("/za/:token", csrfProtection, async (req, res) => {
         });
         //var users = await zRoute.getUsers();
         var message =
-          users[result.user_id].fullname +
-          " has readed document " +
-          result.title;
+            users[result.user_id].fullname +
+            " has readed document " +
+            result.title;
         details.forEach(function (item) {
           io.to(users[item.user_id].token).emit("message", message);
         });
@@ -957,7 +939,6 @@ router.get("/za/:token", csrfProtection, async (req, res) => {
     for (var key in data) {
       template = Util.replaceAll(template, "{{" + key + "}}", data[key]);
     }
-
     footers = await zRoute.approversFooter(details);
 
     //send activity
@@ -1000,13 +981,13 @@ router.post("/za/:token", csrfProtection, async (req, res) => {
   let status = req.body.status;
   let json = Util.jsonSuccess("Success");
   let data = {},
-    data2 = {};
+      data2 = {};
   let template = "";
   let approvers = [],
-    knowings = [];
+      knowings = [];
   let users = Util.arrayToObject(
-    await connection.results({ table: "zuser" }),
-    "id"
+      await connection.results({ table: "zuser" }),
+      "id"
   );
   let employee_user = users;
   const MYMODELS = myCache.get("MYMODELS");
@@ -1015,7 +996,7 @@ router.post("/za/:token", csrfProtection, async (req, res) => {
   try {
     var results = await connection.results({
       select:
-        "*,zapprovals_details.status as approvers_status, zapprovals.created_by as submiter,  zapprovals.type as typee, zapprovals.status as statuse, zapprovals_details.id as detaild_id, zapprovals.id as ide, zapprovals.approvers as approvers ",
+          "*,zapprovals_details.status as approvers_status, zapprovals.created_by as submiter,  zapprovals.type as typee, zapprovals.status as statuse, zapprovals_details.id as detaild_id, zapprovals.id as ide, zapprovals.approvers as approvers ",
       table: "zapprovals_details",
       joins: [
         "LEFT JOIN zapprovals ON (zapprovals_details.title_id = zapprovals.id)",
@@ -1083,24 +1064,24 @@ router.post("/za/:token", csrfProtection, async (req, res) => {
       where: { id: result.ide },
     });
 
-    //send activity
-    await connection.insert({
-      table: "zactivity",
-      data: {
-        company_id: result.company_id,
-        created_at: Util.now(),
-        created_by: result.user_id,
-        updated_by: result.user_id,
-        user_id: result.user_id,
-        table: MYMODEL.table,
-        id_data: result.ide,
-        status: status,
-        status_label: MYMODEL.widgets.status.fields[status],
-        title: MYMODEL.widgets.status.fields[status],
-        description: comments,
-        data: JSON.stringify(post),
-      },
-    });
+    /* //send activity
+     await connection.insert({
+       table: "zactivity",
+       data: {
+         company_id: result.company_id,
+         created_at: Util.now(),
+         created_by: result.user_id,
+         updated_by: result.user_id,
+         user_id: result.user_id,
+         table: MYMODEL.table,
+         id_data: result.ide,
+         status: status,
+         status_label: MYMODEL.widgets.status.fields[status],
+         title: MYMODEL.widgets.status.fields[status],
+         description: comments,
+         data: JSON.stringify(post),
+       },
+     });*/
 
     //send notification
     if (status == 3 || status == 4) {
@@ -1138,14 +1119,14 @@ router.post("/za/:token", csrfProtection, async (req, res) => {
               table: "zapprovals_details",
               data: post,
             });
-            let link = CONFIG.app.url + "/za/" + post.token;
+            let link = process.env.APP_URL + "/za/" + post.token;
             let email = users[item].username;
 
             post.subject = `Need Approve ${result.title}`;
             post.buttonTitle = `Approve Now`;
-            post.title = `NEED APPROVE DOCUMENT`;
+            post.title = result.title;
             post.link = link;
-            post.url = CONFIG.app.url;
+            post.url = process.env.APP_URL;
             post.description = `Hai ${users[item].fullname} <br>
 
                 
@@ -1162,7 +1143,7 @@ router.post("/za/:token", csrfProtection, async (req, res) => {
                 {
                   title: users[item].fullname + " " + users[item].position,
                   description:
-                    "@" + users[item].fullname + " " + users[item].position,
+                      "@" + users[item].fullname + " " + users[item].position,
                   rowId: "roe" + index,
                 },
               ];
@@ -1173,7 +1154,7 @@ router.post("/za/:token", csrfProtection, async (req, res) => {
                 {
                   title: users[item].fullname + " " + users[item].position,
                   description:
-                    "@" + users[item].fullname + " " + users[item].position,
+                      "@" + users[item].fullname + " " + users[item].position,
                   rowId: "roe" + index,
                 },
               ];
@@ -1204,7 +1185,7 @@ router.post("/za/:token", csrfProtection, async (req, res) => {
             });
 
             //send todolist
-            await connection.insert({
+            /*await connection.insert({
               table: "ztodolist",
               data: {
                 company_id: result.company_id,
@@ -1221,12 +1202,12 @@ router.post("/za/:token", csrfProtection, async (req, res) => {
                 description: result.title,
                 users: JSON.stringify(approvers),
               },
-            });
+            });*/
 
             //send toastr using socket.io
             io.to(users[item].token).emit(
-              "message",
-              "Need Approve for document : " + result.title
+                "message",
+                "Need Approve for document : " + result.title
             );
           }
         }
@@ -1595,21 +1576,21 @@ router.post("/zhistory-data", async (req, res) => {
         users = myCache.get("users");
       } else {
         users = Util.arrayToObject(
-          await connection.results({
-            table: "zuser",
-          }),
-          "id"
+            await connection.results({
+              table: "zuser",
+            }),
+            "id"
         );
         myCache.set("users", users);
       }
       html = await zRoute.history(
-        req,
-        res,
-        relations,
-        id,
-        MYMODEL,
-        users,
-        results
+          req,
+          res,
+          relations,
+          id,
+          MYMODEL,
+          users,
+          results
       );
     }
     res.json(html);
@@ -1680,10 +1661,10 @@ router.post("/zcompress-dropzone", async (req, res) => {
       console.log(dir);
       const timestamp = Date.now();
       const tempDir = path.join(
-        dirRoot,
-        "public",
-        "temps",
-        `${table}___${field}___${id}___${userId}___${timestamp}`
+          dirRoot,
+          "public",
+          "temps",
+          `${table}___${field}___${id}___${userId}___${timestamp}`
       );
       if (!fs.existsSync(tempDir)) {
         fs.mkdirSync(tempDir);
@@ -1713,8 +1694,8 @@ router.post("/zcompress-dropzone", async (req, res) => {
           } catch (error) {
             console.log(`Skipping ${filename} - not a valid image file`);
             io.to(room).emit(
-              "errormessage",
-              `Skipping ${filename} - not a valid image file`
+                "errormessage",
+                `Skipping ${filename} - not a valid image file`
             );
             continue;
           }
@@ -1724,7 +1705,7 @@ router.post("/zcompress-dropzone", async (req, res) => {
             try {
               // Compress the image to a buffer
               const compressedBuffer = await image[format](
-                config[format]
+                  config[format]
               ).toBuffer();
               await wait(timeExcecute); // Wait for file system
               // Write the compressed buffer to the original file
@@ -1883,8 +1864,8 @@ router.post("/zdropbox-file/:index", async (req, res) => {
           res.json(jsonMessage.datas);
         } else {
           io.to(room).emit(
-            "errormessage",
-            `Please reload your browser !! Error ${pathFile} not exist in dropbox, `
+              "errormessage",
+              `Please reload your browser !! Error ${pathFile} not exist in dropbox, `
           );
           res.json(datas);
         }
@@ -2085,32 +2066,32 @@ router.post("/zcompress-dropbox", async (req, res) => {
             const fileName = file;
             // Process the image with sharp
             const processedImage = await sharp(response.result.fileBinary)
-              .resize({
-                width: 1024,
-                height: null, // Maintain aspect ratio
-                fit: "inside",
-                withoutEnlargement: true, // Don't enlarge if image is smaller than 1024px
-              })
-              .toBuffer()
-              .then((buffer) => {
-                // Check if the file is PNG
-                if (fileName.toLowerCase().endsWith(".png")) {
-                  return sharp(buffer)
-                    .png({
-                      quality: 60,
-                      compressionLevel: 9, // Maximum compression for PNG
-                    })
-                    .toBuffer();
-                } else {
-                  // For JPEG files
-                  return sharp(buffer)
-                    .jpeg({
-                      quality: 60,
-                      mozjpeg: true, // Better compression
-                    })
-                    .toBuffer();
-                }
-              });
+                .resize({
+                  width: 1024,
+                  height: null, // Maintain aspect ratio
+                  fit: "inside",
+                  withoutEnlargement: true, // Don't enlarge if image is smaller than 1024px
+                })
+                .toBuffer()
+                .then((buffer) => {
+                  // Check if the file is PNG
+                  if (fileName.toLowerCase().endsWith(".png")) {
+                    return sharp(buffer)
+                        .png({
+                          quality: 60,
+                          compressionLevel: 9, // Maximum compression for PNG
+                        })
+                        .toBuffer();
+                  } else {
+                    // For JPEG files
+                    return sharp(buffer)
+                        .jpeg({
+                          quality: 60,
+                          mozjpeg: true, // Better compression
+                        })
+                        .toBuffer();
+                  }
+                });
 
             // Upload the compressed image back to Dropbox
             await dbx.filesUpload({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "1.5.16",
+  "version": "1.5.18",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"