@flusys/nestjs-iam 7.0.0-beta.1 → 7.0.1

package/cjs/modules/iam.module.js

@@ -180,9 +180,6 @@ let IAMModule = class IAMModule {
             inject
         };
     }
-    static forFeature(options = {}) {
-        return this.forRoot(options);
-    }
 };
 IAMModule = _ts_decorate([
     (0, _common.Module)({})

package/cjs/modules/iam.module.spec.js

@@ -279,15 +279,4 @@ describe('IAMModule', ()=>{
             });
         });
     });
-    describe('forFeature', ()=>{
-        it('should behave identically to forRoot', ()=>{
-            const options = {
-                includeController: true,
-                bootstrapAppConfig: {
-                    permissionMode: 'RBAC'
-                }
-            };
-            expect(_iammodule.IAMModule.forFeature(options)).toEqual(_iammodule.IAMModule.forRoot(options));
-        });
-    });
 });

package/cjs/services/action.service.js

@@ -301,7 +301,7 @@ let ActionService = class ActionService extends _classes.ApiService {
         return rootNodes;
     }
     constructor(cacheManager, utilsService, iamConfigService, dataSourceProvider, permissionService, permissionCacheService){
-        super('action', cacheManager, utilsService, ActionService.name, true, 'iam', _actionentity.Action, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "iamConfigService", void 0), _define_property(this, "permissionService", void 0), _define_property(this, "permissionCacheService", void 0), // Custom Methods
+        super(_config.IAM_EVENT_ENTITIES.ACTION, cacheManager, utilsService, ActionService.name, true, _config.IAM_EVENT_MODULE, dataSourceProvider, _actionentity.Action), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "iamConfigService", void 0), _define_property(this, "permissionService", void 0), _define_property(this, "permissionCacheService", void 0), // Custom Methods
         _define_property(this, "actionSelectFields", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.iamConfigService = iamConfigService, this.permissionService = permissionService, this.permissionCacheService = permissionCacheService, this.actionSelectFields = [
             'id',
             'code',

package/cjs/services/iam-datasource.service.js

@@ -94,12 +94,9 @@ let IAMDataSourceService = class IAMDataSourceService extends _modules.MultiTena
     getEnableCompanyFeatureForTenant(tenant) {
         return tenant?.enableCompanyFeature ?? this.configService.isCompanyFeatureEnabled();
     }
-    getEnableCompanyFeatureForCurrentTenant() {
-        return this.getEnableCompanyFeatureForTenant(this.getCurrentTenant() ?? undefined);
-    }
     async getIAMEntities() {
         const { getIAMEntitiesByConfig } = await Promise.resolve().then(()=>/*#__PURE__*/ _interop_require_wildcard(require("../entities")));
-        const enableCompanyFeature = this.getEnableCompanyFeatureForCurrentTenant();
+        const enableCompanyFeature = this.getEnableCompanyFeatureForTenant(this.getCurrentTenant() ?? undefined);
         const permissionMode = _helpers.PermissionModeHelper.toString(this.configService.getPermissionMode());
         return getIAMEntitiesByConfig(enableCompanyFeature, permissionMode);
     }

package/cjs/services/iam-datasource.service.spec.js

@@ -50,13 +50,6 @@ describe('IAMDataSourceService', ()=>{
             expect(service.getEnableCompanyFeatureForTenant(undefined)).toBe(true);
         });
     });
