@tomei/sso 0.60.4-dev.4 → 0.60.4-dev.6

package/package.json

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

package/src/components/login-history/index.ts

@@ -1,2 +1,2 @@
-export * from './login-history';
 export * from './login-history.repository';
+export * from './login-history';

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

@@ -5,6 +5,7 @@ import { LoginUser } from '../login-user/login-user';
 import { ApplicationConfig } from '@tomei/config';
 import { ILoginHistorySearchAttr } from '../../interfaces/login-history-search-attr.interface';
 import { Op } from 'sequelize';
+import User from '../../models/user.entity';
 
 export class LoginHistory extends ObjectBase {
   ObjectId: string;
@@ -14,6 +15,7 @@ export class LoginHistory extends ObjectBase {
 
   HistoryId: number;
   UserId: number;
+  UserName: string;
   OriginIP: string;
   SystemCode: string;
   LoginStatus: string;
@@ -27,12 +29,13 @@ export class LoginHistory extends ObjectBase {
   private constructor(loginHistoryAttr?: ILoginHistoryAttr) {
     super();
     if (loginHistoryAttr) {
-      this.HistoryId = loginHistoryAttr.HistoryId;
-      this.UserId = loginHistoryAttr.UserId;
+      this.HistoryId = loginHistoryAttr?.HistoryId;
+      this.UserId = loginHistoryAttr?.UserId;
+      this.UserName = loginHistoryAttr?.User?.UserName;
       this.OriginIP = loginHistoryAttr?.OriginIp;
       this.SystemCode = loginHistoryAttr?.SystemCode;
       this.LoginStatus = loginHistoryAttr?.LoginStatus;
-      this._CreatedAt = loginHistoryAttr.CreatedAt;
+      this._CreatedAt = loginHistoryAttr?.CreatedAt;
     }
   }
 
@@ -96,6 +99,13 @@ export class LoginHistory extends ObjectBase {
         where: queryObj,
         ...whereObj,
         order: [['CreatedAt', 'DESC']],
+        include: [
+          {
+            model: User,
+            required: false,
+            attributes: ['UserName'],
+          },
+        ],
         transaction: dbTransaction,
       });
 

package/src/components/user-system-access/user-system-access.ts

@@ -249,7 +249,7 @@ export class UserSystemAccess extends ObjectBase {
                 Status: UserStatus.ACTIVE,
               },
               as: 'User',
-              attributes: ['UserId', 'FullName'],
+              attributes: ['UserId', 'FullName', 'Email'],
             },
           ],
         };

package/src/interfaces/login-history.interface.ts

@@ -1,6 +1,9 @@
 export interface ILoginHistoryAttr {
   HistoryId: number;
   UserId: number;
+  User?: {
+    UserName: string;
+  };
   OriginIp: string;
   SystemCode: string;
   LoginStatus: string;