@drax/identity-back 0.30.0 → 0.33.0

package/dist/controllers/RoleController.js

@@ -28,7 +28,7 @@ class RoleController extends AbstractFastifyController {
             const roleService = RoleServiceFactory();
             let roles = await roleService.fetchAll();
             if (request.rbac.getRole?.childRoles?.length > 0) {
-                return roles.filter(role => request.rbac.getRole.childRoles.some(childRole => childRole._id === role._id));
+                return roles.filter(role => request.rbac.getRole.childRoles.some(childRole => childRole._id?.toString() === role._id?.toString()));
             }
             else {
                 return roles;

package/dist/middleware/jwtMiddleware.js

@@ -6,7 +6,8 @@ function jwtMiddleware(request, reply, done) {
         if (request.headers['authorization'] && bearerRegExp.test(request.headers['authorization'])) {
             token = request.headers?.authorization?.replace(/Bearer /i, "");
         }
-        if (token) {
+        const routerPath = request.url;
+        if (routerPath != '/api/auth/login' && token) {
             const authUser = AuthUtils.verifyToken(token);
             if (authUser) {
                 request.authUser = authUser;
@@ -17,6 +18,9 @@ function jwtMiddleware(request, reply, done) {
     }
     catch (e) {
         console.error(e);
+        if (e.name === 'TokenExpiredError') {
+            reply.code(498).send({ error: 'JWT expirado' });
+        }
         reply.code(401).send({ error: 'Token JWT inválido' });
     }
 }

package/dist/permissions/UserPermissions.js

@@ -5,6 +5,7 @@ var UserPermissions;
     UserPermissions["Delete"] = "user:delete";
     UserPermissions["View"] = "user:view";
     UserPermissions["Manage"] = "user:manage";
+    UserPermissions["ChangePassword"] = "user:changePassword";
     UserPermissions["SwitchTenant"] = "user:switchTenant";
 })(UserPermissions || (UserPermissions = {}));
 export default UserPermissions;

package/dist/repository/mongo/UserMongoRepository.js

@@ -6,7 +6,10 @@ class UserMongoRepository extends AbstractMongoRepository {
     constructor() {
         super();
         this._searchFields = ['name', 'username', 'email', 'phone'];
-        this._populateFields = ['role', 'tenant'];
+        this._populateFields = [
+            { path: 'role', populate: { path: 'childRoles' } },
+            { path: 'tenant' },
+        ];
         this._model = UserModel;
         this._lean = true;
         this.roleRepository = new RoleMongoRepository();

package/dist/schemas/UserSchema.js

@@ -26,7 +26,8 @@ const UserSchema = UserBaseSchema
         _id: string(),
         id: string().optional(),
         name: string(),
-        permissions: array(string())
+        permissions: array(string()),
+        childRoles: array(object({ _id: string(), name: string() })).optional()
     }).optional(),
     active: boolean(),
     tenant: object({

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.30.0",
+  "version": "0.33.0",
   "description": "Identity module for user management, authentication and authorization.",
   "main": "dist/index.js",
   "types": "types/index.d.ts",
@@ -28,11 +28,11 @@
   "author": "Cristian Incarnato & Drax Team",
   "license": "ISC",
   "dependencies": {
-    "@drax/common-back": "^0.30.0",
-    "@drax/crud-back": "^0.30.0",
-    "@drax/crud-share": "^0.30.0",
-    "@drax/email-back": "^0.30.0",
-    "@drax/identity-share": "^0.30.0",
+    "@drax/common-back": "^0.33.0",
+    "@drax/crud-back": "^0.33.0",
+    "@drax/crud-share": "^0.33.0",
+    "@drax/email-back": "^0.33.0",
+    "@drax/identity-share": "^0.33.0",
     "bcryptjs": "^2.4.3",
     "graphql": "^16.8.2",
     "jsonwebtoken": "^9.0.2"
@@ -63,5 +63,5 @@
       "debug": "0"
     }
   },
-  "gitHead": "f7f06578327be29f20dcb7e2c8a2eac9e9145cab"
+  "gitHead": "2a006597a635f61776d252f92bb3899371244379"
 }

package/src/controllers/RoleController.ts

@@ -36,7 +36,7 @@ class RoleController extends AbstractFastifyController<IRole, IRoleBase, IRoleBa
             const roleService = RoleServiceFactory()
             let roles = await roleService.fetchAll()
             if(request.rbac.getRole?.childRoles?.length > 0) {
-                return roles.filter(role => request.rbac.getRole.childRoles.some(childRole => childRole._id === role._id));
+                return roles.filter(role => request.rbac.getRole.childRoles.some(childRole => childRole._id?.toString() === role._id?.toString()));
             }else{
                 return roles
             }

package/src/middleware/jwtMiddleware.ts

@@ -11,7 +11,9 @@ function jwtMiddleware (request, reply, done) {
                 token = request.headers?.authorization?.replace(/Bearer /i, "")
             }
 
-            if(token){
+            const routerPath = request.url
+
+            if(routerPath != '/api/auth/login' && token){
                 const authUser = AuthUtils.verifyToken(token) as IJwtUser
                 if(authUser){
                     request.authUser = authUser
@@ -21,6 +23,9 @@ function jwtMiddleware (request, reply, done) {
             done()
         }catch (e) {
             console.error(e)
+            if (e.name === 'TokenExpiredError') {
+                reply.code(498).send({ error: 'JWT expirado' });
+            }
             reply.code(401).send({ error: 'Token JWT inválido' });
         }
 }

package/src/permissions/UserPermissions.ts

@@ -4,6 +4,7 @@ enum UserPermissions {
     Delete = "user:delete",
     View = "user:view",
     Manage = "user:manage",
+    ChangePassword = "user:changePassword",
     SwitchTenant = "user:switchTenant",
 }
 

package/src/repository/mongo/UserMongoRepository.ts

@@ -17,7 +17,10 @@ class UserMongoRepository extends AbstractMongoRepository<IUser,IUserCreate,IUse
     protected roleRepository: RoleMongoRepository;
 
     protected _searchFields = ['name','username','email','phone']
-    protected _populateFields = ['role','tenant']
+    protected _populateFields = [
+        {path: 'role', populate: {path: 'childRoles'} },
+        {path: 'tenant'},
+        ]
     protected _model = UserModel
     protected _lean = true
 

package/src/schemas/UserSchema.ts

@@ -33,7 +33,8 @@ const UserSchema = UserBaseSchema
             _id: string(),
             id: string().optional(),
             name: string(),
-            permissions: array(string())
+            permissions: array(string()),
+            childRoles: array(object({_id: string(), name:string()})).optional()
         }).optional(),
         active: boolean(),
         tenant: object({