@flusys/nestjs-storage 6.1.2 → 6.1.3

package/cjs/services/file-manager.service.js

@@ -87,8 +87,6 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-const PERMISSION_CACHE_KEY = 'user_action_permission';
-const VIEW_PRIVATE_ACTION = 'storage.file.viewPrivate';
 const URL_EXPIRY_SECONDS = 3600;
 const DEFAULT_SELECT_FIELDS = [
     'id',
@@ -297,9 +295,11 @@ let FileManagerService = class FileManagerService extends _classes.ApiService {
             });
             return;
         }
-        const cacheKey = this.storageConfig.isCompanyFeatureEnabled() ? `${PERMISSION_CACHE_KEY}_${user.id}_${user.companyId}` : `${PERMISSION_CACHE_KEY}_${user.id}`;
-        const actions = await this.cacheManager.get(cacheKey);
-        const canViewPrivate = actions?.some((a)=>a.url === VIEW_PRIVATE_ACTION) ?? false;
+        const canViewPrivate = await this.permissionCacheService.hasPermission({
+            userId: user.id,
+            companyId: user.companyId,
+            branchId: user.branchId
+        }, _classes.FILE_PERMISSIONS.VIEW_PRIVATE_ACTION);
         if (!canViewPrivate) {
             query.andWhere('file_manager.isPrivate = :isPrivate', {
                 isPrivate: false
@@ -360,8 +360,8 @@ let FileManagerService = class FileManagerService extends _classes.ApiService {
             storageConfigId: file.storageConfigId || undefined
         };
     }
-    constructor(cacheManager, utilsService, uploadService, storageConfig, dataSourceProvider){
-        super('file_manager', cacheManager, utilsService, FileManagerService.name, true, 'storage', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "uploadService", void 0), _define_property(this, "storageConfig", void 0), _define_property(this, "dataSourceProvider", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.uploadService = uploadService, this.storageConfig = storageConfig, this.dataSourceProvider = dataSourceProvider;
+    constructor(cacheManager, utilsService, uploadService, storageConfig, dataSourceProvider, permissionCacheService){
+        super('file_manager', cacheManager, utilsService, FileManagerService.name, true, 'storage', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "uploadService", void 0), _define_property(this, "storageConfig", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "permissionCacheService", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.uploadService = uploadService, this.storageConfig = storageConfig, this.dataSourceProvider = dataSourceProvider, this.permissionCacheService = permissionCacheService;
     }
 };
 FileManagerService = _ts_decorate([
@@ -373,12 +373,14 @@ FileManagerService = _ts_decorate([
     _ts_param(2, (0, _common.Inject)(_uploadservice.UploadService)),
     _ts_param(3, (0, _common.Inject)(_storageconfigservice.StorageConfigService)),
     _ts_param(4, (0, _common.Inject)(_storagedatasourceprovider.StorageDataSourceProvider)),
+    _ts_param(5, (0, _common.Inject)(_modules.SharedPermissionCacheService)),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
         typeof _classes.HybridCache === "undefined" ? Object : _classes.HybridCache,
         typeof _modules.UtilsService === "undefined" ? Object : _modules.UtilsService,
         typeof _uploadservice.UploadService === "undefined" ? Object : _uploadservice.UploadService,
         typeof _storageconfigservice.StorageConfigService === "undefined" ? Object : _storageconfigservice.StorageConfigService,
-        typeof _storagedatasourceprovider.StorageDataSourceProvider === "undefined" ? Object : _storagedatasourceprovider.StorageDataSourceProvider
+        typeof _storagedatasourceprovider.StorageDataSourceProvider === "undefined" ? Object : _storagedatasourceprovider.StorageDataSourceProvider,
+        typeof _modules.SharedPermissionCacheService === "undefined" ? Object : _modules.SharedPermissionCacheService
     ])
 ], FileManagerService);

package/cjs/services/file-manager.service.spec.js

@@ -42,6 +42,7 @@ describe('FileManagerService', ()=>{
     let mockStorageConfig;
     let mockUploadService;
     let mockCacheManager;
+    let mockSharedPermissionCacheService;
     beforeEach(async ()=>{
         mockFileRepo = (0, _repositorymock.createMockRepository)();
         mockFileRepo.findBy = jest.fn();
@@ -71,6 +72,9 @@ describe('FileManagerService', ()=>{
             get: jest.fn(),
             set: jest.fn()
         };
+        mockSharedPermissionCacheService = {
+            hasPermission: jest.fn().mockResolvedValue(false)
+        };
         const module = await _testing.Test.createTestingModule({
             providers: [
                 _filemanagerservice.FileManagerService,
@@ -93,6 +97,10 @@ describe('FileManagerService', ()=>{
                 {
                     provide: _storagedatasourceprovider.StorageDataSourceProvider,
                     useValue: mockDataSourceProvider
+                },
+                {
+                    provide: _modules.SharedPermissionCacheService,
+                    useValue: mockSharedPermissionCacheService
                 }
             ]
         }).compile();
@@ -331,11 +339,7 @@ describe('FileManagerService', ()=>{
             });
         });
         it('hides private files from an authenticated user lacking the viewPrivate permission', async ()=>{
-            mockCacheManager.get.mockResolvedValue([
-                {
-                    url: 'storage.file.someOtherAction'
-                }
-            ]);
+            mockSharedPermissionCacheService.hasPermission.mockResolvedValue(false);
             const query = {
                 andWhere: jest.fn().mockReturnThis()
             };
@@ -345,11 +349,7 @@ describe('FileManagerService', ()=>{
             });
         });
         it('does not restrict private files for a user holding the viewPrivate permission', async ()=>{
-            mockCacheManager.get.mockResolvedValue([
-                {
-                    url: 'storage.file.viewPrivate'
-                }
-            ]);
+            mockSharedPermissionCacheService.hasPermission.mockResolvedValue(true);
             const query = {
                 andWhere: jest.fn().mockReturnThis()
             };

package/fesm/services/file-manager.service.js

@@ -25,8 +25,8 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-import { HybridCache, ApiService } from '@flusys/nestjs-shared/classes';
-import { UtilsService } from '@flusys/nestjs-shared/modules';
+import { ApiService, FILE_PERMISSIONS, HybridCache } from '@flusys/nestjs-shared/classes';
+import { SharedPermissionCacheService, UtilsService } from '@flusys/nestjs-shared/modules';
 import { applyCompanyFilter } from '@flusys/nestjs-shared/utils';
 import { BadRequestException, Inject, Injectable, NotFoundException, Scope } from '@nestjs/common';
 import { Brackets, In } from 'typeorm';
@@ -36,8 +36,6 @@ import { FileLocationEnum } from '../enums/file-location.enum';
 import { StorageConfigService } from './storage-config.service';
 import { StorageDataSourceProvider } from './storage-datasource.provider';
 import { UploadService } from './upload.service';
-const PERMISSION_CACHE_KEY = 'user_action_permission';
-const VIEW_PRIVATE_ACTION = 'storage.file.viewPrivate';
 const URL_EXPIRY_SECONDS = 3600;
 const DEFAULT_SELECT_FIELDS = [
     'id',
@@ -246,9 +244,11 @@ export class FileManagerService extends ApiService {
             });
             return;
         }
-        const cacheKey = this.storageConfig.isCompanyFeatureEnabled() ? `${PERMISSION_CACHE_KEY}_${user.id}_${user.companyId}` : `${PERMISSION_CACHE_KEY}_${user.id}`;
-        const actions = await this.cacheManager.get(cacheKey);
-        const canViewPrivate = actions?.some((a)=>a.url === VIEW_PRIVATE_ACTION) ?? false;
+        const canViewPrivate = await this.permissionCacheService.hasPermission({
+            userId: user.id,
+            companyId: user.companyId,
+            branchId: user.branchId
+        }, FILE_PERMISSIONS.VIEW_PRIVATE_ACTION);
         if (!canViewPrivate) {
             query.andWhere('file_manager.isPrivate = :isPrivate', {
                 isPrivate: false
@@ -309,8 +309,8 @@ export class FileManagerService extends ApiService {
             storageConfigId: file.storageConfigId || undefined
         };
     }
-    constructor(cacheManager, utilsService, uploadService, storageConfig, dataSourceProvider){
-        super('file_manager', cacheManager, utilsService, FileManagerService.name, true, 'storage', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "uploadService", void 0), _define_property(this, "storageConfig", void 0), _define_property(this, "dataSourceProvider", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.uploadService = uploadService, this.storageConfig = storageConfig, this.dataSourceProvider = dataSourceProvider;
+    constructor(cacheManager, utilsService, uploadService, storageConfig, dataSourceProvider, permissionCacheService){
+        super('file_manager', cacheManager, utilsService, FileManagerService.name, true, 'storage', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "uploadService", void 0), _define_property(this, "storageConfig", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "permissionCacheService", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.uploadService = uploadService, this.storageConfig = storageConfig, this.dataSourceProvider = dataSourceProvider, this.permissionCacheService = permissionCacheService;
     }
 }
 FileManagerService = _ts_decorate([
@@ -322,12 +322,14 @@ FileManagerService = _ts_decorate([
     _ts_param(2, Inject(UploadService)),
     _ts_param(3, Inject(StorageConfigService)),
     _ts_param(4, Inject(StorageDataSourceProvider)),
+    _ts_param(5, Inject(SharedPermissionCacheService)),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
         typeof HybridCache === "undefined" ? Object : HybridCache,
         typeof UtilsService === "undefined" ? Object : UtilsService,
         typeof UploadService === "undefined" ? Object : UploadService,
         typeof StorageConfigService === "undefined" ? Object : StorageConfigService,
-        typeof StorageDataSourceProvider === "undefined" ? Object : StorageDataSourceProvider
+        typeof StorageDataSourceProvider === "undefined" ? Object : StorageDataSourceProvider,
+        typeof SharedPermissionCacheService === "undefined" ? Object : SharedPermissionCacheService
     ])
 ], FileManagerService);

package/fesm/services/file-manager.service.spec.js

@@ -1,5 +1,5 @@
 import { Test } from '@nestjs/testing';
-import { UtilsService } from '@flusys/nestjs-shared/modules';
+import { SharedPermissionCacheService, UtilsService } from '@flusys/nestjs-shared/modules';
 import { createMockRepository } from '@test-utils/mocks/repository.mock';
 import { buildMockUser } from '@test-utils/mocks/logged-user.mock';
 import { FileManagerService } from './file-manager.service';
@@ -38,6 +38,7 @@ describe('FileManagerService', ()=>{
     let mockStorageConfig;
     let mockUploadService;
     let mockCacheManager;
+    let mockSharedPermissionCacheService;
     beforeEach(async ()=>{
         mockFileRepo = createMockRepository();
         mockFileRepo.findBy = jest.fn();
@@ -67,6 +68,9 @@ describe('FileManagerService', ()=>{
             get: jest.fn(),
             set: jest.fn()
         };
+        mockSharedPermissionCacheService = {
+            hasPermission: jest.fn().mockResolvedValue(false)
+        };
         const module = await Test.createTestingModule({
             providers: [
                 FileManagerService,
@@ -89,6 +93,10 @@ describe('FileManagerService', ()=>{
                 {
                     provide: StorageDataSourceProvider,
                     useValue: mockDataSourceProvider
+                },
+                {
+                    provide: SharedPermissionCacheService,
+                    useValue: mockSharedPermissionCacheService
                 }
             ]
         }).compile();
@@ -327,11 +335,7 @@ describe('FileManagerService', ()=>{
             });
         });
         it('hides private files from an authenticated user lacking the viewPrivate permission', async ()=>{
-            mockCacheManager.get.mockResolvedValue([
-                {
-                    url: 'storage.file.someOtherAction'
-                }
-            ]);
+            mockSharedPermissionCacheService.hasPermission.mockResolvedValue(false);
             const query = {
                 andWhere: jest.fn().mockReturnThis()
             };
@@ -341,11 +345,7 @@ describe('FileManagerService', ()=>{
             });
         });
         it('does not restrict private files for a user holding the viewPrivate permission', async ()=>{
-            mockCacheManager.get.mockResolvedValue([
-                {
-                    url: 'storage.file.viewPrivate'
-                }
-            ]);
+            mockSharedPermissionCacheService.hasPermission.mockResolvedValue(true);
             const query = {
                 andWhere: jest.fn().mockReturnThis()
             };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flusys/nestjs-storage",
-  "version": "6.1.2",
+  "version": "6.1.3",
   "description": "Modular storage package with optional AWS S3, Azure Blob, and SFTP providers",
   "main": "cjs/index.js",
   "module": "fesm/index.js",
@@ -129,7 +129,7 @@
     }
   },
   "dependencies": {
-    "@flusys/nestjs-core": "6.1.2",
-    "@flusys/nestjs-shared": "6.1.2"
+    "@flusys/nestjs-core": "6.1.3",
+    "@flusys/nestjs-shared": "6.1.3"
   }
 }

package/services/file-manager.service.d.ts

@@ -1,7 +1,7 @@
-import { HybridCache, ApiService } from '@flusys/nestjs-shared/classes';
+import { ApiService, HybridCache } from '@flusys/nestjs-shared/classes';
 import { DeleteDto, FilterAndPaginationDto } from '@flusys/nestjs-shared/dtos';
 import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
-import { UtilsService } from '@flusys/nestjs-shared/modules';
+import { SharedPermissionCacheService, UtilsService } from '@flusys/nestjs-shared/modules';
 import { EntityTarget, QueryRunner, SelectQueryBuilder } from 'typeorm';
 import { CreateFileManagerDto, FilesResponseDto, GetFilesRequestDto, UpdateFileManagerDto } from '../dtos';
 import { FileManager, FileManagerBase } from '../entities';
@@ -15,7 +15,8 @@ export declare class FileManagerService extends ApiService<CreateFileManagerDto,
     protected uploadService: UploadService;
     private readonly storageConfig;
     private readonly dataSourceProvider;
-    constructor(cacheManager: HybridCache, utilsService: UtilsService, uploadService: UploadService, storageConfig: StorageConfigService, dataSourceProvider: StorageDataSourceProvider);
+    private readonly permissionCacheService;
+    constructor(cacheManager: HybridCache, utilsService: UtilsService, uploadService: UploadService, storageConfig: StorageConfigService, dataSourceProvider: StorageDataSourceProvider, permissionCacheService: SharedPermissionCacheService);
     protected resolveEntity(): EntityTarget<FileManagerBase>;
     convertSingleDtoToEntity(dto: CreateFileManagerDto | UpdateFileManagerDto, user: ILoggedUserInfo | null): Promise<FileManagerBase>;
     getSelectQuery(query: SelectQueryBuilder<FileManagerBase>, _user: ILoggedUserInfo | null, select?: string[]): Promise<{