@tomei/sso 0.60.4-dev.3 → 0.60.4-dev.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -8,6 +8,7 @@ export declare class LoginHistory extends ObjectBase {
8
8
  ObjectType: string;
9
9
  HistoryId: number;
10
10
  UserId: number;
11
+ UserName: string;
11
12
  OriginIP: string;
12
13
  SystemCode: string;
13
14
  LoginStatus: string;
@@ -14,21 +14,24 @@ const general_1 = require("@tomei/general");
14
14
  const login_history_repository_1 = require("./login-history.repository");
15
15
  const config_1 = require("@tomei/config");
16
16
  const sequelize_1 = require("sequelize");
17
+ const user_entity_1 = require("../../models/user.entity");
17
18
  class LoginHistory extends general_1.ObjectBase {
18
19
  get CreatedAt() {
19
20
  return this._CreatedAt;
20
21
  }
21
22
  constructor(loginHistoryAttr) {
23
+ var _a;
22
24
  super();
23
25
  this.TableName = 'sso_LoginHistory';
24
26
  this.ObjectType = 'Login History';
25
27
  if (loginHistoryAttr) {
26
- this.HistoryId = loginHistoryAttr.HistoryId;
27
- this.UserId = loginHistoryAttr.UserId;
28
+ this.HistoryId = loginHistoryAttr === null || loginHistoryAttr === void 0 ? void 0 : loginHistoryAttr.HistoryId;
29
+ this.UserId = loginHistoryAttr === null || loginHistoryAttr === void 0 ? void 0 : loginHistoryAttr.UserId;
30
+ this.UserName = (_a = loginHistoryAttr === null || loginHistoryAttr === void 0 ? void 0 : loginHistoryAttr.User) === null || _a === void 0 ? void 0 : _a.UserName;
28
31
  this.OriginIP = loginHistoryAttr === null || loginHistoryAttr === void 0 ? void 0 : loginHistoryAttr.OriginIp;
29
32
  this.SystemCode = loginHistoryAttr === null || loginHistoryAttr === void 0 ? void 0 : loginHistoryAttr.SystemCode;
30
33
  this.LoginStatus = loginHistoryAttr === null || loginHistoryAttr === void 0 ? void 0 : loginHistoryAttr.LoginStatus;
31
- this._CreatedAt = loginHistoryAttr.CreatedAt;
34
+ this._CreatedAt = loginHistoryAttr === null || loginHistoryAttr === void 0 ? void 0 : loginHistoryAttr.CreatedAt;
32
35
  }
33
36
  }
34
37
  static findAll(dbTransaction, loginUser, page, rows, search) {
@@ -60,7 +63,13 @@ class LoginHistory extends general_1.ObjectBase {
60
63
  if ((search === null || search === void 0 ? void 0 : search.DateFrom) || (search === null || search === void 0 ? void 0 : search.DateTo)) {
61
64
  queryObj.createdAt = Object.assign(Object.assign({}, ((search === null || search === void 0 ? void 0 : search.DateFrom) && { [sequelize_1.Op.gte]: search.DateFrom })), ((search === null || search === void 0 ? void 0 : search.DateTo) && { [sequelize_1.Op.lte]: search.DateTo }));
62
65
  }
63
- const result = yield LoginHistory._Repo.findAllWithPagination(Object.assign(Object.assign({ distinct: true, where: queryObj }, whereObj), { order: [['CreatedAt', 'DESC']], transaction: dbTransaction }));
66
+ const result = yield LoginHistory._Repo.findAllWithPagination(Object.assign(Object.assign({ distinct: true, where: queryObj }, whereObj), { order: [['CreatedAt', 'DESC']], include: [
67
+ {
68
+ model: user_entity_1.default,
69
+ required: false,
70
+ attributes: ['UserName'],
71
+ },
72
+ ], transaction: dbTransaction }));
64
73
  const loginHistory = result.rows.map((data) => new LoginHistory(data));
65
74
  return { count: result.count, loginHistory };
66
75
  }
@@ -1 +1 @@
1
- {"version":3,"file":"login-history.js","sourceRoot":"","sources":["../../../../src/components/login-history/login-history.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"login-history.js","sourceRoot":"","sources":["../../../../src/components/login-history/login-history.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,9 @@
1
1
  export interface ILoginHistoryAttr {
2
2
  HistoryId: number;
3
3
  UserId: number;
4
+ User?: {
5
+ UserName: string;
6
+ };
4
7
  OriginIp: string;
5
8
  SystemCode: string;
6
9
  LoginStatus: string;