@tomei/sso 0.8.8 → 0.8.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomei/sso",
-  "version": "0.8.8",
+  "version": "0.8.10",
   "description": "Tomei SSO Package",
   "main": "dist/index.js",
   "scripts": {
@@ -57,25 +57,21 @@
     "access": "public"
   },
   "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",
     "nodemailer": "^6.9.3",
-    "prismock": "^1.14.0",
-    "redis": "^4.6.7"
+    "redis": "^4.6.7",
+    "@tomei/mailer": "^0.5.2",
+    "reflect-metadata": "^0.1.13",
+    "sequelize": "^6.32.1",
+    "sequelize-typescript": "^2.1.5"
   },
   "lint-staged": {
     "*/**/*.{js,ts,tsx}": [
       "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
       "eslint \"{src,apps,libs,test}/**/*.ts\" --fix"
     ]
-  },
-  "dependencies": {
-    "@tomei/mailer": "^0.1.3",
-    "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>

package/src/index.ts

@@ -2,5 +2,5 @@ require('dotenv').config();
 export * from './components';
 export * from './interfaces';
 export * from './redis-client';
-export * from './prisma-client';
 export * from './session';
+export * as ssoDb from './database';

package/dist/src/prisma-client/__mocks__/prisma.d.ts

@@ -1,3 +0,0 @@
-import { PrismaClient } from '@prisma/client';
-import { DeepMockProxy } from 'jest-mock-extended';
-export declare const prismaMock: DeepMockProxy<PrismaClient<import(".prisma/client").Prisma.PrismaClientOptions, never, import(".prisma/client").Prisma.RejectOnNotFound | import(".prisma/client").Prisma.RejectPerOperation | undefined>>;

package/dist/src/prisma-client/__mocks__/prisma.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.prismaMock = void 0;
-const jest_mock_extended_1 = require("jest-mock-extended");
-const client_1 = require("../client");
-jest.mock('../client', () => ({
-    __esModule: true,
-    default: (0, jest_mock_extended_1.mockDeep)(),
-}));
-beforeEach(() => {
-    (0, jest_mock_extended_1.mockReset)(exports.prismaMock);
-});
-exports.prismaMock = client_1.default;
-//# sourceMappingURL=prisma.js.map

package/dist/src/prisma-client/__mocks__/prisma.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"prisma.js","sourceRoot":"","sources":["../../../../src/prisma-client/__mocks__/prisma.ts"],"names":[],"mappings":";;;AACA,2DAAwE;AAExE,sCAA+B;AAE/B,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC;IAC5B,UAAU,EAAE,IAAI;IAChB,OAAO,EAAE,IAAA,6BAAQ,GAAgB;CAClC,CAAC,CAAC,CAAC;AAEJ,UAAU,CAAC,GAAG,EAAE;IACd,IAAA,8BAAS,EAAC,kBAAU,CAAC,CAAC;AACxB,CAAC,CAAC,CAAC;AAEU,QAAA,UAAU,GAAG,gBAAgD,CAAC"}

package/dist/src/prisma-client/client.d.ts

@@ -1,3 +0,0 @@
-import { PrismaClient } from '@prisma/client';
-declare const prisma: PrismaClient<import(".prisma/client").Prisma.PrismaClientOptions, never, import(".prisma/client").Prisma.RejectOnNotFound | import(".prisma/client").Prisma.RejectPerOperation | undefined>;
-export default prisma;

package/dist/src/prisma-client/client.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const client_1 = require("@prisma/client");
-const prisma = new client_1.PrismaClient();
-exports.default = prisma;
-//# sourceMappingURL=client.js.map

package/dist/src/prisma-client/client.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/prisma-client/client.ts"],"names":[],"mappings":";;AAAA,2CAA8C;AAC9C,MAAM,MAAM,GAAG,IAAI,qBAAY,EAAE,CAAC;AAClC,kBAAe,MAAM,CAAC"}

package/dist/src/prisma-client/index.d.ts

@@ -1 +0,0 @@
-export * from './client';

package/dist/src/prisma-client/index.js

@@ -1,18 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./client"), exports);
-//# sourceMappingURL=index.js.map

package/dist/src/prisma-client/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/prisma-client/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAyB"}