aloux-iam 0.0.143 → 0.0.145

package/lib/controllers/log.js

@@ -1,5 +1,6 @@
 const Log = require("../models/Log");
 const Label = require("../models/Label");
+const Functions = require("../models/Functions");
 const mongoose = require("mongoose");
 const self = module.exports;
 
@@ -9,7 +10,8 @@ self.create = async (req, res) => {
       req.header("Company") !== "undefined" ? req.header("Company") : null;
 
     const log = new Log(req.body);
-    const businessId = req.header("business") !== "undefined" ? req.header("business") : null;
+    const businessId =
+      req.header("business") !== "undefined" ? req.header("business") : null;
     log.createdAt = new Date().getTime();
     log._user = req.user._id;
     log._company = companyId;
@@ -56,6 +58,14 @@ self.retrieve = async (req, res) => {
     const companyId =
       req.header("Company") !== "undefined" ? req.header("Company") : null;
 
+    const excludeFunctions = req.body.excludeFunctions || [];
+
+    const excludeFuncs = await Functions.find({
+      name: { $in: excludeFunctions },
+    }).lean();
+
+    const excludeIds = excludeFuncs.map((f) => f._id);
+
     const query = { _company: companyId };
 
     if (req.body.users?.length) {
@@ -74,18 +84,29 @@ self.retrieve = async (req, res) => {
       query._business = { $in: req.body.business };
     }
 
-    const consulta = await Log.find(query).populate("_user", "name lastName email");
+    const consulta = await Log.find(query).populate({
+      path: "_user",
+      select: "name lastName email _functions",
+      match: excludeIds.length ? { _functions: { $nin: excludeIds } } : {},
+    });
+
+    const filtrados = consulta.filter((log) => log._user !== null);
 
     const response = {
-      dataset0: { field: "Visualizaciones totales", count: consulta.length },
-      dataset1: processDataset1(consulta),
-      dataset2: processDataset2(consulta),
-      dataset3: processDataset3(consulta),
-      dataset4: processDataset4(consulta),
-      dataset5: processDataset5(consulta),
-      dataset6: processDataset6(consulta),
-      dataset7: processDataset7(consulta),
-      dataset8: processDataset8(consulta, req.body.search, req.body.page, req.body.limit),
+      dataset0: { field: "Visualizaciones totales", count: filtrados.length },
+      dataset1: processDataset1(filtrados),
+      dataset2: processDataset2(filtrados),
+      dataset3: processDataset3(filtrados),
+      dataset4: processDataset4(filtrados),
+      dataset5: processDataset5(filtrados),
+      dataset6: processDataset6(filtrados),
+      dataset7: processDataset7(filtrados),
+      dataset8: processDataset8(
+        filtrados,
+        req.body.search,
+        req.body.page,
+        req.body.limit,
+      ),
     };
 
     res.status(200).send(response);
@@ -98,8 +119,18 @@ self.retrieve = async (req, res) => {
 function formatDate(isoDate) {
   const [year, month, day] = isoDate.split("-");
   const monthNames = [
-    "Ene", "Feb", "Mar", "Abr", "May", "Jun",
-    "Jul", "Ago", "Sep", "Oct", "Nov", "Dic",
+    "Ene",
+    "Feb",
+    "Mar",
+    "Abr",
+    "May",
+    "Jun",
+    "Jul",
+    "Ago",
+    "Sep",
+    "Oct",
+    "Nov",
+    "Dic",
   ];
   return `${day} ${monthNames[parseInt(month) - 1]} ${year}`;
 }
@@ -176,12 +207,12 @@ function processDataset5(consulta) {
   });
 
   const uniqueLabels = new Set(
-    Object.values(labelCountsByDate).flatMap(Object.keys)
+    Object.values(labelCountsByDate).flatMap(Object.keys),
   );
   const series = Array.from(uniqueLabels).map((label) => ({
     name: label,
     data: Array.from(categories).map(
-      (date) => labelCountsByDate[date]?.[label] || 0
+      (date) => labelCountsByDate[date]?.[label] || 0,
     ),
   }));
 
@@ -230,7 +261,7 @@ function processDataset7(data) {
   };
 }
 
-function processDataset8(data, search = "", page = 1, limit = 10) {
+function processDataset8(data, search = "", page = 1, limit = null) {
   const userActivity = {};
 
   data.forEach((item) => {
@@ -249,24 +280,32 @@ function processDataset8(data, search = "", page = 1, limit = 10) {
   let users = Object.values(userActivity).sort((a, b) => b.count - a.count);
 
   if (search) {
-    const s = search.toLowerCase().normalize("NFD").replace(/[\u0300-\u036f]/g, "");
+    const s = search
+      .toLowerCase()
+      .normalize("NFD")
+      .replace(/[\u0300-\u036f]/g, "");
     users = users.filter((u) => {
-      const full = `${u.name} ${u.lastName} ${u.email}`.toLowerCase().normalize("NFD").replace(/[\u0300-\u036f]/g, "");
+      const full = `${u.name} ${u.lastName} ${u.email}`
+        .toLowerCase()
+        .normalize("NFD")
+        .replace(/[\u0300-\u036f]/g, "");
       return full.includes(s);
     });
   }
 
   const total = users.length;
-  const totalPages = Math.ceil(total / limit);
-  const start = (page - 1) * limit;
-  const items = users.slice(start, start + limit);
+  const paginate = limit !== null && limit !== undefined;
+  const parsedLimit = paginate ? parseInt(limit) : total;
+  const parsedPage = parseInt(page);
+  const start = (parsedPage - 1) * parsedLimit;
+  const items = paginate ? users.slice(start, start + parsedLimit) : users;
 
   return {
     field: "Actividad de usuarios",
     total,
-    page,
-    limit,
-    totalPages,
+    page: parsedPage,
+    limit: parsedLimit,
+    totalPages: paginate ? Math.ceil(total / parsedLimit) : 1,
     items,
   };
 }
@@ -301,4 +340,4 @@ self.count = async (req, res) => {
   } catch (error) {
     res.status(400).send({ error: error.message });
   }
-};
+};

package/lib/middleware.js

@@ -4,15 +4,13 @@ const Permission = require("./models/Permission");
 const historyController = require("./controllers/history");
 
 const getAccess = (user, resource) => {
-  // Cuenta de servicio
+  // Cuenta de servicio: verifica acceso por api asignada
   const userApis = user?.data?.apis || [];
-  if (userApis.length > 0) {
-    return userApis.some(
-      (apiId) => apiId.toString() === resource._id.toString(),
-    );
+  if (userApis.some((apiId) => apiId.toString() === resource._id.toString())) {
+    return true;
   }
 
-  // Flujo normal
+  // Flujo normal: verifica permisos por función/rol
   for (let i in user._functions) {
     for (let j in user._functions[i]._permissions) {
       if (user._functions[i]._permissions[j].status === "Activo") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aloux-iam",
-  "version": "0.0.143",
+  "version": "0.0.145",
   "description": "Aloux IAM for APIs ",
   "main": "index.js",
   "scripts": {