@flusys/nestjs-iam 6.1.0 → 6.1.1

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

@@ -25,7 +25,6 @@ function buildPermissionRow(overrides = {}) {
         sourceId: 'user-1',
         targetType: _iamentitytypeenum.IamEntityType.ACTION,
         targetId: 'action-1',
-        userId: 'user-1',
         companyId: null,
         branchId: null,
         validFrom: null,
@@ -99,8 +98,9 @@ describe('PermissionService', ()=>{
         mockPermissionCacheService = {
             invalidateUser: jest.fn(),
             invalidateUsers: jest.fn(),
-            getMyPermissions: jest.fn(),
-            setMyPermissions: jest.fn()
+            invalidateRoleMembersCache: jest.fn(),
+            invalidateCompanyMembersCache: jest.fn(),
+            getMyPermissionsResponse: jest.fn()
         };
         const module = await _testing.Test.createTestingModule({
             providers: [
@@ -172,9 +172,7 @@ describe('PermissionService', ()=>{
                 removed: 1,
                 total: 3
             });
-            expect(mockPermissionCacheService.invalidateUser).toHaveBeenCalledWith('user-1', null, [
-                null
-            ]);
+            expect(mockPermissionCacheService.invalidateUser).toHaveBeenCalledWith('user-1', null, []);
         });
         it('scopes new permissions and cache invalidation to the company/branch when the company feature is enabled', async ()=>{
             mockIamConfigService.isCompanyFeatureEnabled.mockReturnValue(true);
@@ -245,7 +243,7 @@ describe('PermissionService', ()=>{
     describe('getUserActions', ()=>{
         it('returns an empty array without querying actions when the user has no permissions', async ()=>{
             mockPermissionRepo.find.mockResolvedValue([]);
-            const result = await service.getUserActions('user-1', undefined);
+            const result = await service.getUserActions('user-1', undefined, undefined);
             expect(result).toEqual([]);
             expect(mockActionRepo.find).not.toHaveBeenCalled();
         });
@@ -264,7 +262,7 @@ describe('PermissionService', ()=>{
                     id: 'action-1'
                 })
             ]);
-            const result = await service.getUserActions('user-1', undefined);
+            const result = await service.getUserActions('user-1', undefined, undefined);
             expect(result).toHaveLength(1);
             expect(result[0]).toEqual(expect.objectContaining({
                 actionId: 'action-1',
@@ -274,7 +272,7 @@ describe('PermissionService', ()=>{
         it('filters by companyId/branchId when the company feature is enabled', async ()=>{
             mockIamConfigService.isCompanyFeatureEnabled.mockReturnValue(true);
             mockPermissionRepo.find.mockResolvedValue([]);
-            await service.getUserActions('user-1', 'branch-1', 'company-1');
+            await service.getUserActions('user-1', 'company-1', 'branch-1');
             expect(mockPermissionRepo.find).toHaveBeenCalledWith({
                 where: expect.objectContaining({
                     companyId: 'company-1',
@@ -336,31 +334,18 @@ describe('PermissionService', ()=>{
             });
         });
         it('removes role actions and reports counts and invalidates role member caches', async ()=>{
-            mockPermissionRepo.find.mockResolvedValueOnce([]) // existing check for add
-            .mockResolvedValueOnce([
-                buildPermissionRow({
-                    sourceId: 'user-9'
-                })
-            ]); // invalidateRoleMembersCache lookup (sourceId = the user who holds the role)
+            mockPermissionRepo.find.mockResolvedValue([]); // existing check for add
             mockPermissionRepo.save.mockResolvedValue([
                 {}
             ]);
             mockPermissionRepo.delete.mockResolvedValue(buildDeleteResult(1));
-            mockRoleRepo.findOne.mockResolvedValue({
-                id: 'role-1',
-                companyId: null
-            });
             const result = await service.assignRoleActions(dto);
             expect(result).toEqual({
                 added: 1,
                 removed: 1,
                 total: 2
             });
-            expect(mockPermissionCacheService.invalidateUsers).toHaveBeenCalledWith([
-                'user-9'
-            ], null, [
-                null
-            ]);
+            expect(mockPermissionCacheService.invalidateRoleMembersCache).toHaveBeenCalledWith('role-1');
         });
     });
     describe('getRoleActions', ()=>{
@@ -399,7 +384,9 @@ describe('PermissionService', ()=>{
                     return mockPermissionRepo;
                 })
             };
-            mockPermissionRepo.manager.connection.transaction = jest.fn().mockImplementation((cb)=>cb(fakeManager));
+            mockDataSourceProvider.getDataSource.mockResolvedValue({
+                transaction: jest.fn().mockImplementation((cb)=>cb(fakeManager))
+            });
             return fakeManager;
         }
         it('adds new company-whitelisted actions inside a transaction, skipping duplicates', async ()=>{
@@ -433,7 +420,7 @@ describe('PermissionService', ()=>{
                 })
             ]);
             expect(result.added).toBe(1);
-            expect(mockPermissionCacheService.invalidateUsers).not.toHaveBeenCalled(); // no company feature -> invalidateCompanyMembersCache no-ops
+            expect(mockPermissionCacheService.invalidateCompanyMembersCache).toHaveBeenCalledWith('company-1');
         });
         it('cascades removal to role-action and user-action permissions for the company', async ()=>{
             mockIamConfigService.isCompanyFeatureEnabled.mockReturnValue(true);
@@ -501,7 +488,7 @@ describe('PermissionService', ()=>{
                     targetId: 'action-2'
                 }
             ]);
-            const result = await service.getCompanyActionIds('company-1');
+            const result = await service.getCompanyActions('company-1', true);
             expect(result).toEqual([
                 'action-1',
                 'action-2'
@@ -588,287 +575,26 @@ describe('PermissionService', ()=>{
     });
     // ==================== My Permissions / permission-mode branching ====================
     describe('getMyPermissions', ()=>{
-        it('returns the response built directly from cached data on a cache hit', async ()=>{
-            mockPermissionCacheService.getMyPermissions.mockResolvedValue({
+        it('delegates to the cache service and returns its response', async ()=>{
+            const response = {
                 frontendActions: [
                     {
                         id: 'action-1',
                         code: 'user.view',
                         name: 'View',
-                        description: null,
-                        parentId: null
-                    }
-                ],
-                backendCodes: [
-                    'user.read'
-                ]
-            });
-            const result = await service.getMyPermissions('user-1', null, 'company-1');
-            expect(result.frontendActions).toHaveLength(1);
-            expect(result.cachedEndpoints).toBe(1);
-            expect(mockPermissionRepo.find).not.toHaveBeenCalled();
-        });
-        it('fetches from the database and caches the result on a cache miss', async ()=>{
-            mockPermissionCacheService.getMyPermissions.mockResolvedValue(null);
-            mockPermissionRepo.find.mockResolvedValue([]);
-            const result = await service.getMyPermissions('user-1', null, null);
-            expect(result).toEqual({
-                frontendActions: [],
-                cachedEndpoints: 0
-            });
-            expect(mockPermissionCacheService.setMyPermissions).toHaveBeenCalled();
-        });
-        it('filters frontend actions by parentCodes when provided', async ()=>{
-            mockPermissionCacheService.getMyPermissions.mockResolvedValue({
-                frontendActions: [
-                    {
-                        id: 'child-1',
-                        code: 'user.view',
-                        name: 'View',
-                        description: null,
-                        parentId: 'parent-1'
-                    },
-                    {
-                        id: 'child-2',
-                        code: 'other.view',
-                        name: 'View 2',
-                        description: null,
-                        parentId: 'other-parent'
+                        description: null
                     }
                 ],
-                backendCodes: []
-            });
-            mockActionRepo.find.mockResolvedValue([
-                {
-                    id: 'parent-1',
-                    code: 'user'
-                }
-            ]);
-            const result = await service.getMyPermissions('user-1', null, null, [
-                'user'
-            ]);
-            expect(result.frontendActions).toHaveLength(1);
-            expect(result.frontendActions[0].id).toBe('child-1');
-        });
-        it('returns an empty frontendActions list when parentCodes resolve to no known parents', async ()=>{
-            mockPermissionCacheService.getMyPermissions.mockResolvedValue({
-                frontendActions: [
-                    {
-                        id: 'child-1',
-                        code: 'user.view',
-                        name: 'View',
-                        description: null,
-                        parentId: 'parent-1'
-                    }
-                ],
-                backendCodes: []
-            });
-            mockActionRepo.find.mockResolvedValue([]);
-            const result = await service.getMyPermissions('user-1', null, null, [
-                'unknown-parent-code'
-            ]);
-            expect(result.frontendActions).toEqual([]);
-        });
-    });
-    describe('collectAllActionIds (permission-mode branching)', ()=>{
-        it('RBAC mode: collects only role-derived action ids, ignoring direct user actions', async ()=>{
-            mockIamConfigService.getPermissionMode.mockReturnValue(_permissiontypeenum.IAMPermissionMode.RBAC);
-            mockPermissionRepo.find.mockImplementation(async ({ where })=>{
-                if (where.permissionType === _iampermissiontypeenum.IamPermissionType.USER_ROLE) {
-                    return [
-                        buildPermissionRow({
-                            permissionType: _iampermissiontypeenum.IamPermissionType.USER_ROLE,
-                            targetId: 'role-1'
-                        })
-                    ];
-                }
-                if (where.permissionType === _iampermissiontypeenum.IamPermissionType.ROLE_ACTION) {
-                    return [
-                        buildPermissionRow({
-                            permissionType: _iampermissiontypeenum.IamPermissionType.ROLE_ACTION,
-                            targetId: 'action-role-1'
-                        })
-                    ];
-                }
-                if (where.permissionType === _iampermissiontypeenum.IamPermissionType.USER_ACTION) {
-                    throw new Error('DIRECT lookup should not run in RBAC mode');
-                }
-                return [];
-            });
-            const result = await service.collectAllActionIds('user-1', null, null);
-            expect(Array.from(result)).toEqual([
-                'action-role-1'
-            ]);
-        });
-        it('DIRECT mode: collects only directly-assigned user action ids, ignoring roles', async ()=>{
-            mockIamConfigService.getPermissionMode.mockReturnValue(_permissiontypeenum.IAMPermissionMode.DIRECT);
-            mockPermissionRepo.find.mockImplementation(async ({ where })=>{
-                if (where.permissionType === _iampermissiontypeenum.IamPermissionType.USER_ROLE) {
-                    throw new Error('RBAC lookup should not run in DIRECT mode');
-                }
-                if (where.permissionType === _iampermissiontypeenum.IamPermissionType.USER_ACTION) {
-                    return [
-                        buildPermissionRow({
-                            permissionType: _iampermissiontypeenum.IamPermissionType.USER_ACTION,
-                            targetId: 'action-direct-1'
-                        })
-                    ];
-                }
-                return [];
-            });
-            const result = await service.collectAllActionIds('user-1', null, null);
-            expect(Array.from(result)).toEqual([
-                'action-direct-1'
-            ]);
-        });
-        it('FULL mode: merges role-derived and direct action ids, de-duplicating overlaps', async ()=>{
-            mockIamConfigService.getPermissionMode.mockReturnValue(_permissiontypeenum.IAMPermissionMode.FULL);
-            mockPermissionRepo.find.mockImplementation(async ({ where })=>{
-                if (where.permissionType === _iampermissiontypeenum.IamPermissionType.USER_ROLE) {
-                    return [
-                        buildPermissionRow({
-                            permissionType: _iampermissiontypeenum.IamPermissionType.USER_ROLE,
-                            targetId: 'role-1'
-                        })
-                    ];
-                }
-                if (where.permissionType === _iampermissiontypeenum.IamPermissionType.ROLE_ACTION) {
-                    return [
-                        buildPermissionRow({
-                            permissionType: _iampermissiontypeenum.IamPermissionType.ROLE_ACTION,
-                            targetId: 'action-shared'
-                        })
-                    ];
-                }
-                if (where.permissionType === _iampermissiontypeenum.IamPermissionType.USER_ACTION) {
-                    return [
-                        buildPermissionRow({
-                            permissionType: _iampermissiontypeenum.IamPermissionType.USER_ACTION,
-                            targetId: 'action-shared'
-                        }),
-                        buildPermissionRow({
-                            permissionType: _iampermissiontypeenum.IamPermissionType.USER_ACTION,
-                            targetId: 'action-direct-only'
-                        })
-                    ];
-                }
-                return [];
-            });
-            const result = await service.collectAllActionIds('user-1', null, null);
-            expect(Array.from(result).sort()).toEqual([
-                'action-direct-only',
-                'action-shared'
-            ]);
-        });
-        it('excludes expired/not-yet-valid permission rows via isValid()', async ()=>{
-            mockIamConfigService.getPermissionMode.mockReturnValue(_permissiontypeenum.IAMPermissionMode.DIRECT);
-            const expired = buildPermissionRow({
-                permissionType: _iampermissiontypeenum.IamPermissionType.USER_ACTION,
-                targetId: 'action-expired',
-                validUntil: new Date('2000-01-01')
-            });
-            const active = buildPermissionRow({
-                permissionType: _iampermissiontypeenum.IamPermissionType.USER_ACTION,
-                targetId: 'action-active'
-            });
-            mockPermissionRepo.find.mockResolvedValue([
-                expired,
-                active
-            ]);
-            const result = await service.collectAllActionIds('user-1', null, null);
-            expect(Array.from(result)).toEqual([
-                'action-active'
-            ]);
-        });
-    });
-    describe('applyCompanyWhitelist', ()=>{
-        it('is a no-op when the company feature is disabled', async ()=>{
-            const actionIds = new Set([
-                'action-1',
-                'action-2'
-            ]);
-            await service.applyCompanyWhitelist(actionIds, 'company-1');
-            expect(actionIds).toEqual(new Set([
-                'action-1',
-                'action-2'
-            ]));
-            expect(mockPermissionRepo.find).not.toHaveBeenCalled();
-        });
-        it('is a no-op when companyId is missing even if the company feature is enabled', async ()=>{
-            mockIamConfigService.isCompanyFeatureEnabled.mockReturnValue(true);
-            const actionIds = new Set([
-                'action-1'
-            ]);
-            await service.applyCompanyWhitelist(actionIds, null);
-            expect(actionIds).toEqual(new Set([
-                'action-1'
-            ]));
-        });
-        it('does not filter anything when the company has an empty whitelist', async ()=>{
-            mockIamConfigService.isCompanyFeatureEnabled.mockReturnValue(true);
-            mockPermissionRepo.find.mockResolvedValue([]);
-            const actionIds = new Set([
-                'action-1',
-                'action-2'
-            ]);
-            await service.applyCompanyWhitelist(actionIds, 'company-1');
-            expect(actionIds).toEqual(new Set([
-                'action-1',
-                'action-2'
-            ]));
-        });
-        it('removes action ids that are not present in the company whitelist', async ()=>{
-            mockIamConfigService.isCompanyFeatureEnabled.mockReturnValue(true);
-            mockPermissionRepo.find.mockResolvedValue([
-                {
-                    targetId: 'action-1'
-                }
-            ]);
-            const actionIds = new Set([
-                'action-1',
-                'action-2'
-            ]);
-            await service.applyCompanyWhitelist(actionIds, 'company-1');
-            expect(actionIds).toEqual(new Set([
-                'action-1'
-            ]));
-        });
-    });
-    // ==================== Cache invalidation helpers ====================
-    describe('invalidateCompanyMembersCache', ()=>{
-        it('returns 0 without querying when the company feature is disabled', async ()=>{
-            const result = await service.invalidateCompanyMembersCache('company-1');
-            expect(result).toBe(0);
-            expect(mockPermissionRepo.createQueryBuilder).not.toHaveBeenCalled();
-        });
-        it('returns 0 when the company has no members with permissions', async ()=>{
-            mockIamConfigService.isCompanyFeatureEnabled.mockReturnValue(true);
-            mockRawMany(mockPermissionRepo, []);
-            const result = await service.invalidateCompanyMembersCache('company-1');
-            expect(result).toBe(0);
-        });
-        it('invalidates every distinct member user id for the company', async ()=>{
-            mockIamConfigService.isCompanyFeatureEnabled.mockReturnValue(true);
-            mockRawMany(mockPermissionRepo, [
-                {
-                    userId: 'user-1',
-                    branchId: 'branch-1'
-                },
-                {
-                    userId: 'user-2',
-                    branchId: null
-                }
+                cachedEndpoints: 1
+            };
+            mockPermissionCacheService.getMyPermissionsResponse.mockResolvedValue(response);
+            const result = await service.getMyPermissions('user-1', null, 'company-1', [
+                'parent-code'
             ]);
-            mockPermissionCacheService.invalidateUsers.mockResolvedValue(2);
-            const result = await service.invalidateCompanyMembersCache('company-1');
-            expect(mockPermissionCacheService.invalidateUsers).toHaveBeenCalledWith([
-                'user-1',
-                'user-2'
-            ], 'company-1', [
-                'branch-1',
-                null
+            expect(mockPermissionCacheService.getMyPermissionsResponse).toHaveBeenCalledWith('user-1', null, 'company-1', [
+                'parent-code'
             ]);
-            expect(result).toBe(2);
+            expect(result).toBe(response);
         });
     });
     describe('revokeCompanyPermissions', ()=>{
@@ -886,10 +612,7 @@ describe('PermissionService', ()=>{
             ]);
             mockPermissionRepo.find.mockResolvedValue([
                 {
-                    userId: 'user-1'
-                },
-                {
-                    userId: null
+                    sourceId: 'user-1'
                 }
             ]);
             const fakeTxRepo = {
@@ -898,12 +621,14 @@ describe('PermissionService', ()=>{
             const fakeTxRoleRepo = {
                 delete: jest.fn().mockResolvedValue(buildDeleteResult(1))
             };
-            mockPermissionRepo.manager.connection.transaction = jest.fn().mockImplementation((cb)=>cb({
-                    getRepository: jest.fn((target)=>{
-                        if (target === mockRoleRepo.target) return fakeTxRoleRepo;
-                        return fakeTxRepo;
-                    })
-                }));
+            mockDataSourceProvider.getDataSource.mockResolvedValue({
+                transaction: jest.fn().mockImplementation((cb)=>cb({
+                        getRepository: jest.fn((target)=>{
+                            if (target === mockRoleRepo.target) return fakeTxRoleRepo;
+                            return fakeTxRepo;
+                        })
+                    }))
+            });
             await service.revokeCompanyPermissions('company-1');
             expect(fakeTxRepo.delete).toHaveBeenCalledWith(expect.objectContaining({
                 permissionType: _iampermissiontypeenum.IamPermissionType.COMPANY_ACTION
@@ -925,7 +650,7 @@ describe('PermissionService', ()=>{
             mockIamConfigService.isCompanyFeatureEnabled.mockReturnValue(true);
             mockPermissionRepo.find.mockResolvedValue([
                 {
-                    userId: 'user-1'
+                    sourceId: 'user-1'
                 }
             ]);
             mockPermissionRepo.delete.mockResolvedValue(buildDeleteResult(1));

package/cjs/services/role.service.js

@@ -70,7 +70,7 @@ let RoleService = class RoleService extends _classes.ApiService {
             }
         });
         const affectedUserIds = [
-            ...new Set(userRoleRows.map((row)=>row.userId).filter((id)=>!!id))
+            ...new Set(userRoleRows.map((row)=>row.sourceId))
         ];
         await permissionRepo.delete({
             permissionType: _iampermissiontypeenum.IamPermissionType.ROLE_ACTION,

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

@@ -247,13 +247,10 @@ describe('RoleService', ()=>{
             const permissionRepo = (0, _repositorymock.createMockRepository)();
             permissionRepo.find.mockResolvedValue([
                 {
-                    userId: 'user-1'
+                    sourceId: 'user-1'
                 },
                 {
-                    userId: 'user-2'
-                },
-                {
-                    userId: null
+                    sourceId: 'user-2'
                 }
             ]);
             const queryRunner = buildQueryRunner(permissionRepo);
@@ -290,10 +287,10 @@ describe('RoleService', ()=>{
             const permissionRepo = (0, _repositorymock.createMockRepository)();
             permissionRepo.find.mockResolvedValue([
                 {
-                    userId: 'user-1'
+                    sourceId: 'user-1'
                 },
                 {
-                    userId: 'user-1'
+                    sourceId: 'user-1'
                 }
             ]);
             const queryRunner = buildQueryRunner(permissionRepo);

package/dtos/permission.dto.d.ts

@@ -48,6 +48,7 @@ export declare class UserActionResponseDto {
     actionId: string;
     actionCode: string;
     actionName: string;
+    companyId: string | null;
     branchId: string | null;
     createdAt: Date;
 }

package/entities/permission-base.entity.d.ts

@@ -5,7 +5,6 @@ export declare abstract class PermissionBase extends Identity {
     sourceId: string;
     targetType: string;
     targetId: string;
-    userId: string | null;
     validFrom: Date | null;
     validUntil: Date | null;
     reason: string | null;

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

@@ -47,7 +47,7 @@ export 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/fesm/controllers/company-action-permission.controller.spec.js

@@ -50,7 +50,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/fesm/controllers/user-action-permission.controller.js

@@ -48,7 +48,7 @@ export 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/fesm/controllers/user-action-permission.controller.spec.js

@@ -53,7 +53,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/fesm/dtos/permission.dto.js

@@ -285,6 +285,7 @@ export 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);
     }
@@ -319,6 +320,12 @@ _ts_decorate([
     }),
     _ts_metadata("design:type", String)
 ], UserActionResponseDto.prototype, "actionName", void 0);
+_ts_decorate([
+    ApiPropertyOptional({
+        description: 'Company ID (null = global)'
+    }),
+    _ts_metadata("design:type", Object)
+], UserActionResponseDto.prototype, "companyId", void 0);
 _ts_decorate([
     ApiPropertyOptional({
         description: 'Branch ID (null = company-wide)'

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

@@ -32,7 +32,7 @@ import { Column } from 'typeorm';
         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([
@@ -75,15 +75,6 @@ _ts_decorate([
     }),
     _ts_metadata("design:type", String)
 ], PermissionBase.prototype, "targetId", void 0);
-_ts_decorate([
-    Column({
-        type: 'varchar',
-        length: 150,
-        nullable: true,
-        name: 'user_id'
-    }),
-    _ts_metadata("design:type", Object)
-], PermissionBase.prototype, "userId", void 0);
 _ts_decorate([
     Column({
         type: 'timestamp',

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

@@ -77,9 +77,6 @@ UserIamPermissionWithCompany = _ts_decorate([
     Index([
         'permissionType'
     ]),
-    Index([
-        'userId'
-    ]),
     Index([
         'companyId'
     ]),

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

@@ -29,8 +29,5 @@ UserIamPermission = _ts_decorate([
     ]),
     Index([
         'permissionType'
-    ]),
-    Index([
-        'userId'
     ])
 ], UserIamPermission);

package/fesm/modules/iam.module.js

@@ -4,7 +4,7 @@ function _ts_decorate(decorators, target, key, desc) {
     else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-import { PERMISSION_GUARD_CONFIG } from '@flusys/nestjs-shared';
+import { PERMISSION_GUARD_CONFIG, PERMISSIONS_CACHE_PREFIX } from '@flusys/nestjs-shared';
 import { CacheModule, UtilsModule } from '@flusys/nestjs-shared/modules';
 import { Module } from '@nestjs/common';
 import { IAM_MODULE_OPTIONS } from '../config/iam.constants';
@@ -14,7 +14,7 @@ import { PermissionModeHelper } from '../helpers';
 import { ActionService, PermissionService, RoleService } from '../services';
 import { IAMConfigService } from '../services/iam-config.service';
 import { IAMDataSourceService } from '../services/iam-datasource.service';
-import { MY_PERMISSIONS_CACHE_PREFIX, PermissionCacheService } from '../services/permission-cache.service';
+import { PermissionCacheService } from '../services/permission-cache.service';
 export class IAMModule {
     static getControllers(permissionMode, enableCompanyFeature) {
         const baseControllers = [
@@ -59,8 +59,8 @@ export class IAMModule {
             provide: PERMISSION_GUARD_CONFIG,
             useValue: {
                 enableCompanyFeature,
-                userPermissionKeyFormat: `${MY_PERMISSIONS_CACHE_PREFIX}:user:{userId}`,
-                companyPermissionKeyFormat: `${MY_PERMISSIONS_CACHE_PREFIX}:company:{companyId}:branch:{branchId}:user:{userId}`
+                userPermissionKeyFormat: `${PERMISSIONS_CACHE_PREFIX}:user:{userId}`,
+                companyPermissionKeyFormat: `${PERMISSIONS_CACHE_PREFIX}:company:{companyId}:branch:{branchId}:user:{userId}`
             }
         };
     }