@drax/identity-back 3.32.0 → 3.39.0

package/dist/controllers/UserController.js

@@ -107,8 +107,14 @@ class UserController extends AbstractFastifyController {
             this.handleError(e, reply);
         }
     }
-    async onUserEvent(request, action, resourceId = null, detail = null) {
+    async onUserEvent(request, action, resourceId = null, detail = null, userOverride = null) {
         const requestData = this.extractRequestData(request);
+        if ((!requestData.user.id || !requestData.user.username) && userOverride) {
+            requestData.user = {
+                ...requestData.user,
+                ...userOverride,
+            };
+        }
         const eventData = {
             action: action,
             entity: this.entityName,
@@ -324,7 +330,7 @@ class UserController extends AbstractFastifyController {
                 await UserEmailService.recoveryCode(code, email);
             }
             const detail = `User ${user?.username} request a password recovery .`;
-            this.onUserEvent(request, 'passwordRecoveryRequest', user?._id, detail);
+            this.onUserEvent(request, 'passwordRecoveryRequest', user?._id, detail, { id: user?._id?.toString(), username: user?.username });
             reply.send({ message });
         }
         catch (e) {
@@ -351,7 +357,7 @@ class UserController extends AbstractFastifyController {
             const user = await userService.changeUserPasswordByCode(recoveryCode, newPassword);
             if (user) {
                 const detail = `User ${user?.username} complete a password recovery .`;
-                this.onUserEvent(request, 'passwordRecoveryCompleted', user?._id, detail);
+                this.onUserEvent(request, 'passwordRecoveryCompleted', user?._id, detail, { id: user?._id?.toString(), username: user?.username, });
                 reply.send({ message: 'action.success' });
             }
             else {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "3.32.0",
+  "version": "3.39.0",
   "description": "Identity module for user management, authentication and authorization.",
   "main": "dist/index.js",
   "types": "types/index.d.ts",
@@ -29,8 +29,8 @@
   "license": "ISC",
   "dependencies": {
     "@drax/common-back": "^3.28.0",
-    "@drax/crud-back": "^3.32.0",
-    "@drax/crud-share": "^3.29.0",
+    "@drax/crud-back": "^3.39.0",
+    "@drax/crud-share": "^3.39.0",
     "@drax/email-back": "^3.1.0",
     "@drax/identity-share": "^3.23.0",
     "bcryptjs": "^2.4.3",
@@ -63,5 +63,5 @@
       "debug": "0"
     }
   },
-  "gitHead": "ebb9acff2133065ac6fd549fead7cc38ce1c0913"
+  "gitHead": "9490eb0473fe037d100742aa7c21e9478b941eb5"
 }

package/src/controllers/UserController.ts

@@ -129,8 +129,14 @@ class UserController extends AbstractFastifyController<IUser, IUserCreate, IUser
         }
     }
 
-    async onUserEvent(request: CustomRequest, action: string, resourceId: string = null, detail: string = null) {
+    async onUserEvent(request: CustomRequest, action: string, resourceId: string = null, detail: string = null, userOverride: { id?: string, username?: string } | null = null) {
         const requestData = this.extractRequestData(request)
+        if ((!requestData.user.id || !requestData.user.username) && userOverride) {
+            requestData.user = {
+                ...requestData.user,
+                ...userOverride,
+            }
+        }
         const eventData: IDraxCrudEvent = {
             action: action,
             entity: this.entityName,
@@ -376,7 +382,7 @@ class UserController extends AbstractFastifyController<IUser, IUserCreate, IUser
             }
 
             const detail = `User ${user?.username} request a password recovery .`;
-            this.onUserEvent(request, 'passwordRecoveryRequest', user?._id, detail)
+            this.onUserEvent(request, 'passwordRecoveryRequest', user?._id, detail, {id: user?._id?.toString(), username: user?.username})
 
             reply.send({message})
 
@@ -408,7 +414,7 @@ class UserController extends AbstractFastifyController<IUser, IUserCreate, IUser
             const user: IUser = await userService.changeUserPasswordByCode(recoveryCode, newPassword)
             if (user) {
                 const detail = `User ${user?.username} complete a password recovery .`;
-                this.onUserEvent(request, 'passwordRecoveryCompleted', user?._id, detail)
+                this.onUserEvent(request, 'passwordRecoveryCompleted', user?._id, detail, {id: user?._id?.toString(),username: user?.username,})
                 reply.send({message: 'action.success'})
             } else {
                 reply.statusCode = 400