@tmlmobilidade/fastify 20260706.931.16 → 20260706.1756.42

package/dist/authorization-middleware.d.ts

@@ -1,5 +1,10 @@
 import { FastifyReply, type FastifyRequest } from './fastify-service.js';
 import { type ActionsOf, type Organization, type Permission, type User } from '@tmlmobilidade/types';
+interface AuthorizationPermissionCheck<S extends Permission['scope'] = Permission['scope']> {
+    actions: ActionsOf<S>[];
+    requireAll?: boolean;
+    scope: S;
+}
 declare module 'fastify' {
     interface FastifyRequest {
         me: User;
@@ -14,4 +19,6 @@ declare module 'fastify' {
  * @param requireAll Whether all actions must be true or at least one must be true.
  * @returns Fastify middleware function.
  */
+export declare function authorizationMiddleware(checks: AuthorizationPermissionCheck[]): (request: FastifyRequest, reply: FastifyReply<string>) => Promise<void>;
 export declare function authorizationMiddleware<S extends Permission['scope']>(scope?: S, actions?: ActionsOf<S>[], requireAll?: boolean): (request: FastifyRequest, reply: FastifyReply<string>) => Promise<void>;
+export {};

package/dist/authorization-middleware.js

@@ -2,14 +2,13 @@
 import { HTTP_STATUS, HttpException } from '@tmlmobilidade/consts';
 import { AUTH_SESSION_COOKIE_NAME, authProvider } from '@tmlmobilidade/interfaces';
 import { PermissionCatalog } from '@tmlmobilidade/types';
-/**
- * Creates an authorization middleware that validates user authentication and permissions.
- * @param scope The permission scope to check (optional).
- * @param action The permission action(s) to check (optional).
- * @param requireAll Whether all actions must be true or at least one must be true.
- * @returns Fastify middleware function.
- */
-export function authorizationMiddleware(scope, actions, requireAll = false) {
+function isPermissionCheckAllowed(permissionEntries, check) {
+    const permissionChecks = check.actions.map(action => PermissionCatalog.hasPermission(permissionEntries, check.scope, action));
+    return check.requireAll
+        ? permissionChecks.every(Boolean)
+        : permissionChecks.some(Boolean);
+}
+export function authorizationMiddleware(scopeOrChecks, actions = [], requireAll = false) {
     return async (request, reply) => {
         //
         //
@@ -46,14 +45,21 @@ export function authorizationMiddleware(scope, actions, requireAll = false) {
         //
         // Evaluate the retrieved permissions,
         // if scope and actions are provided.
-        if (!scope)
+        if (Array.isArray(scopeOrChecks)) {
+            const isAllowed = scopeOrChecks.some(check => isPermissionCheckAllowed(request.permissions, check));
+            if (!isAllowed) {
+                throw new HttpException(HTTP_STATUS.FORBIDDEN, `Insufficient permissions | User: ${request.me._id}`);
+            }
+            return;
+        }
+        if (!scopeOrChecks)
             return;
-        const permissionChecks = actions.map(action => PermissionCatalog.hasPermission(request.permissions, scope, action));
+        const permissionChecks = actions.map(action => PermissionCatalog.hasPermission(request.permissions, scopeOrChecks, action));
         const isAllowed = requireAll
             ? permissionChecks.every(Boolean) // all must be true
             : permissionChecks.some(Boolean); // at least one must be true
         if (!isAllowed) {
-            throw new HttpException(HTTP_STATUS.FORBIDDEN, `Insufficient permissions | User: ${request.me._id} | Scope: "${scope}" | Actions: [${actions.join(',')}]`);
+            throw new HttpException(HTTP_STATUS.FORBIDDEN, `Insufficient permissions | User: ${request.me._id} | Scope: "${scopeOrChecks}" | Actions: [${actions.join(',')}]`);
         }
         //
     };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tmlmobilidade/fastify",
-	"version": "20260706.931.16",
+	"version": "20260706.1756.42",
 	"author": {
 		"email": "iso@tmlmobilidade.pt",
 		"name": "TML-ISO"
@@ -44,7 +44,7 @@
 		"@tmlmobilidade/interfaces": "*",
 		"@tmlmobilidade/logger": "*",
 		"@tmlmobilidade/utils": "*",
-		"fastify": "5.9.0"
+		"fastify": "5.10.0"
 	},
 	"devDependencies": {
 		"@tmlmobilidade/tsconfig": "*",