-    describe('getEnableCompanyFeatureForCurrentTenant', ()=>{
-        it('falls back to the config service when there is no current request/tenant', ()=>{
-            const service = buildService();
-            mockConfigService.isCompanyFeatureEnabled.mockReturnValue(true);
-            expect(service.getEnableCompanyFeatureForCurrentTenant()).toBe(true);
-        });
-    });
     describe('getIAMEntities', ()=>{
         it('returns Action + non-company permission + role entities for RBAC mode', async ()=>{
             mockConfigService.isCompanyFeatureEnabled.mockReturnValue(false);

package/cjs/services/role.service.js

@@ -129,9 +129,6 @@ let RoleService = class RoleService extends _classes.ApiService {
             await this.permissionCacheService.invalidateUsers(affectedUserIds);
         }
     }
-    resolveEntity() {
-        return this.iamConfigService.isCompanyFeatureEnabled() ? _rolewithcompanyentity.RoleWithCompany : _roleentity.Role;
-    }
     // Entity Conversion
     async convertSingleDtoToEntity(dto, user) {
         const entity = await super.convertSingleDtoToEntity(dto, user);
@@ -204,7 +201,7 @@ let RoleService = class RoleService extends _classes.ApiService {
         };
     }
     constructor(cacheManager, utilsService, iamConfigService, dataSourceProvider, permissionCacheService){
-        super('role', cacheManager, utilsService, RoleService.name, true, 'iam', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "iamConfigService", void 0), _define_property(this, "permissionCacheService", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.iamConfigService = iamConfigService, this.permissionCacheService = permissionCacheService;
+        super(_config.IAM_EVENT_ENTITIES.ROLE, cacheManager, utilsService, RoleService.name, true, _config.IAM_EVENT_MODULE, dataSourceProvider, iamConfigService.isCompanyFeatureEnabled() ? _rolewithcompanyentity.RoleWithCompany : _roleentity.Role), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "iamConfigService", void 0), _define_property(this, "permissionCacheService", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.iamConfigService = iamConfigService, this.permissionCacheService = permissionCacheService;
     }
 };
 RoleService = _ts_decorate([

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

@@ -31,6 +31,7 @@ function buildRole(overrides = {}) {
 }
 describe('RoleService', ()=>{
     let service;
+    let module;
     let mockRepo;
     let mockIamConfigService;
     let mockPermissionCacheService;
@@ -44,7 +45,7 @@ describe('RoleService', ()=>{
         mockPermissionCacheService = {
             invalidateUsers: jest.fn()
         };
-        const module = await _testing.Test.createTestingModule({
+        module = await _testing.Test.createTestingModule({
             providers: [
                 _roleservice.RoleService,
                 {
@@ -71,14 +72,16 @@ describe('RoleService', ()=>{
         }).compile();
         service = await module.resolve(_roleservice.RoleService);
     });
-    describe('resolveEntity', ()=>{
-        it('resolves to Role when the company feature is disabled', ()=>{
+    describe('entity selection', ()=>{
+        it('uses Role when the company feature is disabled', async ()=>{
             mockIamConfigService.isCompanyFeatureEnabled.mockReturnValue(false);
-            expect(service.resolveEntity()).toBe(_roleentity.Role);
+            const built = await module.resolve(_roleservice.RoleService);
+            expect(built['_entity']).toBe(_roleentity.Role);
         });
-        it('resolves to RoleWithCompany when the company feature is enabled', ()=>{
+        it('uses RoleWithCompany when the company feature is enabled', async ()=>{
             mockIamConfigService.isCompanyFeatureEnabled.mockReturnValue(true);
-            expect(service.resolveEntity()).toBe(_rolewithcompanyentity.RoleWithCompany);
+            const built = await module.resolve(_roleservice.RoleService);
+            expect(built['_entity']).toBe(_rolewithcompanyentity.RoleWithCompany);
         });
     });
     describe('convertSingleDtoToEntity', ()=>{

package/fesm/modules/iam.module.js

@@ -170,9 +170,6 @@ export class IAMModule {
             inject
         };
     }
-    static forFeature(options = {}) {
-        return this.forRoot(options);
-    }
 }
 IAMModule = _ts_decorate([
     Module({})

package/fesm/modules/iam.module.spec.js

@@ -275,15 +275,4 @@ describe('IAMModule', ()=>{
             });
         });
     });
-    describe('forFeature', ()=>{
-        it('should behave identically to forRoot', ()=>{
-            const options = {
-                includeController: true,
-                bootstrapAppConfig: {
-                    permissionMode: 'RBAC'
-                }
-            };
-            expect(IAMModule.forFeature(options)).toEqual(IAMModule.forRoot(options));
-        });
-    });
 });

package/fesm/services/action.service.js

@@ -29,7 +29,7 @@ import { ApiService, HybridCache } from '@flusys/nestjs-shared/classes';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
 import { BadRequestException, ForbiddenException, Inject, Injectable, Scope } from '@nestjs/common';
 import { In, IsNull } from 'typeorm';
-import { ACTION_MESSAGES, PERMISSION_OPERATION_MESSAGES } from '../config';
+import { ACTION_MESSAGES, IAM_EVENT_ENTITIES, IAM_EVENT_MODULE, PERMISSION_OPERATION_MESSAGES } from '../config';
 import { Action } from '../entities/action.entity';
 import { UserIamPermissionWithCompany } from '../entities/permission-with-company.entity';
 import { UserIamPermission } from '../entities/user-iam-permission.entity';
@@ -291,7 +291,7 @@ export class ActionService extends ApiService {
         return rootNodes;
     }
     constructor(cacheManager, utilsService, iamConfigService, dataSourceProvider, permissionService, permissionCacheService){
-        super('action', cacheManager, utilsService, ActionService.name, true, 'iam', Action, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "iamConfigService", void 0), _define_property(this, "permissionService", void 0), _define_property(this, "permissionCacheService", void 0), // Custom Methods
+        super(IAM_EVENT_ENTITIES.ACTION, cacheManager, utilsService, ActionService.name, true, IAM_EVENT_MODULE, dataSourceProvider, Action), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "iamConfigService", void 0), _define_property(this, "permissionService", void 0), _define_property(this, "permissionCacheService", void 0), // Custom Methods
         _define_property(this, "actionSelectFields", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.iamConfigService = iamConfigService, this.permissionService = permissionService, this.permissionCacheService = permissionCacheService, this.actionSelectFields = [
             'id',
             'code',

package/fesm/services/iam-datasource.service.js

@@ -43,12 +43,9 @@ export class IAMDataSourceService extends MultiTenantDataSourceService {
     getEnableCompanyFeatureForTenant(tenant) {
         return tenant?.enableCompanyFeature ?? this.configService.isCompanyFeatureEnabled();
     }
-    getEnableCompanyFeatureForCurrentTenant() {
-        return this.getEnableCompanyFeatureForTenant(this.getCurrentTenant() ?? undefined);
-    }
     async getIAMEntities() {
         const { getIAMEntitiesByConfig } = await import('../entities');
-        const enableCompanyFeature = this.getEnableCompanyFeatureForCurrentTenant();
+        const enableCompanyFeature = this.getEnableCompanyFeatureForTenant(this.getCurrentTenant() ?? undefined);
         const permissionMode = PermissionModeHelper.toString(this.configService.getPermissionMode());
         return getIAMEntitiesByConfig(enableCompanyFeature, permissionMode);
     }

package/fesm/services/iam-datasource.service.spec.js

@@ -46,13 +46,6 @@ describe('IAMDataSourceService', ()=>{
             expect(service.getEnableCompanyFeatureForTenant(undefined)).toBe(true);
         });
     });
-    describe('getEnableCompanyFeatureForCurrentTenant', ()=>{
-        it('falls back to the config service when there is no current request/tenant', ()=>{
-            const service = buildService();
-            mockConfigService.isCompanyFeatureEnabled.mockReturnValue(true);
-            expect(service.getEnableCompanyFeatureForCurrentTenant()).toBe(true);
-        });
-    });
     describe('getIAMEntities', ()=>{
         it('returns Action + non-company permission + role entities for RBAC mode', async ()=>{
             mockConfigService.isCompanyFeatureEnabled.mockReturnValue(false);

package/fesm/services/role.service.js

@@ -30,7 +30,7 @@ import { UtilsService } from '@flusys/nestjs-shared/modules';
 import { applyCompanyFilter } from '@flusys/nestjs-shared/utils';
 import { ForbiddenException, Inject, Injectable, Scope } from '@nestjs/common';
 import { In, IsNull } from 'typeorm';
-import { ROLE_MESSAGES } from '../config';
+import { IAM_EVENT_ENTITIES, IAM_EVENT_MODULE, ROLE_MESSAGES } from '../config';
 import { UserIamPermissionWithCompany } from '../entities/permission-with-company.entity';
 import { RoleWithCompany } from '../entities/role-with-company.entity';
 import { Role } from '../entities/role.entity';
@@ -119,9 +119,6 @@ export class RoleService extends ApiService {
             await this.permissionCacheService.invalidateUsers(affectedUserIds);
         }
     }
-    resolveEntity() {
-        return this.iamConfigService.isCompanyFeatureEnabled() ? RoleWithCompany : Role;
-    }
     // Entity Conversion
     async convertSingleDtoToEntity(dto, user) {
         const entity = await super.convertSingleDtoToEntity(dto, user);
@@ -194,7 +191,7 @@ export class RoleService extends ApiService {
         };
     }
     constructor(cacheManager, utilsService, iamConfigService, dataSourceProvider, permissionCacheService){
-        super('role', cacheManager, utilsService, RoleService.name, true, 'iam', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "iamConfigService", void 0), _define_property(this, "permissionCacheService", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.iamConfigService = iamConfigService, this.permissionCacheService = permissionCacheService;
+        super(IAM_EVENT_ENTITIES.ROLE, cacheManager, utilsService, RoleService.name, true, IAM_EVENT_MODULE, dataSourceProvider, iamConfigService.isCompanyFeatureEnabled() ? RoleWithCompany : Role), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "iamConfigService", void 0), _define_property(this, "permissionCacheService", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.iamConfigService = iamConfigService, this.permissionCacheService = permissionCacheService;
     }
 }
 RoleService = _ts_decorate([

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

@@ -27,6 +27,7 @@ function buildRole(overrides = {}) {
 }
 describe('RoleService', ()=>{
     let service;
+    let module;
     let mockRepo;
     let mockIamConfigService;
     let mockPermissionCacheService;
@@ -40,7 +41,7 @@ describe('RoleService', ()=>{
         mockPermissionCacheService = {
             invalidateUsers: jest.fn()
         };
-        const module = await Test.createTestingModule({
+        module = await Test.createTestingModule({
             providers: [
                 RoleService,
                 {
@@ -67,14 +68,16 @@ describe('RoleService', ()=>{
         }).compile();
         service = await module.resolve(RoleService);
     });
-    describe('resolveEntity', ()=>{
-        it('resolves to Role when the company feature is disabled', ()=>{
+    describe('entity selection', ()=>{
+        it('uses Role when the company feature is disabled', async ()=>{
             mockIamConfigService.isCompanyFeatureEnabled.mockReturnValue(false);
-            expect(service.resolveEntity()).toBe(Role);
+            const built = await module.resolve(RoleService);
+            expect(built['_entity']).toBe(Role);
         });
-        it('resolves to RoleWithCompany when the company feature is enabled', ()=>{
+        it('uses RoleWithCompany when the company feature is enabled', async ()=>{
             mockIamConfigService.isCompanyFeatureEnabled.mockReturnValue(true);
-            expect(service.resolveEntity()).toBe(RoleWithCompany);
+            const built = await module.resolve(RoleService);
+            expect(built['_entity']).toBe(RoleWithCompany);
         });
     });
     describe('convertSingleDtoToEntity', ()=>{

package/interfaces/iam-module-options.interface.d.ts

@@ -1,4 +1,4 @@
-import { IBootstrapAppConfig, IDataSourceServiceOptions, IDynamicModuleConfig, IModuleOptionsFactory } from '@flusys/nestjs-core';
+import { IBootstrapAppConfig, IDataSourceServiceOptions, IDynamicModuleConfig } from '@flusys/nestjs-core';
 import { IModuleEventsConfig } from '@flusys/nestjs-shared/interfaces';
 import { ModuleMetadata, Type } from '@nestjs/common';
 export interface IIAMModuleConfig extends IDataSourceServiceOptions {
@@ -8,9 +8,8 @@ export interface IAMModuleOptions extends IDynamicModuleConfig {
     bootstrapAppConfig?: IBootstrapAppConfig;
     config?: IIAMModuleConfig;
 }
-export interface IAMOptionsFactory extends IModuleOptionsFactory<IIAMModuleConfig> {
+export interface IAMOptionsFactory {
     createIAMOptions(): Promise<IIAMModuleConfig> | IIAMModuleConfig;
-    createOptions(): Promise<IIAMModuleConfig> | IIAMModuleConfig;
 }
 export interface IAMModuleAsyncOptions extends Pick<ModuleMetadata, 'imports'>, IDynamicModuleConfig {
     bootstrapAppConfig?: IBootstrapAppConfig;

package/modules/iam.module.d.ts

@@ -9,5 +9,4 @@ export declare class IAMModule {
     static forRootAsync(asyncOptions: IAMModuleAsyncOptions): DynamicModule;
     private static createAsyncProviders;
     private static createAsyncOptionsProvider;
-    static forFeature(options?: IAMModuleOptions): DynamicModule;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flusys/nestjs-iam",
-  "version": "7.0.0-beta.1",
+  "version": "7.0.1",
   "description": "Identity and Access Management (IAM) module for NestJS applications",
   "main": "cjs/index.js",
   "module": "fesm/index.js",
@@ -90,7 +90,7 @@
     "express": "^5.0.0"
   },
   "dependencies": {
-    "@flusys/nestjs-core": "7.0.0-beta.1",
-    "@flusys/nestjs-shared": "7.0.0-beta.1"
+    "@flusys/nestjs-core": "7.0.1",
+    "@flusys/nestjs-shared": "7.0.1"
   }
 }

package/services/iam-datasource.service.d.ts

@@ -14,7 +14,6 @@ export declare class IAMDataSourceService extends MultiTenantDataSourceService {
     constructor(configService: IAMConfigService, request?: Request);
     private static buildParentOptions;
     getEnableCompanyFeatureForTenant(tenant?: ITenantDatabaseConfig): boolean;
-    getEnableCompanyFeatureForCurrentTenant(): boolean;
     getIAMEntities(): Promise<any[]>;
     protected createDataSourceFromConfig(config: IDatabaseConfig): Promise<DataSource>;
 }

package/services/role.service.d.ts

@@ -2,7 +2,7 @@ import { ApiService, HybridCache } from '@flusys/nestjs-shared/classes';
 import { DeleteDto } from '@flusys/nestjs-shared/dtos';
 import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
-import { EntityTarget, QueryRunner, SelectQueryBuilder } from 'typeorm';
+import { QueryRunner, SelectQueryBuilder } from 'typeorm';
 import { CreateRoleDto, UpdateRoleDto } from '../dtos/role.dto';
 import { RoleBase } from '../entities/role-base.entity';
 import { IRole } from '../interfaces/role.interface';
@@ -17,7 +17,6 @@ export declare class RoleService extends ApiService<CreateRoleDto, UpdateRoleDto
     constructor(cacheManager: HybridCache, utilsService: UtilsService, iamConfigService: IAMConfigService, dataSourceProvider: IAMDataSourceService, permissionCacheService: PermissionCacheService);
     protected beforeUpdateOperation(dto: UpdateRoleDto | UpdateRoleDto[], _user: ILoggedUserInfo | null, _queryRunner: QueryRunner): Promise<void>;
     protected beforeDeleteOperation(dto: DeleteDto, user: ILoggedUserInfo | null, queryRunner: QueryRunner): Promise<void>;
-    protected resolveEntity(): EntityTarget<RoleBase>;
     convertSingleDtoToEntity(dto: CreateRoleDto | UpdateRoleDto, user: ILoggedUserInfo | null): Promise<RoleBase>;
     getSelectQuery(query: SelectQueryBuilder<RoleBase>, _user: ILoggedUserInfo | null, select?: string[]): Promise<{
         query: SelectQueryBuilder<RoleBase>;