Merge pull request #7681 from ever-co/fix/seeder-module

[Fix] Seeder Module (Cache Module)
ever-co · Mar 18, 2024 · 1da4182 · 1da4182
2 parents d6d8dcd + bbb6d80
commit 1da4182
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/packages/core/src/role-permission/role-permission.module.ts b/packages/core/src/role-permission/role-permission.module.ts
@@ -2,6 +2,7 @@ import { forwardRef, Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { CqrsModule } from '@nestjs/cqrs';
 import { RouterModule } from '@nestjs/core';
+import { CacheModule } from '@nestjs/cache-manager';
 import { MikroOrmModule } from '@mikro-orm/nestjs';
 import { RolePermissionController } from './role-permission.controller';
 import { RolePermission } from './role-permission.entity';
@@ -17,10 +18,11 @@ import { TypeOrmRolePermissionRepository } from './repository';
 		forwardRef(() => TypeOrmModule.forFeature([RolePermission])),
 		forwardRef(() => MikroOrmModule.forFeature([RolePermission])),
 		forwardRef(() => RoleModule),
-		CqrsModule
+		CqrsModule,
+		CacheModule.register({ isGlobal: true })
 	],
 	controllers: [RolePermissionController],
 	providers: [RolePermissionService, TypeOrmRolePermissionRepository],
-	exports: [TypeOrmModule, MikroOrmModule, RolePermissionService, TypeOrmRolePermissionRepository]
+	exports: [TypeOrmModule, MikroOrmModule, CacheModule, RolePermissionService, TypeOrmRolePermissionRepository]
 })
 export class RolePermissionModule { }
diff --git a/packages/core/src/shared/guards/permission.guard.ts b/packages/core/src/shared/guards/permission.guard.ts
@@ -1,21 +1,21 @@
-import { environment as env } from '@gauzy/config';
 import { CanActivate, ExecutionContext, Inject, Injectable, Type } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
+import { CACHE_MANAGER } from '@nestjs/cache-manager';
+import { Cache } from 'cache-manager';
 import { verify } from 'jsonwebtoken';
+import { environment as env } from '@gauzy/config';
 import { isEmpty, PERMISSIONS_METADATA, removeDuplicates } from '@gauzy/common';
 import { PermissionsEnum } from '@gauzy/contracts';
 import { RequestContext } from './../../core/context';
 import { RolePermissionService } from '../../role-permission/role-permission.service';
-import { Cache } from 'cache-manager';
-import { CACHE_MANAGER } from '@nestjs/cache-manager';
 
 @Injectable()
 export class PermissionGuard implements CanActivate {
 	constructor(
 		@Inject(CACHE_MANAGER) private cacheManager: Cache,
 		private readonly _reflector: Reflector,
 		private readonly _rolePermissionService: RolePermissionService
-	) {}
+	) { }
 
 	/**
 	 * Checks if the user is authorized based on specified permissions.
@@ -25,8 +25,7 @@ export class PermissionGuard implements CanActivate {
 	async canActivate(context: ExecutionContext): Promise<boolean> {
 		// Retrieve permissions from metadata
 		const targets: Array<Function | Type<any>> = [context.getHandler(), context.getClass()];
-		const permissions =
-			removeDuplicates(this._reflector.getAllAndOverride<PermissionsEnum[]>(PERMISSIONS_METADATA, targets)) || [];
+		const permissions = removeDuplicates(this._reflector.getAllAndOverride<PermissionsEnum[]>(PERMISSIONS_METADATA, targets)) || [];
 
 		// If no specific permissions are required, consider it authorized
 		if (isEmpty(permissions)) {

diff --git a/packages/core/src/shared/guards/tenant-permission.guard.ts b/packages/core/src/shared/guards/tenant-permission.guard.ts
@@ -1,13 +1,13 @@
 import { Injectable, CanActivate, ExecutionContext, Type, Inject } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
+import { Cache } from 'cache-manager';
+import { CACHE_MANAGER } from '@nestjs/cache-manager';
 import { PermissionsEnum, RolesEnum } from '@gauzy/contracts';
 import { environment as env } from '@gauzy/config';
 import { isNotEmpty, PERMISSIONS_METADATA, removeDuplicates } from '@gauzy/common';
 import { RequestContext } from './../../core/context';
 import { TenantBaseGuard } from './tenant-base.guard';
 import { RolePermissionService } from '../../role-permission/role-permission.service';
-import { Cache } from 'cache-manager';
-import { CACHE_MANAGER } from '@nestjs/cache-manager';
 
 @Injectable()
 export class TenantPermissionGuard extends TenantBaseGuard implements CanActivate {
@@ -50,8 +50,7 @@ export class TenantPermissionGuard extends TenantBaseGuard implements CanActivat
 		// Retrieve permissions from metadata
 		const targets: Array<Function | Type<any>> = [context.getHandler(), context.getClass()];
 
-		const permissions =
-			removeDuplicates(this._reflector.getAllAndOverride<PermissionsEnum[]>(PERMISSIONS_METADATA, targets)) || [];
+		const permissions = removeDuplicates(this._reflector.getAllAndOverride<PermissionsEnum[]>(PERMISSIONS_METADATA, targets)) || [];
 
 		// Check if permissions are not empty
 		if (isNotEmpty(permissions)) {