@tomei/sso 0.66.1-test.3 → 0.66.1-test.4

package/package.json

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

package/src/components/login-user/interfaces/user-info.interface.ts

@@ -9,6 +9,7 @@ export interface IUserInfo {
   ContactNo: string;
   UserName: string;
   UserId?: number;
+  V1Id?: number;
   Password: string;
   staffs?: any;
 }

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

@@ -40,6 +40,7 @@ import { UserPasswordHistory } from '../user-password-history/user-password-hist
 
 export class User extends UserBase {
   ObjectId: string;
+  V1Id: number;
   Email: string;
   private _UserName: string;
   private _Password: string;
@@ -291,6 +292,7 @@ export class User extends UserBase {
     // set all the class properties
     if (userInfo) {
       this.UserId = userInfo.UserId;
+      this.V1Id = userInfo.V1Id;
       this.UserName = userInfo.UserName;
       this.FullName = userInfo.FullName;
       this.IDNo = userInfo.IDNo;
@@ -3071,6 +3073,11 @@ export class User extends UserBase {
         return { expired: false, expiringSoon: false, expiresInDays: null };
       }
 
+      // Accounts authenticated without a local password cannot rotate one here.
+      if (!this.Password) {
+        return { expired: false, expiringSoon: false, expiresInDays: null };
+      }
+
       // Forces first-login change for temp-password/admin-created accounts (AC#4), regardless of password age.
       if (this.NeedToChangePasswordYN === YN.Yes) {
         return { expired: true, expiringSoon: false, expiresInDays: null };
@@ -3092,14 +3099,19 @@ export class User extends UserBase {
       }
 
       const createdAt = latestHistory.CreatedAt;
+      const expiryMonth = createdAt.getUTCMonth() + expiryMonths;
+      const lastDayOfExpiryMonth = new Date(
+        Date.UTC(createdAt.getUTCFullYear(), expiryMonth + 1, 0),
+      ).getUTCDate();
       const expiryDate = new Date(
         Date.UTC(
           createdAt.getUTCFullYear(),
-          createdAt.getUTCMonth() + expiryMonths,
-          createdAt.getUTCDate(),
+          expiryMonth,
+          Math.min(createdAt.getUTCDate(), lastDayOfExpiryMonth),
           createdAt.getUTCHours(),
           createdAt.getUTCMinutes(),
           createdAt.getUTCSeconds(),
+          createdAt.getUTCMilliseconds(),
         ),
       );
 

package/src/components/system/system.ts

@@ -10,6 +10,7 @@ import { v4 as uuidv4 } from 'uuid';
 
 export class System extends ObjectBase {
   ObjectId: string;
+  V1Id: number;
   ObjectName: string;
   TableName = 'sso_System';
   ObjectType = 'System';
@@ -49,6 +50,7 @@ export class System extends ObjectBase {
   private constructor(systemAttr?: ISystemAttr) {
     super();
     if (systemAttr) {
+      this.V1Id = systemAttr.V1Id;
       this.SystemCode = systemAttr.SystemCode;
       this.Name = systemAttr.Name;
       this.Description = systemAttr?.Description;

package/src/components/system-privilege/system-privilege.ts

@@ -13,6 +13,7 @@ export class SystemPrivilege extends ObjectBase {
   ObjectType = 'SystemPrivilege';
   TableName = 'sso_SystemPrivilege';
   ObjectId: string;
+  V1Id: string;
   PrivilegeCode: string;
   SystemCode: string;
   ObjectName: string;
@@ -53,6 +54,7 @@ export class SystemPrivilege extends ObjectBase {
   private constructor(systemPrivilegeAttr?: ISystemPrivilegeAttr) {
     super();
     if (systemPrivilegeAttr) {
+      this.V1Id = systemPrivilegeAttr.V1Id;
       this.SystemPrivilegeId = systemPrivilegeAttr.SystemPrivilegeId;
       this.PrivilegeCode = systemPrivilegeAttr.PrivilegeCode;
       this.SystemCode = systemPrivilegeAttr.SystemCode;
@@ -66,6 +68,7 @@ export class SystemPrivilege extends ObjectBase {
   }
 
   setAttributes(systemPrivilegeAttr: ISystemPrivilegeAttr) {
+    this.V1Id = systemPrivilegeAttr.V1Id;
     this.PrivilegeCode = systemPrivilegeAttr.PrivilegeCode;
     this.SystemPrivilegeId = systemPrivilegeAttr.SystemPrivilegeId;
     this.SystemCode = systemPrivilegeAttr.SystemCode;

package/src/interfaces/system-privilege.interface.ts

@@ -1,4 +1,5 @@
 export interface ISystemPrivilegeAttr {
+  V1Id?: string;
   SystemPrivilegeId: string;
   PrivilegeCode: string;
   SystemCode: string;

package/src/interfaces/system.interface.ts

@@ -1,4 +1,5 @@
 export interface ISystemAttr {
+  V1Id?: number;
   SystemCode: string;
   Name: string;
   Description: string;

package/src/models/group.entity.ts

@@ -24,6 +24,12 @@ import GroupReportingUserModel from './group-reporting-user.entity';
   updatedAt: 'UpdatedAt',
 })
 export default class GroupModel extends Model {
+  @Column({
+    allowNull: true,
+    type: DataType.INTEGER,
+  })
+  V1Id: number;
+
   @Column({
     primaryKey: true,
     allowNull: false,
@@ -74,7 +80,7 @@ export default class GroupModel extends Model {
 
   @Column({
     allowNull: false,
-    type: DataType.STRING(10),
+    type: DataType.STRING(100),
   })
   Path: string;
 

package/src/models/system-privilege.entity.ts

@@ -76,6 +76,12 @@ export default class SystemPrivilegeModel extends Model {
   @UpdatedAt
   UpdatedAt: Date;
 
+  @Column({
+    allowNull: true,
+    type: DataType.STRING(30),
+  })
+  V1Id: string;
+
   @BelongsTo(() => System)
   System: System;
 

package/src/models/system.entity.ts

@@ -96,6 +96,12 @@ export default class SystemModel extends Model {
   @UpdatedAt
   UpdatedAt: Date;
 
+  @Column({
+    allowNull: true,
+    type: DataType.INTEGER,
+  })
+  V1Id: number;
+
   @BelongsTo(() => User, 'CreatedById')
   CreatedByUser: User;
 

package/src/models/user.entity.ts

@@ -171,6 +171,12 @@ export default class User extends Model {
   @UpdatedAt
   UpdatedAt: Date;
 
+  @Column({
+    allowNull: true,
+    type: DataType.INTEGER,
+  })
+  V1Id: number;
+
   @HasOne(() => Staff, 'UserId')
   Staff: Staff;