@flusys/nestjs-iam 6.1.0 → 6.1.2

package/cjs/controllers/company-action-permission.controller.js

@@ -57,7 +57,7 @@ let CompanyActionPermissionController = class CompanyActionPermissionController
         };
     }
     async getCompanyActions(dto) {
-        const actions = await this.permissionService.getCompanyActions(dto.companyId);
+        const actions = await this.permissionService.getCompanyActions(dto.companyId, false);
         return {
             success: true,
             message: 'Company actions retrieved successfully',

package/cjs/controllers/company-action-permission.controller.spec.js

@@ -54,7 +54,7 @@ describe('CompanyActionPermissionController', ()=>{
             const result = await controller.getCompanyActions({
                 companyId: 'company-1'
             });
-            expect(mockPermissionService.getCompanyActions).toHaveBeenCalledWith('company-1');
+            expect(mockPermissionService.getCompanyActions).toHaveBeenCalledWith('company-1', false);
             expect(result.data).toEqual([
                 {
                     actionId: 'action-1'

package/cjs/controllers/user-action-permission.controller.js

@@ -58,7 +58,7 @@ let UserActionPermissionController = class UserActionPermissionController {
         };
     }
     async getUserActions(dto, user) {
-        const actions = await this.permissionService.getUserActions(dto.userId, dto.branchId, dto.companyId);
+        const actions = await this.permissionService.getUserActions(dto.userId, dto.companyId, dto.branchId);
         return {
             success: true,
             message: 'User actions retrieved successfully',

package/cjs/controllers/user-action-permission.controller.spec.js

@@ -57,7 +57,7 @@ describe('UserActionPermissionController', ()=>{
                 branchId: 'branch-1',
                 companyId: 'company-1'
             }, user);
-            expect(mockPermissionService.getUserActions).toHaveBeenCalledWith('user-2', 'branch-1', 'company-1');
+            expect(mockPermissionService.getUserActions).toHaveBeenCalledWith('user-2', 'company-1', 'branch-1');
             expect(result.data).toEqual([
                 {
                     actionId: 'action-1'

package/cjs/dtos/permission.dto.js

@@ -351,6 +351,7 @@ let UserActionResponseDto = class UserActionResponseDto {
         _define_property(this, "actionId", void 0);
         _define_property(this, "actionCode", void 0);
         _define_property(this, "actionName", void 0);
+        _define_property(this, "companyId", void 0);
         _define_property(this, "branchId", void 0);
         _define_property(this, "createdAt", void 0);
     }
@@ -385,6 +386,12 @@ _ts_decorate([
     }),
     _ts_metadata("design:type", String)
 ], UserActionResponseDto.prototype, "actionName", void 0);
+_ts_decorate([
+    (0, _swagger.ApiPropertyOptional)({
+        description: 'Company ID (null = global)'
+    }),
+    _ts_metadata("design:type", Object)
+], UserActionResponseDto.prototype, "companyId", void 0);
 _ts_decorate([
     (0, _swagger.ApiPropertyOptional)({
         description: 'Branch ID (null = company-wide)'

package/cjs/entities/permission-base.entity.js

@@ -39,7 +39,7 @@ let PermissionBase = class PermissionBase extends _nestjsshared.Identity {
         return true;
     }
     constructor(...args){
-        super(...args), _define_property(this, "permissionType", void 0), _define_property(this, "sourceType", void 0), _define_property(this, "sourceId", void 0), _define_property(this, "targetType", void 0), _define_property(this, "targetId", void 0), _define_property(this, "userId", void 0), _define_property(this, "validFrom", void 0), _define_property(this, "validUntil", void 0), _define_property(this, "reason", void 0);
+        super(...args), _define_property(this, "permissionType", void 0), _define_property(this, "sourceType", void 0), _define_property(this, "sourceId", void 0), _define_property(this, "targetType", void 0), _define_property(this, "targetId", void 0), _define_property(this, "validFrom", void 0), _define_property(this, "validUntil", void 0), _define_property(this, "reason", void 0);
     }
 };
 _ts_decorate([
@@ -82,15 +82,6 @@ _ts_decorate([
     }),
     _ts_metadata("design:type", String)
 ], PermissionBase.prototype, "targetId", void 0);
-_ts_decorate([
-    (0, _typeorm.Column)({
-        type: 'varchar',
-        length: 150,
-        nullable: true,
-        name: 'user_id'
-    }),
-    _ts_metadata("design:type", Object)
-], PermissionBase.prototype, "userId", void 0);
 _ts_decorate([
     (0, _typeorm.Column)({
         type: 'timestamp',

package/cjs/entities/permission-with-company.entity.js

@@ -87,9 +87,6 @@ UserIamPermissionWithCompany = _ts_decorate([
     (0, _typeorm.Index)([
         'permissionType'
     ]),
-    (0, _typeorm.Index)([
-        'userId'
-    ]),
     (0, _typeorm.Index)([
         'companyId'
     ]),

package/cjs/entities/user-iam-permission.entity.js

@@ -39,8 +39,5 @@ UserIamPermission = _ts_decorate([
     ]),
     (0, _typeorm.Index)([
         'permissionType'
-    ]),
-    (0, _typeorm.Index)([
-        'userId'
     ])
 ], UserIamPermission);

package/cjs/modules/iam.module.js

@@ -69,8 +69,8 @@ let IAMModule = class IAMModule {
             provide: _nestjsshared.PERMISSION_GUARD_CONFIG,
             useValue: {
                 enableCompanyFeature,
-                userPermissionKeyFormat: `${_permissioncacheservice.MY_PERMISSIONS_CACHE_PREFIX}:user:{userId}`,
-                companyPermissionKeyFormat: `${_permissioncacheservice.MY_PERMISSIONS_CACHE_PREFIX}:company:{companyId}:branch:{branchId}:user:{userId}`
+                userPermissionKeyFormat: `${_nestjsshared.PERMISSIONS_CACHE_PREFIX}:user:{userId}`,
+                companyPermissionKeyFormat: `${_nestjsshared.PERMISSIONS_CACHE_PREFIX}:company:{companyId}:branch:{branchId}:user:{userId}`
             }
         };
     }

package/cjs/services/action.service.js

@@ -85,7 +85,7 @@ let ActionService = class ActionService extends _classes.ApiService {
                 }
             }) : Promise.resolve([])
         ]);
-        const affectedUserIds = new Set(userActionRows.map((row)=>row.userId).filter((id)=>!!id));
+        const affectedUserIds = new Set(userActionRows.map((row)=>row.sourceId));
         const affectedCompanyIds = [
             ...new Set(companyActionRows.map((row)=>row.sourceId).filter((id)=>!!id))
         ];
@@ -100,7 +100,7 @@ let ActionService = class ActionService extends _classes.ApiService {
                     targetId: (0, _typeorm.In)(affectedRoleIds)
                 }
             });
-            userRoleRows.forEach((row)=>row.userId && affectedUserIds.add(row.userId));
+            userRoleRows.forEach((row)=>affectedUserIds.add(row.sourceId));
         }
         await permissionRepo.delete({
             permissionType: _iampermissiontypeenum.IamPermissionType.ROLE_ACTION,
@@ -122,7 +122,7 @@ let ActionService = class ActionService extends _classes.ApiService {
             affectedUserIds.size > 0 ? this.permissionCacheService.invalidateUsers([
                 ...affectedUserIds
             ]) : Promise.resolve(),
-            ...affectedCompanyIds.map((companyId)=>this.permissionService.invalidateCompanyMembersCache(companyId))
+            ...affectedCompanyIds.map((companyId)=>this.permissionCacheService.invalidateCompanyMembersCache(companyId))
         ]);
     }
     // Query Customization
@@ -194,7 +194,7 @@ let ActionService = class ActionService extends _classes.ApiService {
         let whereClause = {};
         const targetCompanyId = companyId || user.companyId;
         if (this.iamConfigService.isCompanyFeatureEnabled() && targetCompanyId) {
-            const companyActionIds = await this.permissionService.getCompanyActionIds(targetCompanyId);
+            const companyActionIds = await this.permissionService.getCompanyActions(targetCompanyId, true);
             if (companyActionIds.length === 0) {
                 return [];
             }

package/cjs/services/action.service.spec.js

@@ -46,11 +46,11 @@ describe('ActionService', ()=>{
             isCompanyFeatureEnabled: jest.fn().mockReturnValue(false)
         };
         mockPermissionService = {
-            getCompanyActionIds: jest.fn(),
-            invalidateCompanyMembersCache: jest.fn()
+            getCompanyActions: jest.fn()
         };
         mockPermissionCacheService = {
-            invalidateUsers: jest.fn()
+            invalidateUsers: jest.fn(),
+            invalidateCompanyMembersCache: jest.fn()
         };
         const module = await _testing.Test.createTestingModule({
             providers: [
@@ -89,20 +89,20 @@ describe('ActionService', ()=>{
                 buildAction()
             ]);
             const result = await service.getActionsForPermission((0, _loggedusermock.buildMockUser)());
-            expect(mockPermissionService.getCompanyActionIds).not.toHaveBeenCalled();
+            expect(mockPermissionService.getCompanyActions).not.toHaveBeenCalled();
             expect(result).toHaveLength(1);
             expect(result[0].code).toBe('products.read');
         });
         it('scopes actions to the company whitelist when the company feature is enabled', async ()=>{
             mockIamConfigService.isCompanyFeatureEnabled.mockReturnValue(true);
-            mockPermissionService.getCompanyActionIds.mockResolvedValue([
+            mockPermissionService.getCompanyActions.mockResolvedValue([
                 'action-uuid-1'
             ]);
             mockRepo.find.mockResolvedValue([
                 buildAction()
             ]);
             await service.getActionsForPermission((0, _loggedusermock.buildMockUser)(), 'company-uuid-1');
-            expect(mockPermissionService.getCompanyActionIds).toHaveBeenCalledWith('company-uuid-1');
+            expect(mockPermissionService.getCompanyActions).toHaveBeenCalledWith('company-uuid-1', true);
             expect(mockRepo.find).toHaveBeenCalledWith(expect.objectContaining({
                 where: {
                     id: expect.anything()
@@ -111,7 +111,7 @@ describe('ActionService', ()=>{
         });
         it('short-circuits without querying when the company has no whitelisted actions', async ()=>{
             mockIamConfigService.isCompanyFeatureEnabled.mockReturnValue(true);
-            mockPermissionService.getCompanyActionIds.mockResolvedValue([]);
+            mockPermissionService.getCompanyActions.mockResolvedValue([]);
             const result = await service.getActionsForPermission((0, _loggedusermock.buildMockUser)(), 'company-uuid-1');
             expect(result).toEqual([]);
             expect(mockRepo.find).not.toHaveBeenCalled();
@@ -251,12 +251,12 @@ describe('ActionService', ()=>{
             ]) // role-action rows referencing the deleted action
             .mockResolvedValueOnce([
                 {
-                    userId: 'user-1'
+                    sourceId: 'user-1'
                 }
             ]) // direct user-action rows
             .mockResolvedValueOnce([
                 {
-                    userId: 'user-2'
+                    sourceId: 'user-2'
                 }
             ]); // users holding role-1 (cascaded lookup)
             const queryRunner = buildQueryRunner(permissionRepo);
@@ -277,7 +277,7 @@ describe('ActionService', ()=>{
                 'user-1',
                 'user-2'
             ]));
-            expect(mockPermissionService.invalidateCompanyMembersCache).not.toHaveBeenCalled();
+            expect(mockPermissionCacheService.invalidateCompanyMembersCache).not.toHaveBeenCalled();
         });
         it('also queries and invalidates company whitelist entries when the company feature is enabled', async ()=>{
             mockIamConfigService.isCompanyFeatureEnabled.mockReturnValue(true);
@@ -296,7 +296,7 @@ describe('ActionService', ()=>{
                 ],
                 type: 'delete'
             }, (0, _loggedusermock.buildMockUser)(), queryRunner);
-            expect(mockPermissionService.invalidateCompanyMembersCache).toHaveBeenCalledWith('company-1');
+            expect(mockPermissionCacheService.invalidateCompanyMembersCache).toHaveBeenCalledWith('company-1');
         });
         it('does not invalidate any cache when nothing is affected', async ()=>{
             const permissionRepo = (0, _repositorymock.createMockRepository)();