@tomei/sso 0.10.0 → 0.11.4

package/package.json

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

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

@@ -7,7 +7,6 @@ import { SystemAccessRepository } from '../system-access/system-access.repositor
 import { LoginHistoryRepository } from '../login-history/login-history.repository';
 import { UserUserGroupRepository } from '../user-user-group/user-user-group.repository';
 import { PasswordHashService } from '../password-hash/password-hash.service';
-import { SessionService } from '../../session/session.service';
 import { UserGroupRepository } from '../user-group/user-group.repository';
 import { SMTPMailer } from '@tomei/mailer';
 import { ISystemLogin } from '../../../src/interfaces/system-login.interface';
@@ -101,6 +100,10 @@ export class LoginUser extends LoginUserBase {
         ],
       });
 
+      if (!user) {
+        throw new Error('Invalid credentials.');
+      }
+
       if (user) {
         const userInfo: IUserInfo = {
           ObjectId: user.id.toString(),
@@ -221,15 +224,13 @@ export class LoginUser extends LoginUserBase {
 
       // record new login history
       await LoginUser._LoginHistoryRepository.create({
-        data: {
-          userId: this.ObjectId,
-          systemId: system.id,
-          originIp: ipAddress,
-          createdAt: new Date(),
-        },
+        UserId: this.ObjectId,
+        SystemId: system.id,
+        OriginIp: ipAddress,
+        CreatedAt: new Date(),
       });
 
-      return sessionId;
+      return `${this.ObjectId}:${sessionId}`;
     } catch (error) {
       throw error;
     }
@@ -263,8 +264,8 @@ export class LoginUser extends LoginUserBase {
     try {
       const userLogins = await LoginUser._LoginHistoryRepository.findAll({
         where: {
-          userId: userId,
-          systemId: systemId,
+          UserId: userId,
+          SystemId: systemId,
         },
       });
 

package/src/session/session.service.ts

@@ -45,9 +45,8 @@ export class SessionService implements ISessionService {
 
   async refreshDuration(userid: string): Promise<void> {
     try {
-      const key = `tomei-sid:${userid}`;
       const userSession = await this.retrieveUserSession(userid);
-      await this.setUserSession(key, userSession);
+      await this.setUserSession(userid, userSession);
     } catch (error) {
       throw error;
     }