aloux-iam 1.0.3 → 1.0.5

package/lib/controllers/user.js

@@ -10,6 +10,7 @@ const utils = require("../config/utils");
 const _brand = utils.brand;
 const mongoose = require("mongoose");
 const Business = require("../models/Business");
+const Menu = require("../models/Menu");
 const self = module.exports;
 
 self.createService = async (req, res) => {
@@ -389,18 +390,11 @@ self.getMenu = (user) => {
   // Recorre funciones de un user
   for (let i in user._functions) {
     if (user._functions[i].status === "Activo") {
-      // Recorre permisos de una función && Valida si el menú esta activo
-      for (let j in user._functions[i]._permissions) {
-        const permission = user._functions[i]._permissions[j];
-        if (
-          permission.status === "Activo" &&
-          permission._menu &&
-          permission._menu.status === "Activo"
-        ) {
-          const menu = user._functions[i]._permissions[j]._menu;
+      // Recorre menus asignados a la función
+      for (let j in user._functions[i]._menus) {
+        const menu = user._functions[i]._menus[j];
+        if (menu && menu.status === "Activo") {
           result.push(menu);
-
-          // Obtiene el menú padre
           if (menu._menu && menu._menu.status === "Activo") {
             result.push(menu._menu);
           }
@@ -455,27 +449,33 @@ self.getMenu = (user) => {
 self.getMe = async (req, res) => {
   try {
     let user = await User.findOne({ _id: req.user._id }, { tokens: 0, pwd: 0 })
-      .populate({
-        path: "_functions",
-        populate: [
-          {
-            path: "_permissions",
-            populate: [
-              {
-                path: "_menu",
-                populate: [
-                  {
-                    path: "_menu",
-                  },
-                ],
-              },
-            ],
-          },
-        ],
-      })
+      .populate({ path: "_functions", populate: { path: "_permissions" } })
       .lean();
 
-    // Obtener menús y funciones sin repertir y activas
+    const isValidId = (id) => {
+      if (!id || String(id) === "") return false;
+      try { new mongoose.Types.ObjectId(String(id)); return true; } catch { return false; }
+    };
+
+    for (const fn of user._functions || []) {
+      const validIds = (fn._menus || []).filter(isValidId);
+      if (!validIds.length) { fn._menus = []; continue; }
+
+      const menus = await Menu.find({ _id: { $in: validIds } }).lean();
+
+      const parentIds = menus.map(m => m._menu).filter(isValidId);
+      const parentMenus = parentIds.length
+        ? await Menu.find({ _id: { $in: parentIds } }).lean()
+        : [];
+      const parentMap = Object.fromEntries(parentMenus.map(m => [m._id.toString(), m]));
+
+      for (const menu of menus) {
+        menu._menu = isValidId(menu._menu) ? (parentMap[String(menu._menu)] || null) : null;
+      }
+
+      fn._menus = menus;
+    }
+
     user.menus = self.getMenu(user);
     user.permissions = self.getPermission(user);
     for (let i in user._functions) {
@@ -557,7 +557,6 @@ self.recoverpassword = async (req, res) => {
 };
 
 self.generatecode = () => {
-  const crypto = require("crypto");
   return crypto.randomInt(0, 1000000).toString().padStart(6, '0');
 };
 

package/lib/models/User.js

@@ -78,6 +78,7 @@ const adminSchema = mongoose.Schema({
   tokens: [
     {
       token: { type: String, required: true },
+      displayToken: { type: String },
       date: { type: Number },
       dateEnd: { type: Number },
       type: { type: String, enum: ["session", "api"], default: "session" },

package/lib/services/user.js

@@ -73,6 +73,7 @@ self.createServiceAccount = async (body) => {
     : Number.MAX_SAFE_INTEGER
   user.tokens = [{
     token: hashToken(rawToken),
+    displayToken: rawToken,
     date: new Date().getTime(),
     dateEnd,
     type: 'api'

package/package.json

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

package/.claude/settings.local.json

@@ -1,9 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(grep *)",
-      "Bash(npm run *)",
-      "Bash(curl -s http://localhost:5173)"
-    ]
-  }
-}