aloux-iam 0.0.147 → 0.0.148

package/lib/middleware.js

@@ -58,7 +58,13 @@ const auth = async (req, res, next) => {
       { _id: data._id, "tokens.token": token, status: "Activo" },
       { tokens: 0, pwd: 0 },
     )
-      .populate({ path: "_functions", populate: [{ path: "_permissions" }] })
+      .populate({
+        path: "_functions",
+        populate: [
+          { path: "_permissions", model: "Permission" },
+          { path: "_menus", model: "Menu" }
+        ]
+      })
       .lean();
 
     if (!user) {

package/lib/models/Functions.js

@@ -1,14 +1,19 @@
-const mongoose = require('mongoose')
+const mongoose = require("mongoose");
 
-const functionsSchema = mongoose.Schema({
-    name:           { type: String, required: true, trim: true, unique: true },
-    description:    { type: String, trim: true },
-    _permissions:   [ { type: mongoose.Schema.Types.ObjectId, required: true, ref: 'Permission' } ],
-    _menus:         [ { type: mongoose.Schema.Types.ObjectId, required: true, ref: 'Menu' } ],
-    status:         { type: String, required: true, enum: ['Activo','Inactivo'] },
-    createdAt:      { type: Number },
-    lastUpdate:     { type: Number }
-})
+const permissionSchema = mongoose.Schema({
+  description: { type: String, required: true, trim: true },
+  method:      { type: String, required: true },
+  api:         { type: String, required: true },
+  endpoint:    { type: String, required: true },
+  auth:        { type: Number, required: true, default: 1 },
+  default:     { type: Boolean },
+  status:      { type: String, required: true, enum: ["Activo", "Inactivo"] },
+  createdAt:   { type: Number },
+  lastUpdate:  { type: Number },
+});
 
-const Functions = mongoose.model("Functions", functionsSchema)
-module.exports = Functions
+// Índice compuesto: method + endpoint sí son únicos juntos
+permissionSchema.index({ method: 1, endpoint: 1 }, { unique: true });
+
+const Permission = mongoose.model("Permission", permissionSchema);
+module.exports = Permission;

package/lib/services/auth.js

@@ -312,14 +312,8 @@ self.getMenu = (user) => {
 };
 
 self.me = async (req, res) => {
-  // let user = await User.findOne({ _id: req.user._id }, { "tokens": 0, pwd: 0 }).populate([
-  //     { path: "_business" },
-  //     { path: "_functions", populate: [{ path: "_permissions" }, { path: "_menus" }] },
-  // ]).lean()
-
   const _id = req.user._id;
 
-  // Valida que los modelos existan hantes de hacer una consulta con populate
   if (
     mongoose.modelNames().includes("Business") &&
     mongoose.modelNames().includes("Client")
@@ -328,7 +322,10 @@ self.me = async (req, res) => {
       .populate([
         {
           path: "_functions",
-          populate: [{ path: "_permissions" }, { path: "_menus" }],
+          populate: [
+            { path: "_permissions", model: "Permission" },
+            { path: "_menus", model: "Menu" }
+          ],
         },
         { path: "_business" },
         { path: "_client" },
@@ -340,7 +337,10 @@ self.me = async (req, res) => {
       .populate([
         {
           path: "_functions",
-          populate: [{ path: "_permissions" }, { path: "_menus" }],
+          populate: [
+            { path: "_permissions", model: "Permission" },
+            { path: "_menus", model: "Menu" }
+          ],
         },
         { path: "_business" },
       ])
@@ -351,7 +351,10 @@ self.me = async (req, res) => {
       .populate([
         {
           path: "_functions",
-          populate: [{ path: "_permissions" }, { path: "_menus" }],
+          populate: [
+            { path: "_permissions", model: "Permission" },
+            { path: "_menus", model: "Menu" }
+          ],
         },
         { path: "_client" },
       ])
@@ -362,14 +365,16 @@ self.me = async (req, res) => {
       .populate([
         {
           path: "_functions",
-          populate: [{ path: "_permissions" }, { path: "_menus" }],
+          populate: [
+            { path: "_permissions", model: "Permission" },
+            { path: "_menus", model: "Menu" }
+          ],
         },
       ])
       .select("-pwd -tokens")
       .lean();
   }
 
-  // Obtener menús y funciones sin repertir y activas
   user.menus = self.getMenu(user);
   user.permissions = self.getPermission(user);
   for (let i in user._functions) {

package/package.json

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