@tomei/sso 0.8.10 → 0.8.12

package/jest.config.js

@@ -9,7 +9,6 @@ module.exports = {
     "<rootDir>/dist"
   ],
   setupFilesAfterEnv: [
-    '<rootDir>/src/prisma-client/__mocks__/prisma.ts',
     '<rootDir>/src/redis-client/__mocks__/jest-initial-setup.ts',
   ]   
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomei/sso",
-  "version": "0.8.10",
+  "version": "0.8.12",
   "description": "Tomei SSO Package",
   "main": "dist/index.js",
   "scripts": {
@@ -57,13 +57,13 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@tomei/general": "^0.4.0",
+    "@tomei/general": "^0.4.3",
+    "@tomei/mailer": "^0.5.2",
     "@types/jest": "^29.5.2",
     "argon2": "^0.30.3",
     "cls-hooked": "^4.2.2",
     "nodemailer": "^6.9.3",
     "redis": "^4.6.7",
-    "@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

@@ -1,7 +1,6 @@
-import { ObjectBase, IPerson, IAddress } from '@tomei/general';
+import { IAddress, LoginUserBase } from '@tomei/general';
 import { ISessionService } from '../../session/interfaces/session-service.interface';
 import { IUserInfo } from './interfaces/user-info.interface';
-// import { IPasswordHashService } from '../password-hash/interfaces/password-hash-service.interface';
 import { UserRepository } from './user.repository';
 import { SystemRepository } from '../system/system.repository';
 import { SystemAccessRepository } from '../system-access/system-access.repository';
@@ -10,7 +9,6 @@ import { UserUserGroupRepository } from '../user-user-group/user-user-group.repo
 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 { SMTPMailer } from '@tomei/mailer';
 import { ISystemLogin } from '../../../src/interfaces/system-login.interface';
 import Staff from '../../models/staff.entity';
@@ -20,7 +18,7 @@ import GroupSystemPrivilege from '../../models/group-system-privilege.entity';
 import GroupRolePrivilege from '../../models/group-role-privilege.entity';
 import UserGroup from '../../models/user-group.entity';
 
-export class LoginUser extends ObjectBase implements IPerson {
+export class LoginUser extends LoginUserBase {
   FullName: string;
   IDNo: string;
   IDType: string;
@@ -44,13 +42,13 @@ export class LoginUser extends ObjectBase implements IPerson {
   private static _UserGroupRepository = new UserGroupRepository();
   private _dbTransaction: any;
 
-  getDetails(): {
+  async getDetails(): Promise<{
     FullName: string;
     IDNo: string;
     IDType: string;
     Email: string;
     ContactNo: string;
-  } {
+  }> {
     return {
       FullName: this.FullName,
       IDNo: this.IDNo,
@@ -109,7 +107,7 @@ export class LoginUser extends ObjectBase implements IPerson {
           FullName: user.Staff.FullName,
           IDNo: user.Staff.IdNo,
           ContactNo: user.Staff.Mobile,
-          Email: user.Staff.Email,
+          Email: user.Email,
           Password: user.Password,
           staffs: user.Staff,
         };
@@ -130,9 +128,7 @@ export class LoginUser extends ObjectBase implements IPerson {
   ): Promise<string> {
     try {
       //validate email
-      if (this.ObjectId && this.Email !== email) {
-        throw new Error('Invalid credentials.');
-      } else {
+      if (!this.ObjectId) {
         const user = await LoginUser._Repository.findOne({
           where: {
             Email: email,
@@ -163,6 +159,10 @@ export class LoginUser extends ObjectBase implements IPerson {
         this.staffs = userInfo.staffs;
       }
 
+      if (this.ObjectId && this.Email !== email) {
+        throw new Error('Invalid credentials.');
+      }
+
       //validate password
       const isPasswordValid = await this._PasswordHashService.verify(
         password,

package/__tests__/unit/components/login-history/login-history.repository.spec.ts

@@ -1,95 +0,0 @@
-// import { LoginHistory } from '@prisma/client';
-// import { LoginHistoryRepository } from '../../../../src/components/login-history/login-history.repository';
-// import { prismaMock } from '../../../../src/prisma-client/__mocks__/prisma';
-
-// describe('login-history.repository', () => {
-//   afterEach(() => {
-//     jest.restoreAllMocks()
-//   })
-//   describe('findAll', () => {
-//     it('should return list of login history', async () => {
-//       const data = [{
-//         userId: 1,
-//         systemId: 1,
-//         originIp: '1.1.1.1',
-//         createdAt: new Date(),
-//       }]
-//       prismaMock.loginHistory.findMany.mockResolvedValueOnce(data as LoginHistory[]) 
-//       const loginHistoryRepository = new LoginHistoryRepository()
-//       expect(await loginHistoryRepository.findAll({})).toEqual(data)
-//     })
-//   })
-
-//   describe('findOne', () => {
-//     it('should return login history', async () => {
-//       const data = {
-//         userId: 1,
-//         systemId: 1,
-//         originIp: '1.1.1.1',
-//         createdAt: new Date(),
-//       }
-//       prismaMock.loginHistory.findFirst.mockResolvedValueOnce(data as LoginHistory)
-//       const loginHistoryRepository = new LoginHistoryRepository()
-//       expect(await loginHistoryRepository.findOne({
-//         where: {
-//           userId_systemId: {
-//             userId: data.userId,
-//             systemId: data.systemId,
-//           },
-//         },
-//       })).toEqual(data)
-//     })
-//   })
-
-//   describe('create', () => {
-//     it('should create login history', async () => {
-//       const data = {
-//         userId: 1,
-//         systemId: 1,
-//         originIp: '1.1.1.1',
-//         createdAt: new Date(),
-//       }
-//       prismaMock.loginHistory.create.mockResolvedValueOnce(data as LoginHistory)
-//       const loginHistoryRepository = new LoginHistoryRepository()
-//       expect(await loginHistoryRepository.create({data})).toEqual(data)
-//     })
-//   })
-
-//   describe('update', () => {
-//     it('should update login history', async () => {
-//       const data = {
-//         userId: 1,
-//         systemId: 1,
-//         originIp: '1.1.1.1',
-//         createdAt: new Date(),
-//       }
-//       prismaMock.loginHistory.update.mockResolvedValueOnce(data as LoginHistory)
-//       const loginHistoryRepository = new LoginHistoryRepository()
-//       expect(await loginHistoryRepository.update({
-//         where: {
-//           userId: data.userId
-//       }, data: data
-//       }, data)).toEqual(data)
-//     })
-//   })
-
-//   describe('delete', () => {
-//     it('should delete login history', async () => {
-//       const data = {
-//         userId: 1,
-//         systemId: 1,
-//         originIp: '1.1.1.1',
-//         createdAt: new Date(),
-//       }
-//       prismaMock.loginHistory.delete.mockResolvedValueOnce(data as LoginHistory)
-//       const loginHistoryRepository = new LoginHistoryRepository()
-//       expect(await loginHistoryRepository.delete({
-//         where: {
-//           userId: data.userId
-//         }
-//       })).toEqual(data)
-//     })
-//   })
-
-// })
-

package/__tests__/unit/components/login-user/user.repository.spec.ts

@@ -1,81 +0,0 @@
-// import { UserRepository } from '../../../../src/components/login-user/user.repository';
-// import { prismaMock } from '../../../../src/prisma-client/__mocks__/prisma';
-
-// describe('system-access.repository', () => {
-//   const data = {
-//     id: 1,
-//     email: 'test@test.email.com',
-//     password: '@H34f5yRE',
-//     status: 'Active',
-//     defaultPasswordChanged: false,
-//     firstLoginAt: new Date(),
-//     createdAt: new Date(),
-//     updatedAt: new Date(),
-//     groupCode: 'RDAS',
-//   };
-
-//   afterEach(() => {
-//     jest.restoreAllMocks();
-//   });
-//   describe('findAll', () => {
-//     it('should return list of user', async () => {
-//       prismaMock.user.findMany.mockResolvedValueOnce([data]);
-//       const userRepository = new UserRepository();
-//       expect(await userRepository.findAll({})).toEqual([data]);
-//     });
-//   });
-
-//   describe('findOne', () => {
-//     it('should return user', async () => {
-//       prismaMock.user.findFirst.mockResolvedValueOnce(data);
-//       const userRepository = new UserRepository();
-//       expect(
-//         await userRepository.findOne({
-//           where: {
-//             id: data.id,
-//           },
-//         }),
-//       ).toEqual(data);
-//     });
-//   });
-
-//   describe('create', () => {
-//     it('should create user', async () => {
-//       prismaMock.user.create.mockResolvedValueOnce(data);
-//       const userRepository = new UserRepository();
-//       expect(await userRepository.create(data)).toEqual(data);
-//     });
-//   });
-
-//   describe('update', () => {
-//     it('should update user', async () => {
-//       prismaMock.user.update.mockResolvedValueOnce(data);
-//       const userRepository = new UserRepository();
-//       expect(
-//         await userRepository.update(
-//           {
-//             where: {
-//               id: data.id,
-//             },
-//             data: data,
-//           },
-//           data,
-//         ),
-//       ).toEqual(data);
-//     });
-//   });
-
-//   describe('delete', () => {
-//     it('should delete user', async () => {
-//       prismaMock.user.delete.mockResolvedValueOnce(data);
-//       const userRepository = new UserRepository();
-//       expect(
-//         await userRepository.delete({
-//           where: {
-//             id: data.id,
-//           },
-//         }),
-//       ).toEqual(data);
-//     });
-//   });
-// });

package/__tests__/unit/components/system/system.repository.spec.ts

@@ -1,88 +0,0 @@
-// import { SystemRepository } from '../../../../src/components/system/system.repository';
-// import { prismaMock } from '../../../../src/prisma-client/__mocks__/prisma';
-
-// describe('system.repository', () => {
-//   const data = {
-//     id: 175,
-//     code: 'EZC',
-//     name: 'EzCash',
-//     description: 'Tomei Money Lending System',
-//     accessUrl: 'https://app.ezcash.com.my:22443/staff/login',
-//     googlePlayUrl: '',
-//     appleStoreUrl: '',
-//     apiKey: 'f3fef257jt',
-//     logo: 'https://sso-api.tomei.com.my/upload/2023/01/10/FJ3DoHdRZKjf2bGkgA4E-BrowserIcon.png',
-//     status: 'active',
-//     visible: true,
-//     createdAt: new Date(),
-//     updatedAt: new Date(),
-//     apiSecret: '12345',
-//     updatedById: 61,
-//     createdById: 100,
-//   };
-
-//   afterEach(() => {
-//     jest.restoreAllMocks();
-//   });
-//   describe('findAll', () => {
-//     it('should return list of system', async () => {
-//       prismaMock.system.findMany.mockResolvedValueOnce([data]);
-//       const systemRepository = new SystemRepository();
-//       expect(await systemRepository.findAll({})).toEqual([data]);
-//     });
-//   });
-
-//   describe('findOne', () => {
-//     it('should return system', async () => {
-//       prismaMock.system.findFirst.mockResolvedValueOnce(data);
-//       const systemRepository = new SystemRepository();
-//       expect(
-//         await systemRepository.findOne({
-//           where: {
-//             id: data.id,
-//           },
-//         }),
-//       ).toEqual(data);
-//     });
-//   });
-
-//   describe('create', () => {
-//     it('should create system', async () => {
-//       prismaMock.system.create.mockResolvedValueOnce(data);
-//       const systemRepository = new SystemRepository();
-//       expect(await systemRepository.create(data)).toEqual(data);
-//     });
-//   });
-
-//   describe('update', () => {
-//     it('should update system', async () => {
-//       prismaMock.system.update.mockResolvedValueOnce(data);
-//       const systemRepository = new SystemRepository();
-//       expect(
-//         await systemRepository.update(
-//           {
-//             where: {
-//               id: data.id,
-//             },
-//             data: data,
-//           },
-//           data,
-//         ),
-//       ).toEqual(data);
-//     });
-//   });
-
-//   describe('delete', () => {
-//     it('should delete system', async () => {
-//       prismaMock.system.delete.mockResolvedValueOnce(data);
-//       const systemRepository = new SystemRepository();
-//       expect(
-//         await systemRepository.delete({
-//           where: {
-//             id: data.id,
-//           },
-//         }),
-//       ).toEqual(data);
-//     });
-//   });
-// });

package/__tests__/unit/components/system-access/system-access.repository.spec.ts

@@ -1,78 +0,0 @@
-// import { SystemAccessRepository } from '../../../../src/components/system-access/system-access.repository';
-// import { prismaMock } from '../../../../src/prisma-client/__mocks__/prisma';
-
-// describe('system-access.repository', () => {
-//   const data = {
-//     userId: 1,
-//     systemId: 175,
-//     updatedAt: new Date(),
-//   };
-
-//   afterEach(() => {
-//     jest.restoreAllMocks();
-//   });
-//   describe('findAll', () => {
-//     it('should return list of system access', async () => {
-//       prismaMock.systemAccess.findMany.mockResolvedValueOnce([data]);
-//       const systemAccessRepository = new SystemAccessRepository();
-//       expect(await systemAccessRepository.findAll({})).toEqual([data]);
-//     });
-//   });
-
-//   describe('findOne', () => {
-//     it('should return system access', async () => {
-//       prismaMock.systemAccess.findFirst.mockResolvedValueOnce(data);
-//       const systemAccessRepository = new SystemAccessRepository();
-//       expect(
-//         await systemAccessRepository.findOne({
-//           where: {
-//             userId: data.userId,
-//             systemId: data.systemId,
-//           },
-//         }),
-//       ).toEqual(data);
-//     });
-//   });
-
-//   describe('create', () => {
-//     it('should create system access', async () => {
-//       prismaMock.systemAccess.create.mockResolvedValueOnce(data);
-//       const systemAccessRepository = new SystemAccessRepository();
-//       expect(await systemAccessRepository.create(data)).toEqual(data);
-//     });
-//   });
-
-//   describe('update', () => {
-//     it('should update system access', async () => {
-//       prismaMock.systemAccess.update.mockResolvedValueOnce(data);
-//       const systemAccessRepository = new SystemAccessRepository();
-//       expect(
-//         await systemAccessRepository.update(
-//           {
-//             where: {
-//               userId: data.userId,
-//               systemId: data.systemId,
-//             },
-//             data: data,
-//           },
-//           data,
-//         ),
-//       ).toEqual(data);
-//     });
-//   });
-
-//   describe('delete', () => {
-//     it('should delete system access', async () => {
-//       prismaMock.systemAccess.delete.mockResolvedValueOnce(data);
-//       const systemAccessRepository = new SystemAccessRepository();
-//       expect(
-//         await systemAccessRepository.delete({
-//           where: {
-//             userId: data.userId,
-//             systemId: data.systemId,
-//           },
-//         }),
-//       ).toEqual(data);
-//     });
-//   });
-// });

package/dist/__tests__/unit/components/login-history/login-history.repository.spec.js

@@ -1 +0,0 @@
-//# sourceMappingURL=login-history.repository.spec.js.map

package/dist/__tests__/unit/components/login-history/login-history.repository.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"login-history.repository.spec.js","sourceRoot":"","sources":["../../../../../__tests__/unit/components/login-history/login-history.repository.spec.ts"],"names":[],"mappings":""}

package/dist/__tests__/unit/components/login-user/user.repository.spec.js

@@ -1 +0,0 @@
-//# sourceMappingURL=user.repository.spec.js.map

package/dist/__tests__/unit/components/login-user/user.repository.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"user.repository.spec.js","sourceRoot":"","sources":["../../../../../__tests__/unit/components/login-user/user.repository.spec.ts"],"names":[],"mappings":""}

package/dist/__tests__/unit/components/system/system.repository.spec.js

@@ -1 +0,0 @@
-//# sourceMappingURL=system.repository.spec.js.map

package/dist/__tests__/unit/components/system/system.repository.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"system.repository.spec.js","sourceRoot":"","sources":["../../../../../__tests__/unit/components/system/system.repository.spec.ts"],"names":[],"mappings":""}

package/dist/__tests__/unit/components/system-access/system-access.repository.spec.js

@@ -1 +0,0 @@
-//# sourceMappingURL=system-access.repository.spec.js.map

package/dist/__tests__/unit/components/system-access/system-access.repository.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"system-access.repository.spec.js","sourceRoot":"","sources":["../../../../../__tests__/unit/components/system-access/system-access.repository.spec.ts"],"names":[],"mappings":""}