@tomei/sso 0.9.2 → 0.11.3

package/package.json

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

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

@@ -101,6 +101,10 @@ export class LoginUser extends LoginUserBase {
         ],
       });
 
+      if (!user) {
+        throw new Error('Invalid credentials.');
+      }
+
       if (user) {
         const userInfo: IUserInfo = {
           ObjectId: user.id.toString(),
@@ -221,15 +225,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 +265,8 @@ export class LoginUser extends LoginUserBase {
     try {
       const userLogins = await LoginUser._LoginHistoryRepository.findAll({
         where: {
-          userId: userId,
-          systemId: systemId,
+          UserId: userId,
+          SystemId: systemId,
         },
       });
 

package/src/redis-client/redis.service.ts

@@ -4,23 +4,27 @@ export class RedisService {
 
   private constructor() {}
 
-  static async init(): Promise<RedisService> {
-    if (!RedisService.client) {
-      // Create a new Redis client
-      RedisService.client = createClient({
-        url: process.env.REDIS_URL,
-        password: process.env.REDIS_PASSWORD,
-      });
+  static async init(client?: any): Promise<RedisService> {
+    if (!client) {
+      if (!RedisService.client) {
+        // Create a new Redis client
+        RedisService.client = createClient({
+          url: process.env.REDIS_URL,
+          password: process.env.REDIS_PASSWORD,
+        });
 
-      RedisService.client.on('error', (error) => {
-        console.error('Redis error:', error);
-      });
-      RedisService.client.on('connect', () => console.log('Redis connected'));
-      RedisService.client.on('reconnecting', () =>
-        console.log('Redis reconnecting'),
-      );
+        RedisService.client.on('error', (error) => {
+          console.error('Redis error:', error);
+        });
+        RedisService.client.on('connect', () => console.log('Redis connected'));
+        RedisService.client.on('reconnecting', () =>
+          console.log('Redis reconnecting'),
+        );
 
-      await RedisService.client.connect();
+        await RedisService.client.connect();
+      }
+    } else {
+      RedisService.client = client;
     }
     return new RedisService();
   }

package/src/session/session.service.ts

@@ -7,9 +7,9 @@ export class SessionService implements ISessionService {
 
   private constructor() {}
 
-  static async init(): Promise<SessionService> {
+  static async init(redisClient?: any): Promise<SessionService> {
     const sessionService = new SessionService();
-    SessionService._RedisService = await RedisService.init();
+    SessionService._RedisService = await RedisService.init(redisClient);
     return sessionService;
   }