keycloak-express-middleware 4.4.1 → 4.5.0

package/README.md

@@ -486,7 +486,11 @@ Middleware to protect Express routes based on authentication and, optionally, au
 Allows restricting access to a resource only to authenticated users or to those possessing specific roles in the realm or in a Keycloak client.
 
 **` -- @parameters -- `**
-- **conditions**: `[optional]` An array of strings each specifying one or more required roles; or a function executing custom code performing an access role verification 
+- **conditions**: `[optional]` A String specifing one role, or an array of strings each specifying one or more required roles; or a function executing custom code performing an access role verification 
+  - As a string: specifies one required role, using the syntax:
+    - 'role'              → client role in the configured client (e.g., 'admin')
+    - 'clientid:role'     → client role of a specific client (e.g., 'myclient:editor')
+    - 'realm:role'        → realm role (e.g., 'realm:superuser')
   - As array of strings: specifies one or more required roles, using the syntax: 
     - 'role'              → client role in the configured client (e.g., 'admin')
     - 'clientid:role'     → client role of a specific client (e.g., 'myclient:editor')
@@ -494,6 +498,7 @@ Allows restricting access to a resource only to authenticated users or to those
   - As a function: receives (token, req) and must return true or false synchronously. This function enables custom authorization logic. The `token` object passed to the authorization function exposes methods such as:
     - token.hasRole('admin')               // client role in configured client
     - token.hasRole('realm:superuser')     // realm role
+    - token.hasRealmRole('superuser)       // realm role like token.hasRole('realm:superuser')
     - token.hasRole('my-client:editor')    // client role of a specific client
     - token.hasResourceRole('editor', 'my-client-id') // equivalent to hasRole('my-client:editor')
     The authorization function must be synchronous and return true (allow access) or false (deny access).
@@ -715,6 +720,7 @@ for example showing different content based on role.
 Represents the decoded Keycloak token and exposes several useful methods such as:
 - token.hasRole('admin')             // true/false if it has client role "admin"
 - token.hasRole('realm:superuser')   // true/false if it has realm role "superuser"
+- token.hasRealmRole('superuser)     // realm role like token.hasRole('realm:superuser')
 - token.hasRole('my-client:editor')  // true/false if it has client role "editor" for client "my-client"
 - token.hasResourceRole('editor', 'my-client-id') // identical to hasRole('my-client:editor')
 

package/index.js

@@ -322,19 +322,34 @@ class keycloakExpressMiddleware {
      * or false (deny access).
      */
 
-    protectMiddleware(conditions){
-        //return(this.keycloak.protect(conditions));
+    // protectMiddleware(conditions){
+    //     //return(this.keycloak.protect(conditions));
+    //
+    //     const self = this;
+    //     return function(req, res, next){
+    //         conditions = Array.isArray(conditions) ? conditions : [conditions];
+    //         self.keycloak.protect((token) => {
+    //             return conditions.some((role) => typeof role === 'string' && token.hasRole(role));
+    //         })(req, res, next);
+    //     }
+    // }
+    protectMiddleware(conditions) {
+        // Se conditions è una funzione, delega direttamente a keycloak.protect()
+        if (typeof conditions === 'function') {
+            return this.keycloak.protect(conditions);
+        }
 
-        const self = this;
-        return function(req, res, next){
-            conditions = Array.isArray(conditions) ? conditions : [conditions];
-            self.keycloak.protect((token) => {
-                return conditions.some((role) => typeof role === 'string' && token.hasRole(role));
+        // Altrimenti, gestisci ruoli singoli o multipli
+        return (req, res, next) => {
+            const roles = Array.isArray(conditions) ? conditions : [conditions];
+            this.keycloak.protect((token) => {
+                return roles.some(
+                    (role) => typeof role === 'string' && token.hasRole(role)
+                );
             })(req, res, next);
-        }
+        };
     }
 
-
     /**
      * *************************** - ITALIANO - *****************************
      * Middleware simile a `protectMiddleware` ma con controllo dinamico dei ruoli tramite funzione.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "keycloak-express-middleware",
-  "version": "4.4.1",
+  "version": "4.5.0",
   "description": "Adapter API to integrate Node.js (Express) applications with Keycloak. Provides middleware for authentication, authorization, token validation, and route protection via OpenID Connect.",
   "main": "index.js",
   "scripts": {