@tomei/sso 0.28.3 → 0.28.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomei/sso",
-  "version": "0.28.3",
+  "version": "0.28.5",
   "description": "Tomei SSO Package",
   "main": "dist/index.js",
   "scripts": {

package/src/components/login-user/login-user.ts

@@ -296,6 +296,7 @@ export class LoginUser extends LoginUserBase {
             model: Staff,
           },
         ],
+        transaction: dbTransaction,
       });
 
       if (!user) {
@@ -368,9 +369,9 @@ export class LoginUser extends LoginUserBase {
           const userAttr: IUserAttr = {
             UserId: user.UserId,
             UserName: user.UserName,
-            FullName: user.Staff.FullName,
-            IDNo: user.Staff.IdNo,
-            ContactNo: user.Staff.Mobile,
+            FullName: user.Staff.FullName || null,
+            IDNo: user.Staff.IdNo || null,
+            ContactNo: user.Staff.Mobile || null,
             Email: user.Email,
             Password: user.Password,
             Status: user.Status,
@@ -388,7 +389,7 @@ export class LoginUser extends LoginUserBase {
             CreatedAt: user.CreatedAt,
             UpdatedById: user.UpdatedById,
             UpdatedAt: user.UpdatedAt,
-            staffs: user.Staff,
+            staffs: user.Staff || null,
           };
 
           this.UserId = userAttr.UserId;
@@ -562,14 +563,18 @@ export class LoginUser extends LoginUserBase {
       this._SessionService.setUserSession(this.ObjectId, userSession);
 
       // record new login history
-      await LoginUser._LoginHistoryRepository.create({
-        UserId: this.UserId,
-        SystemCode: system.SystemCode,
-        OriginIp: ipAddress,
-        CreatedAt: new Date(),
-        LoginStatus: LoginStatusEnum.SUCCESS,
-        dbTransaction,
-      });
+      await LoginUser._LoginHistoryRepository.create(
+        {
+          UserId: this.UserId,
+          SystemCode: system.SystemCode,
+          OriginIp: ipAddress,
+          CreatedAt: new Date(),
+          LoginStatus: LoginStatusEnum.SUCCESS,
+        },
+        {
+          transaction: dbTransaction,
+        },
+      );
 
       // Retrieve is2FAEnabledYN from sso-config with ComponentConfig.
       const is2FAEnabledYN = ComponentConfig.getComponentConfigValue(
@@ -583,14 +588,20 @@ export class LoginUser extends LoginUserBase {
 
       return `${this.UserId}:${sessionId}`;
     } catch (error) {
-      await LoginUser._LoginHistoryRepository.create({
-        UserId: this.UserId,
-        SystemCode: systemCode,
-        OriginIp: ipAddress,
-        LoginStatus: LoginStatusEnum.FAILURE,
-        CreatedAt: new Date(),
-        dbTransaction,
-      });
+      if (this.ObjectId) {
+        await LoginUser._LoginHistoryRepository.create(
+          {
+            UserId: this.UserId,
+            SystemCode: systemCode,
+            OriginIp: ipAddress,
+            LoginStatus: LoginStatusEnum.FAILURE,
+            CreatedAt: new Date(),
+          },
+          {
+            transaction: dbTransaction,
+          },
+        );
+      }
       throw error;
     }
   }