@tomei/sso 0.34.8 → 0.34.10

package/migrations/20240314080602-create-user-table.js

@@ -25,7 +25,7 @@ module.exports = {
       },
       FullName: {
         type: Sequelize.STRING(200),
-        allowNull: false,
+        allowNull: true,
       },
       IdNo: {
         type: Sequelize.STRING(50),

package/package.json

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

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

@@ -1020,8 +1020,7 @@ export class User extends UserBase {
       }
       //If Params.IdNo is not null, then Params.IdType is required and vice versa.
       if (IdType && IdNo) {
-        where[Op.or]['IdType'] = IdType;
-        where[Op.or]['IdNo'] = IdNo;
+        where[Op.and] = [{ IdType: IdType }, { IdNo: IdNo }];
       }
       if (ContactNo) {
         where[Op.or]['ContactNo'] = ContactNo;
@@ -1345,6 +1344,9 @@ export class User extends UserBase {
         {
           Email: userInfo.Email,
           UserName: userInfo.UserName,
+          FullName: userInfo.FullName,
+          IdNo: userInfo.IDNo,
+          IdType: userInfo.IDType,
           Password: userInfo.Password,
           Status: userInfo.Status,
           DefaultPasswordChangedYN: userInfo.DefaultPasswordChangedYN,

package/src/models/staff.entity.ts

@@ -32,18 +32,6 @@ export default class Staff extends Model {
   })
   UserId: number;
 
-  @Column({
-    allowNull: false,
-    type: DataType.STRING(200),
-  })
-  FullName: string;
-
-  @Column({
-    allowNull: false,
-    type: DataType.STRING(200),
-  })
-  PreferredName: string;
-
   @Column({
     allowNull: true,
     type: DataType.STRING(20),
@@ -68,12 +56,6 @@ export default class Staff extends Model {
   })
   CarPlate: string;
 
-  @Column({
-    allowNull: true,
-    type: DataType.STRING(20),
-  })
-  Mobile: string;
-
   @Column({
     allowNull: true,
     type: DataType.INTEGER,

package/src/models/user.entity.ts

@@ -53,25 +53,25 @@ export default class User extends Model {
   Password: string;
 
   @Column({
-    allowNull: false,
+    allowNull: true,
     type: DataType.STRING,
   })
   FullName: string;
 
   @Column({
-    allowNull: false,
+    allowNull: true,
     type: DataType.STRING,
   })
   IdNo: string;
 
   @Column({
-    allowNull: false,
+    allowNull: true,
     type: DataType.STRING,
   })
   IdType: string;
 
   @Column({
-    allowNull: false,
+    allowNull: true,
     type: DataType.STRING,
   })
   ContactNo: string;