@tomei/sso 0.32.5 → 0.33.0

package/src/components/group/group.ts

@@ -10,6 +10,7 @@ import { ActionEnum, Activity } from '@tomei/activity-history';
 import { GroupSystemAccessRepository } from '../group-system-access/group-system-access.repository';
 import SystemModel from '../../models/system.entity';
 import { GroupSystemAccess } from '../group-system-access';
+import { RedisService } from 'redis-client';
 
 export class Group extends ObjectBase {
   ObjectId: string;
@@ -30,8 +31,8 @@ export class Group extends ObjectBase {
   private _UpdatedById: number;
   private _UpdatedAt: Date;
   private static _Repo = new GroupRepository();
-  private static _SystemAccessRepo = new GroupSystemAccessRepository();
-
+  private static _GroupSystemAccessRepo = new GroupSystemAccessRepository();
+  private static _RedisService: RedisService;
   get GroupCode(): string {
     return this.ObjectId;
   }
@@ -76,6 +77,7 @@ export class Group extends ObjectBase {
 
   public static async init(dbTransaction: any, GroupCode?: string) {
     try {
+      Group._RedisService = await RedisService.init();
       if (GroupCode) {
         const group = await Group._Repo.findByPk(GroupCode, {
           transaction: dbTransaction,
@@ -507,7 +509,7 @@ export class Group extends ObjectBase {
         };
       }
 
-      const systemAccess = await Group._SystemAccessRepo.findAndCountAll();
+      const systemAccess = await Group._GroupSystemAccessRepo.findAndCountAll();
       return systemAccess;
     } catch (error) {
       return error;
@@ -530,7 +532,7 @@ export class Group extends ObjectBase {
       ],
       transaction: dbTransaction,
     };
-    let systemAccess = await Group._SystemAccessRepo.findAll(options);
+    let systemAccess = await Group._GroupSystemAccessRepo.findAll(options);
 
     if (group.InheritParentSystemAccessYN === 'Y') {
       const parentGroup = await Group.init(
@@ -610,7 +612,7 @@ export class Group extends ObjectBase {
     try {
       if (SystemCodes.length > 0) {
         for (let i = 0; i < SystemCodes.length; i++) {
-          const CurrentGroupSystemAccess = Group.getSystemAccesses(
+          const CurrentGroupSystemAccess = await Group.getSystemAccesses(
             loginUser,
             dbTransaction,
             GroupCode,
@@ -648,7 +650,7 @@ export class Group extends ObjectBase {
             UpdatedAt: groupSystemAccess.UpdatedAt,
           };
 
-          const systemAccess = await Group._SystemAccessRepo.create(
+          const systemAccess = await Group._GroupSystemAccessRepo.create(
             EntityValueAfter,
             {
               transaction: dbTransaction,
@@ -673,4 +675,77 @@ export class Group extends ObjectBase {
       throw error;
     }
   }
+
+  public static async deleteSystemAccess(
+    loginUser: LoginUser,
+    dbTransaction: any,
+    GroupCode: string,
+    SystemCode: string,
+  ) {
+    // Part 1: Privilege Checking
+    const systemCode = ApplicationConfig.getComponentConfigValue('system-code');
+    const isPrivileged = await loginUser.checkPrivileges(
+      systemCode,
+      'SYSTEM_ACCESS_DELETE',
+    );
+
+    if (!isPrivileged) {
+      throw new ClassError(
+        'Group',
+        'GroupErrMsg08',
+        'You do not have the privilege to delete system access',
+      );
+    }
+
+    try {
+      const currentGroupSystemAccess = await Group.getSystemAccesses(
+        loginUser,
+        dbTransaction,
+        GroupCode,
+        1,
+        Number.MAX_SAFE_INTEGER,
+        { SystemCode: SystemCode },
+      );
+
+      if (!currentGroupSystemAccess) {
+        throw new ClassError(
+          'Group',
+          'GroupErrMsg10',
+          'No associated system access found.',
+        );
+      }
+
+      await Group._GroupSystemAccessRepo.delete(
+        GroupCode,
+        SystemCode,
+        dbTransaction,
+      );
+
+      const EntityValueBefore = {
+        GroupCode: currentGroupSystemAccess.GroupCode,
+        SystemCode: currentGroupSystemAccess.SystemCode,
+        Status: currentGroupSystemAccess.Status,
+        CreatedById: currentGroupSystemAccess.CreatedById,
+        CreatedAt: currentGroupSystemAccess.CreatedAt,
+        UpdatedById: currentGroupSystemAccess.UpdatedById,
+        UpdatedAt: currentGroupSystemAccess.UpdatedAt,
+      };
+
+      const activity = new Activity();
+      activity.ActivityId = activity.createId();
+      activity.Action = ActionEnum.DELETE;
+      activity.Description = 'Delete Group System Access';
+      activity.EntityType = 'GroupSystemAccess';
+      activity.EntityId =
+        currentGroupSystemAccess.GroupSystemAccessId?.toString();
+      activity.EntityValueBefore = JSON.stringify(EntityValueBefore);
+      activity.EntityValueAfter = JSON.stringify({});
+
+      await activity.create(loginUser.ObjectId, dbTransaction);
+
+      return { Message: 'System access removed.', SystemCode: SystemCode };
+    } catch (error) {
+      throw error;
+    }
+  }
 }

package/src/components/group-system-access/group-system-access.repository.ts

@@ -26,4 +26,19 @@ export class GroupSystemAccessRepository
       );
     }
   }
+
+  async delete(GroupCode: string, SystemCode: string, dbTransaction?: any) {
+    try {
+      const options = {
+        where: {
+          GroupCode: GroupCode,
+          SystemCode: SystemCode,
+        },
+        transaction: dbTransaction,
+      };
+      await GroupSystemAccessModel.destroy(options);
+    } catch (error) {
+      throw new Error(`An Error occured when delete : ${error.message}`);
+    }
+  }
 }

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

@@ -31,6 +31,7 @@ import GroupPrivilegeModel from '../../models/group-privilege.entity';
 import { GroupObjectPrivilegeRepository } from '../group-object-privilege/group-object-privilege.repository';
 import * as speakeasy from 'speakeasy';
 import { LoginStatusEnum } from '../../enum/login-status.enum';
+import { RedisService } from '../../redis-client/redis.service';
 
 export class LoginUser extends LoginUserBase {
   ObjectId: string;
@@ -59,6 +60,7 @@ export class LoginUser extends LoginUserBase {
 
   private _OriginIP: string;
   private _SessionService: ISessionService;
+  private static _RedisService: RedisService;
   private static _Repository = new UserRepository();
 
   private static _LoginHistoryRepository = new LoginHistoryRepository();
@@ -285,6 +287,7 @@ export class LoginUser extends LoginUserBase {
     userId?: number,
     dbTransaction = null,
   ): Promise<LoginUser> {
+    LoginUser._RedisService = await RedisService.init();
     if (userId) {
       if (dbTransaction) {
         LoginUser._Repository = new UserRepository();

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

@@ -8,9 +8,16 @@ export class RedisService {
     if (!client) {
       if (!RedisService.client) {
         // Create a new Redis client
-        RedisService.client = createClient({
-          url: process.env.REDIS_URL,
-          password: process.env.REDIS_PASSWORD,
+        const host = process.env.REDIS_HOST;
+        const password = process.env.REDIS_PASS;
+        const port = process.env.REDIS_PORT;
+        const isProduction = process.env.REDIS_HOST.includes('windows.net');
+        const redis = isProduction ? 'rediss' : 'redis';
+        const pass = password ? `:${password}@` : '';
+        console.log(`${redis}://${pass}${host}:${port}`);
+        RedisService.client = client = createClient({
+          url: `${redis}://${pass}${host}:${port}`,
+          password: password,
         });
 
         RedisService.client.on('error', (error) => {
@@ -49,4 +56,12 @@ export class RedisService {
       throw error;
     }
   }
+
+  public async close(): Promise<void> {
+    try {
+      await RedisService.client.disconnect();
+    } catch (error) {
+      throw error;
+    }
+  }
 }

package/tsconfig.build.json

@@ -1,6 +1,6 @@
-{
-  "extends": "./tsconfig.json",
-  "include": ["**/*.ts"],
-  "exclude": ["node_modules", "__tests__", "dist", "**/*spec.ts"]
-}
+{
+  "extends": "./tsconfig.json",
+  "include": ["**/*.ts"],
+  "exclude": ["node_modules", "__tests__", "dist", "**/*spec.ts"]
+}
   

package/tsconfig.json

@@ -1,23 +1,23 @@
-{
-  "compilerOptions": {
-    "module": "commonjs",
-    "declaration": true,
-    "removeComments": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "allowSyntheticDefaultImports": true,
-    "moduleResolution": "node",
-    "target": "es6",
-    "sourceMap": true,
-    "outDir": "./dist",
-    "baseUrl": "./src",
-    "rootDir": "./",
-    "incremental": true,
-    "skipLibCheck": true,
-    "noImplicitAny": false,
-    "strictBindCallApply": false,
-    "forceConsistentCasingInFileNames": false,
-    "noFallthroughCasesInSwitch": false,
-    "strictNullChecks": false,
-  },
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "declaration": true,
+    "removeComments": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true,
+    "moduleResolution": "node",
+    "target": "es6",
+    "sourceMap": true,
+    "outDir": "./dist",
+    "baseUrl": "./src",
+    "rootDir": "./",
+    "incremental": true,
+    "skipLibCheck": true,
+    "noImplicitAny": false,
+    "strictBindCallApply": false,
+    "forceConsistentCasingInFileNames": false,
+    "noFallthroughCasesInSwitch": false,
+    "strictNullChecks": false,
+  },
 }