@tomei/sso 0.8.8 → 0.8.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomei/sso",
-  "version": "0.8.8",
+  "version": "0.8.9",
   "description": "Tomei SSO Package",
   "main": "dist/index.js",
   "scripts": {
@@ -58,7 +58,7 @@
   },
   "peerDependencies": {
     "@prisma/client": "^4.14.1",
-    "@tomei/general": "^0.3.0",
+    "@tomei/general": "^0.4.0",
     "@types/jest": "^29.5.2",
     "argon2": "^0.30.3",
     "cls-hooked": "^4.2.2",
@@ -73,7 +73,7 @@
     ]
   },
   "dependencies": {
-    "@tomei/mailer": "^0.1.3",
+    "@tomei/mailer": "^0.5.2",
     "reflect-metadata": "^0.1.13",
     "sequelize": "^6.32.1",
     "sequelize-typescript": "^2.1.5"

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

@@ -11,7 +11,7 @@ import { PasswordHashService } from '../password-hash/password-hash.service';
 import { SessionService } from '../../session/session.service';
 import { UserGroupRepository } from '../user-group/user-group.repository';
 import * as nodemailer from 'nodemailer';
-import { Mailer } from '@tomei/mailer';
+import { SMTPMailer } from '@tomei/mailer';
 import { ISystemLogin } from '../../../src/interfaces/system-login.interface';
 import Staff from '../../models/staff.entity';
 import SystemPrivilege from '../../models/system-privilege.entity';
@@ -19,7 +19,7 @@ import LoginHistory from '../../models/login-history.entity';
 import GroupSystemPrivilege from '../../models/group-system-privilege.entity';
 import GroupRolePrivilege from '../../models/group-role-privilege.entity';
 import UserGroup from '../../models/user-group.entity';
-import UserSystemPrivileges from '../../models/user-system-privileges.entity';
+
 export class LoginUser extends ObjectBase implements IPerson {
   FullName: string;
   IDNo: string;
@@ -100,12 +100,6 @@ export class LoginUser extends ObjectBase implements IPerson {
           {
             model: Staff,
           },
-          // {
-          //   model: SystemPrivilege,
-          //   Include: {
-          //     model: SystemPrivilege,
-          //   },
-          // },
         ],
       });
 
@@ -136,8 +130,37 @@ export class LoginUser extends ObjectBase implements IPerson {
   ): Promise<string> {
     try {
       //validate email
-      if (this.Email !== email) {
+      if (this.ObjectId && this.Email !== email) {
         throw new Error('Invalid credentials.');
+      } else {
+        const user = await LoginUser._Repository.findOne({
+          where: {
+            Email: email,
+          },
+          include: [
+            {
+              model: Staff,
+            },
+          ],
+        });
+
+        const userInfo: IUserInfo = {
+          ObjectId: user.id.toString(),
+          FullName: user.Staff.FullName,
+          IDNo: user.Staff.IdNo,
+          ContactNo: user.Staff.Mobile,
+          Email: user.Staff.Email,
+          Password: user.Password,
+          staffs: user.Staff,
+        };
+
+        this.ObjectId = userInfo.ObjectId;
+        this.FullName = userInfo.FullName;
+        this.IDNo = userInfo.IDNo;
+        this.Email = userInfo.Email;
+        this.ContactNo = userInfo.ContactNo;
+        this.Password = userInfo.Password;
+        this.staffs = userInfo.staffs;
       }
 
       //validate password
@@ -252,23 +275,12 @@ export class LoginUser extends ObjectBase implements IPerson {
       }
 
       if (gotPreviousLogins && !ipFound) {
-        const SMTP_HOST = process.env.SMTP_HOST || '';
-        const SMTP_PORT = process.env.SMTP_PORT || '';
-        const EMAIL_SENDER = process.env.EMAIL_SENDER || '';
-        const EMAIL_PASSWORD = process.env.EMAIL_PASSWORD || '';
-
-        const mailer = new Mailer(nodemailer, {
-          host: SMTP_HOST,
-          port: Number(SMTP_PORT),
-          secure: Number(SMTP_PORT) === 465,
-          auth: {
-            user: EMAIL_SENDER,
-            pass: EMAIL_PASSWORD,
-          },
-        });
+        const EMAIL_SENDER =
+          process.env.EMAIL_SENDER || 'itd-system@tomei.com.my';
+        const transporter = new SMTPMailer();
 
-        await mailer.sendMail({
-          from: process.env.EMAIL_SENDER,
+        await transporter.sendMail({
+          from: EMAIL_SENDER,
           to: this.Email,
           subject: 'New Login Alert',
           html: `<p>Dear ${this.FullName},</p>