@tmlmobilidade/interfaces 20250925.1818.18 → 20251001.1147.43

package/dist/src/providers/auth/auth.js

@@ -2,7 +2,7 @@
 import { roles, sessions, users, verificationTokens } from '../../interfaces/index.js';
 import { sendWelcomeEmail } from '@tmlmobilidade/emails';
 import { getAppConfig, HttpException, HttpStatus } from '@tmlmobilidade/lib';
-import { AsyncSingletonProxy, Dates, generateRandomString, generateRandomToken } from '@tmlmobilidade/utils';
+import { AsyncSingletonProxy, Dates, generateRandomString, generateRandomToken, mergeObjects } from '@tmlmobilidade/utils';
 import bcrypt from 'bcryptjs';
 /* * */
 class AuthProvider {
@@ -29,28 +29,21 @@ class AuthProvider {
         // Get the user and their roles
         const userData = await this.getUser(sessionToken);
         const rolesData = await roles.findMany({ _id: { $in: userData.role_ids } });
-        //
-        // Build the permissions list
-        let combinedPermissions = [];
-        try {
-            // Combine permissions from associated roles
-            // and user-specific permissions
-            combinedPermissions = [
-                ...rolesData.flatMap(role => role.permissions),
-                ...userData.permissions,
-            ];
-        }
-        catch (e) {
-            throw new HttpException(HttpStatus.INTERNAL_SERVER_ERROR, 'Error getting permissions', { cause: e });
+        const allPermissions = [...rolesData.flatMap(role => role.permissions), ...userData.permissions];
+        const permissionsMap = new Map();
+        for (const permission of allPermissions) {
+            const key = `${permission.scope}:${permission.action}`;
+            if (permissionsMap.has(key)) {
+                const existingPermission = permissionsMap.get(key);
+                if (!existingPermission) {
+                    throw new HttpException(HttpStatus.INTERNAL_SERVER_ERROR, 'Error getting permissions');
+                }
+                permissionsMap.set(key, mergeObjects(existingPermission, permission));
+                continue;
+            }
+            permissionsMap.set(key, permission);
         }
-        //
-        // If no permission found, throw an error
-        if (!combinedPermissions?.length) {
-            throw new HttpException(HttpStatus.FORBIDDEN, 'User does not have permissions');
-        }
-        //
-        // Else, return the permission
-        return combinedPermissions;
+        return Array.from(permissionsMap.values());
     }
     /**
      * Gets a user by their session token.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tmlmobilidade/interfaces",
-	"version": "20250925.1818.18",
+	"version": "20251001.1147.43",
 	"author": "João de Vasconcelos & Jusi Monteiro",
 	"license": "AGPL-3.0-or-later",
 	"homepage": "https://github.com/tmlmobilidade/services#readme",