@flusys/nestjs-iam 5.1.1 → 5.1.3

package/cjs/dtos/action.dto.js

@@ -25,7 +25,9 @@ _export(exports, {
         return UpdateActionDto;
     }
 });
+const _dtos = require("@flusys/nestjs-shared/dtos");
 const _swagger = require("@nestjs/swagger");
+const _classtransformer = require("class-transformer");
 const _classvalidator = require("class-validator");
 const _enums = require("../enums");
 const _types = require("../types");
@@ -158,106 +160,65 @@ _ts_decorate([
     (0, _classvalidator.IsNotEmpty)(),
     _ts_metadata("design:type", String)
 ], UpdateActionDto.prototype, "id", void 0);
-let ActionResponseDto = class ActionResponseDto {
-    constructor(){
-        _define_property(this, "id", void 0);
-        _define_property(this, "readOnly", void 0);
-        _define_property(this, "name", void 0);
-        _define_property(this, "description", void 0);
-        _define_property(this, "code", void 0);
-        _define_property(this, "actionType", void 0);
-        _define_property(this, "permissionLogic", void 0);
-        _define_property(this, "parentId", void 0);
-        _define_property(this, "serial", void 0);
-        _define_property(this, "isActive", void 0);
-        _define_property(this, "createdAt", void 0);
-        _define_property(this, "updatedAt", void 0);
-        _define_property(this, "deletedAt", void 0);
-        _define_property(this, "createdById", void 0);
-        _define_property(this, "updatedById", void 0);
-        _define_property(this, "deletedById", void 0);
+let ActionResponseDto = class ActionResponseDto extends _dtos.IdentityResponseDto {
+    constructor(...args){
+        super(...args), _define_property(this, "readOnly", void 0), _define_property(this, "name", void 0), _define_property(this, "description", void 0), _define_property(this, "code", void 0), _define_property(this, "actionType", void 0), _define_property(this, "permissionLogic", void 0), _define_property(this, "parentId", void 0), _define_property(this, "serial", void 0), _define_property(this, "isActive", void 0);
     }
 };
 _ts_decorate([
-    (0, _swagger.ApiProperty)(),
-    _ts_metadata("design:type", String)
-], ActionResponseDto.prototype, "id", void 0);
-_ts_decorate([
+    (0, _classtransformer.Expose)(),
     (0, _swagger.ApiProperty)(),
     _ts_metadata("design:type", Boolean)
 ], ActionResponseDto.prototype, "readOnly", void 0);
 _ts_decorate([
+    (0, _classtransformer.Expose)(),
     (0, _swagger.ApiProperty)(),
     _ts_metadata("design:type", String)
 ], ActionResponseDto.prototype, "name", void 0);
 _ts_decorate([
+    (0, _classtransformer.Expose)(),
     (0, _swagger.ApiProperty)(),
     _ts_metadata("design:type", Object)
 ], ActionResponseDto.prototype, "description", void 0);
 _ts_decorate([
+    (0, _classtransformer.Expose)(),
     (0, _swagger.ApiProperty)(),
     _ts_metadata("design:type", Object)
 ], ActionResponseDto.prototype, "code", void 0);
 _ts_decorate([
+    (0, _classtransformer.Expose)(),
     (0, _swagger.ApiProperty)({
         enum: _enums.ActionType
     }),
     _ts_metadata("design:type", typeof _enums.ActionType === "undefined" ? Object : _enums.ActionType)
 ], ActionResponseDto.prototype, "actionType", void 0);
 _ts_decorate([
+    (0, _classtransformer.Expose)(),
     (0, _swagger.ApiProperty)(),
     _ts_metadata("design:type", Object)
 ], ActionResponseDto.prototype, "permissionLogic", void 0);
 _ts_decorate([
+    (0, _classtransformer.Expose)(),
     (0, _swagger.ApiProperty)(),
     _ts_metadata("design:type", Object)
 ], ActionResponseDto.prototype, "parentId", void 0);
 _ts_decorate([
+    (0, _classtransformer.Expose)(),
     (0, _swagger.ApiProperty)(),
     _ts_metadata("design:type", Object)
 ], ActionResponseDto.prototype, "serial", void 0);
 _ts_decorate([
+    (0, _classtransformer.Expose)(),
     (0, _swagger.ApiProperty)(),
     _ts_metadata("design:type", Boolean)
 ], ActionResponseDto.prototype, "isActive", void 0);
-_ts_decorate([
-    (0, _swagger.ApiProperty)(),
-    _ts_metadata("design:type", typeof Date === "undefined" ? Object : Date)
-], ActionResponseDto.prototype, "createdAt", void 0);
-_ts_decorate([
-    (0, _swagger.ApiProperty)(),
-    _ts_metadata("design:type", typeof Date === "undefined" ? Object : Date)
-], ActionResponseDto.prototype, "updatedAt", void 0);
-_ts_decorate([
-    (0, _swagger.ApiProperty)({
-        required: false
-    }),
-    _ts_metadata("design:type", Object)
-], ActionResponseDto.prototype, "deletedAt", void 0);
-_ts_decorate([
-    (0, _swagger.ApiProperty)({
-        required: false
-    }),
-    _ts_metadata("design:type", Object)
-], ActionResponseDto.prototype, "createdById", void 0);
-_ts_decorate([
-    (0, _swagger.ApiProperty)({
-        required: false
-    }),
-    _ts_metadata("design:type", Object)
-], ActionResponseDto.prototype, "updatedById", void 0);
-_ts_decorate([
-    (0, _swagger.ApiProperty)({
-        required: false
-    }),
-    _ts_metadata("design:type", Object)
-], ActionResponseDto.prototype, "deletedById", void 0);
 let ActionTreeDto = class ActionTreeDto extends ActionResponseDto {
     constructor(...args){
         super(...args), _define_property(this, "children", void 0);
     }
 };
 _ts_decorate([
+    (0, _classtransformer.Expose)(),
     (0, _swagger.ApiProperty)({
         type: ()=>[
                 ActionTreeDto

package/cjs/dtos/role.dto.js

@@ -19,7 +19,9 @@ _export(exports, {
         return UpdateRoleDto;
     }
 });
+const _dtos = require("@flusys/nestjs-shared/dtos");
 const _swagger = require("@nestjs/swagger");
+const _classtransformer = require("class-transformer");
 const _classvalidator = require("class-validator");
 function _define_property(obj, key, value) {
     if (key in obj) {
@@ -116,80 +118,38 @@ _ts_decorate([
     (0, _classvalidator.IsNotEmpty)(),
     _ts_metadata("design:type", String)
 ], UpdateRoleDto.prototype, "id", void 0);
-let RoleResponseDto = class RoleResponseDto {
-    constructor(){
-        _define_property(this, "id", void 0);
-        _define_property(this, "readOnly", void 0);
-        _define_property(this, "name", void 0);
-        _define_property(this, "description", void 0);
-        _define_property(this, "companyId", void 0);
-        _define_property(this, "isActive", void 0);
-        _define_property(this, "serial", void 0);
-        _define_property(this, "createdAt", void 0);
-        _define_property(this, "updatedAt", void 0);
-        _define_property(this, "deletedAt", void 0);
-        _define_property(this, "createdById", void 0);
-        _define_property(this, "updatedById", void 0);
-        _define_property(this, "deletedById", void 0);
+let RoleResponseDto = class RoleResponseDto extends _dtos.IdentityResponseDto {
+    constructor(...args){
+        super(...args), _define_property(this, "readOnly", void 0), _define_property(this, "name", void 0), _define_property(this, "description", void 0), _define_property(this, "companyId", void 0), _define_property(this, "isActive", void 0), _define_property(this, "serial", void 0);
     }
 };
 _ts_decorate([
-    (0, _swagger.ApiProperty)(),
-    _ts_metadata("design:type", String)
-], RoleResponseDto.prototype, "id", void 0);
-_ts_decorate([
+    (0, _classtransformer.Expose)(),
     (0, _swagger.ApiProperty)(),
     _ts_metadata("design:type", Boolean)
 ], RoleResponseDto.prototype, "readOnly", void 0);
 _ts_decorate([
+    (0, _classtransformer.Expose)(),
     (0, _swagger.ApiProperty)(),
     _ts_metadata("design:type", String)
 ], RoleResponseDto.prototype, "name", void 0);
 _ts_decorate([
+    (0, _classtransformer.Expose)(),
     (0, _swagger.ApiProperty)(),
     _ts_metadata("design:type", Object)
 ], RoleResponseDto.prototype, "description", void 0);
 _ts_decorate([
+    (0, _classtransformer.Expose)(),
     (0, _swagger.ApiProperty)(),
     _ts_metadata("design:type", Object)
 ], RoleResponseDto.prototype, "companyId", void 0);
 _ts_decorate([
+    (0, _classtransformer.Expose)(),
     (0, _swagger.ApiProperty)(),
     _ts_metadata("design:type", Boolean)
 ], RoleResponseDto.prototype, "isActive", void 0);
 _ts_decorate([
+    (0, _classtransformer.Expose)(),
     (0, _swagger.ApiProperty)(),
     _ts_metadata("design:type", Object)
 ], RoleResponseDto.prototype, "serial", void 0);
-_ts_decorate([
-    (0, _swagger.ApiProperty)(),
-    _ts_metadata("design:type", typeof Date === "undefined" ? Object : Date)
-], RoleResponseDto.prototype, "createdAt", void 0);
-_ts_decorate([
-    (0, _swagger.ApiProperty)(),
-    _ts_metadata("design:type", typeof Date === "undefined" ? Object : Date)
-], RoleResponseDto.prototype, "updatedAt", void 0);
-_ts_decorate([
-    (0, _swagger.ApiProperty)({
-        required: false
-    }),
-    _ts_metadata("design:type", Object)
-], RoleResponseDto.prototype, "deletedAt", void 0);
-_ts_decorate([
-    (0, _swagger.ApiProperty)({
-        required: false
-    }),
-    _ts_metadata("design:type", Object)
-], RoleResponseDto.prototype, "createdById", void 0);
-_ts_decorate([
-    (0, _swagger.ApiProperty)({
-        required: false
-    }),
-    _ts_metadata("design:type", Object)
-], RoleResponseDto.prototype, "updatedById", void 0);
-_ts_decorate([
-    (0, _swagger.ApiProperty)({
-        required: false
-    }),
-    _ts_metadata("design:type", Object)
-], RoleResponseDto.prototype, "deletedById", void 0);

package/cjs/services/action.service.js

@@ -44,13 +44,7 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-let ActionService = class ActionService extends _classes.RequestScopedApiService {
-    resolveEntity() {
-        return _actionentity.Action;
-    }
-    getDataSourceProvider() {
-        return this.dataSourceProvider;
-    }
+let ActionService = class ActionService extends _classes.ApiService {
     // Query Customization
     async getSelectQuery(query, _user, select) {
         if (!select?.length) {
@@ -115,7 +109,7 @@ let ActionService = class ActionService extends _classes.RequestScopedApiService
         }
     }
     /** Get actions available for permission assignment (filtered by company whitelist) */ async getActionsForPermission(user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         this.requireUser(user, 'getActionsForPermission');
         let whereClause = {};
         if (this.iamConfigService.isCompanyFeatureEnabled() && user.companyId) {
@@ -134,7 +128,7 @@ let ActionService = class ActionService extends _classes.RequestScopedApiService
         return actions.map((action)=>this.convertEntityToResponseDto(action, false));
     }
     /** Get actions in hierarchical tree structure */ async getActionTree(user, search, isActive, withDeleted = false) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         this.requireUser(user, 'getActionTree');
         const query = this.repository.createQueryBuilder('action');
         if (!withDeleted) {
@@ -183,8 +177,8 @@ let ActionService = class ActionService extends _classes.RequestScopedApiService
         return rootNodes;
     }
     constructor(cacheManager, utilsService, iamConfigService, dataSourceProvider, permissionService){
-        super('action', null, cacheManager, utilsService, ActionService.name, true, 'iam'), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "iamConfigService", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "permissionService", void 0), // Custom Methods
-        _define_property(this, "actionSelectFields", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.iamConfigService = iamConfigService, this.dataSourceProvider = dataSourceProvider, this.permissionService = permissionService, this.actionSelectFields = [
+        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), // Custom Methods
+        _define_property(this, "actionSelectFields", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.iamConfigService = iamConfigService, this.permissionService = permissionService, this.actionSelectFields = [
             'id',
             'code',
             'name',

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

@@ -9,7 +9,6 @@ Object.defineProperty(exports, "IAMDataSourceService", {
     }
 });
 const _modules = require("@flusys/nestjs-shared/modules");
-const _constants = require("@flusys/nestjs-shared/constants");
 const _common = require("@nestjs/common");
 const _core = require("@nestjs/core");
 const _express = require("express");
@@ -84,7 +83,6 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 let IAMDataSourceService = class IAMDataSourceService extends _modules.MultiTenantDataSourceService {
-    // Factory Methods
     static buildParentOptions(options) {
         return {
             bootstrapAppConfig: options.bootstrapAppConfig,
@@ -93,80 +91,26 @@ let IAMDataSourceService = class IAMDataSourceService extends _modules.MultiTena
             tenants: options.config?.tenants
         };
     }
-    // Feature Flags
     getEnableCompanyFeatureForTenant(tenant) {
         return tenant?.enableCompanyFeature ?? this.configService.isCompanyFeatureEnabled();
     }
     getEnableCompanyFeatureForCurrentTenant() {
         return this.getEnableCompanyFeatureForTenant(this.getCurrentTenant() ?? undefined);
     }
-    // Entity Management
     async getIAMEntities() {
         const { getIAMEntitiesByConfig } = await Promise.resolve().then(()=>/*#__PURE__*/ _interop_require_wildcard(require("../entities")));
         const enableCompanyFeature = this.getEnableCompanyFeatureForCurrentTenant();
         const permissionMode = _helpers.PermissionModeHelper.toString(this.configService.getPermissionMode());
         return getIAMEntitiesByConfig(enableCompanyFeature, permissionMode);
     }
-    // Overrides
     async createDataSourceFromConfig(config) {
         const entities = await this.getIAMEntities();
         return await super.createDataSourceFromConfig(config, entities);
     }
-    async getSingleDataSource() {
-        if (!IAMDataSourceService.singleDataSource) {
-            if (IAMDataSourceService.singleConnectionLock) {
-                return IAMDataSourceService.singleConnectionLock;
-            }
-            const lockPromise = (async ()=>{
-                const config = this.getDefaultDatabaseConfig();
-                if (!config) {
-                    throw new _common.InternalServerErrorException({
-                        message: 'Default database config is not available',
-                        messageKey: _constants.SYSTEM_MESSAGES.DATABASE_CONFIG_NOT_AVAILABLE
-                    });
-                }
-                const ds = await this.createDataSourceFromConfig(config);
-                IAMDataSourceService.singleDataSource = ds;
-                IAMDataSourceService.initialized = true;
-                return ds;
-            })();
-            IAMDataSourceService.singleConnectionLock = lockPromise;
-            try {
-                return await lockPromise;
-            } finally{
-                IAMDataSourceService.singleConnectionLock = null;
-            }
-        }
-        return IAMDataSourceService.singleDataSource;
-    }
-    async getOrCreateTenantConnection(tenant) {
-        // Return existing initialized connection from IAM-specific cache
-        const existing = IAMDataSourceService.tenantConnections.get(tenant.id);
-        if (existing?.isInitialized) {
-            return existing;
-        }
-        // If another request is creating this tenant's connection, wait for it
-        const pendingConnection = IAMDataSourceService.connectionLocks.get(tenant.id);
-        if (pendingConnection) {
-            return pendingConnection;
-        }
-        // Create connection with lock to prevent race conditions
-        const config = this.buildTenantDatabaseConfig(tenant);
-        const connectionPromise = this.createDataSourceFromConfig(config);
-        IAMDataSourceService.connectionLocks.set(tenant.id, connectionPromise);
-        try {
-            const dataSource = await connectionPromise;
-            IAMDataSourceService.tenantConnections.set(tenant.id, dataSource);
-            return dataSource;
-        } finally{
-            IAMDataSourceService.connectionLocks.delete(tenant.id);
-        }
-    }
     constructor(configService, request){
         super(IAMDataSourceService.buildParentOptions(configService.getOptions()), request), _define_property(this, "configService", void 0), this.configService = configService;
     }
 };
-// Override parent's static properties to have IAM-specific cache
 _define_property(IAMDataSourceService, "tenantConnections", new Map());
 _define_property(IAMDataSourceService, "singleDataSource", null);
 _define_property(IAMDataSourceService, "tenantsRegistry", new Map());

package/cjs/services/role.service.js

@@ -43,13 +43,10 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-let RoleService = class RoleService extends _classes.RequestScopedApiService {
+let RoleService = class RoleService extends _classes.ApiService {
     resolveEntity() {
         return this.iamConfigService.isCompanyFeatureEnabled() ? _rolewithcompanyentity.RoleWithCompany : _roleentity.Role;
     }
-    getDataSourceProvider() {
-        return this.dataSourceProvider;
-    }
     // Entity Conversion
     async convertSingleDtoToEntity(dto, user) {
         const entity = await super.convertSingleDtoToEntity(dto, user);
@@ -121,7 +118,7 @@ let RoleService = class RoleService extends _classes.RequestScopedApiService {
         };
     }
     constructor(cacheManager, utilsService, iamConfigService, dataSourceProvider){
-        super('role', null, cacheManager, utilsService, RoleService.name, true, 'iam'), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "iamConfigService", void 0), _define_property(this, "dataSourceProvider", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.iamConfigService = iamConfigService, this.dataSourceProvider = dataSourceProvider;
+        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), this.cacheManager = cacheManager, this.utilsService = utilsService, this.iamConfigService = iamConfigService;
     }
 };
 RoleService = _ts_decorate([

package/dtos/action.dto.d.ts

@@ -1,3 +1,4 @@
+import { IdentityResponseDto } from '@flusys/nestjs-shared/dtos';
 import { ActionType } from '../enums';
 import { LogicNode } from '../types';
 export declare class CreateActionDto {
@@ -14,8 +15,7 @@ declare const UpdateActionDto_base: import("@nestjs/common").Type<Partial<Create
 export declare class UpdateActionDto extends UpdateActionDto_base {
     id: string;
 }
-export declare class ActionResponseDto {
-    id: string;
+export declare class ActionResponseDto extends IdentityResponseDto {
     readOnly: boolean;
     name: string;
     description: string | null;
@@ -25,12 +25,6 @@ export declare class ActionResponseDto {
     parentId: string | null;
     serial: number | null;
     isActive: boolean;
-    createdAt: Date;
-    updatedAt: Date;
-    deletedAt: Date | null;
-    createdById: string | null;
-    updatedById: string | null;
-    deletedById: string | null;
 }
 export declare class ActionTreeDto extends ActionResponseDto {
     children: ActionTreeDto[];

package/dtos/role.dto.d.ts

@@ -1,3 +1,4 @@
+import { IdentityResponseDto } from '@flusys/nestjs-shared/dtos';
 export declare class CreateRoleDto {
     name: string;
     description?: string;
@@ -9,19 +10,12 @@ declare const UpdateRoleDto_base: import("@nestjs/common").Type<Partial<CreateRo
 export declare class UpdateRoleDto extends UpdateRoleDto_base {
     id: string;
 }
-export declare class RoleResponseDto {
-    id: string;
+export declare class RoleResponseDto extends IdentityResponseDto {
     readOnly: boolean;
     name: string;
     description: string | null;
     companyId: string | null;
     isActive: boolean;
     serial: number | null;
-    createdAt: Date;
-    updatedAt: Date;
-    deletedAt: Date | null;
-    createdById: string | null;
-    updatedById: string | null;
-    deletedById: string | null;
 }
 export {};

package/fesm/dtos/action.dto.js

@@ -20,7 +20,9 @@ function _ts_decorate(decorators, target, key, desc) {
 function _ts_metadata(k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
+import { IdentityResponseDto } from '@flusys/nestjs-shared/dtos';
 import { ApiProperty, PartialType } from '@nestjs/swagger';
+import { Expose } from 'class-transformer';
 import { IsBoolean, IsEnum, IsInt, IsNotEmpty, IsOptional, IsString, IsUUID, MaxLength } from 'class-validator';
 import { ActionType } from '../enums';
 import { LogicNode } from '../types';
@@ -131,106 +133,65 @@ _ts_decorate([
     IsNotEmpty(),
     _ts_metadata("design:type", String)
 ], UpdateActionDto.prototype, "id", void 0);
-export class ActionResponseDto {
-    constructor(){
-        _define_property(this, "id", void 0);
-        _define_property(this, "readOnly", void 0);
-        _define_property(this, "name", void 0);
-        _define_property(this, "description", void 0);
-        _define_property(this, "code", void 0);
-        _define_property(this, "actionType", void 0);
-        _define_property(this, "permissionLogic", void 0);
-        _define_property(this, "parentId", void 0);
-        _define_property(this, "serial", void 0);
-        _define_property(this, "isActive", void 0);
-        _define_property(this, "createdAt", void 0);
-        _define_property(this, "updatedAt", void 0);
-        _define_property(this, "deletedAt", void 0);
-        _define_property(this, "createdById", void 0);
-        _define_property(this, "updatedById", void 0);
-        _define_property(this, "deletedById", void 0);
+export class ActionResponseDto extends IdentityResponseDto {
+    constructor(...args){
+        super(...args), _define_property(this, "readOnly", void 0), _define_property(this, "name", void 0), _define_property(this, "description", void 0), _define_property(this, "code", void 0), _define_property(this, "actionType", void 0), _define_property(this, "permissionLogic", void 0), _define_property(this, "parentId", void 0), _define_property(this, "serial", void 0), _define_property(this, "isActive", void 0);
     }
 }
 _ts_decorate([
-    ApiProperty(),
-    _ts_metadata("design:type", String)
-], ActionResponseDto.prototype, "id", void 0);
-_ts_decorate([
+    Expose(),
     ApiProperty(),
     _ts_metadata("design:type", Boolean)
 ], ActionResponseDto.prototype, "readOnly", void 0);
 _ts_decorate([
+    Expose(),
     ApiProperty(),
     _ts_metadata("design:type", String)
 ], ActionResponseDto.prototype, "name", void 0);
 _ts_decorate([
+    Expose(),
     ApiProperty(),
     _ts_metadata("design:type", Object)
 ], ActionResponseDto.prototype, "description", void 0);
 _ts_decorate([
+    Expose(),
     ApiProperty(),
     _ts_metadata("design:type", Object)
 ], ActionResponseDto.prototype, "code", void 0);
 _ts_decorate([
+    Expose(),
     ApiProperty({
         enum: ActionType
     }),
     _ts_metadata("design:type", typeof ActionType === "undefined" ? Object : ActionType)
 ], ActionResponseDto.prototype, "actionType", void 0);
 _ts_decorate([
+    Expose(),
     ApiProperty(),
     _ts_metadata("design:type", Object)
 ], ActionResponseDto.prototype, "permissionLogic", void 0);
 _ts_decorate([
+    Expose(),
     ApiProperty(),
     _ts_metadata("design:type", Object)
 ], ActionResponseDto.prototype, "parentId", void 0);
 _ts_decorate([
+    Expose(),
     ApiProperty(),
     _ts_metadata("design:type", Object)
 ], ActionResponseDto.prototype, "serial", void 0);
 _ts_decorate([
+    Expose(),
     ApiProperty(),
     _ts_metadata("design:type", Boolean)
 ], ActionResponseDto.prototype, "isActive", void 0);
-_ts_decorate([
-    ApiProperty(),
-    _ts_metadata("design:type", typeof Date === "undefined" ? Object : Date)
-], ActionResponseDto.prototype, "createdAt", void 0);
-_ts_decorate([
-    ApiProperty(),
-    _ts_metadata("design:type", typeof Date === "undefined" ? Object : Date)
-], ActionResponseDto.prototype, "updatedAt", void 0);
-_ts_decorate([
-    ApiProperty({
-        required: false
-    }),
-    _ts_metadata("design:type", Object)
-], ActionResponseDto.prototype, "deletedAt", void 0);
-_ts_decorate([
-    ApiProperty({
-        required: false
-    }),
-    _ts_metadata("design:type", Object)
-], ActionResponseDto.prototype, "createdById", void 0);
-_ts_decorate([
-    ApiProperty({
-        required: false
-    }),
-    _ts_metadata("design:type", Object)
-], ActionResponseDto.prototype, "updatedById", void 0);
-_ts_decorate([
-    ApiProperty({
-        required: false
-    }),
-    _ts_metadata("design:type", Object)
-], ActionResponseDto.prototype, "deletedById", void 0);
 export class ActionTreeDto extends ActionResponseDto {
     constructor(...args){
         super(...args), _define_property(this, "children", void 0);
     }
 }
 _ts_decorate([
+    Expose(),
     ApiProperty({
         type: ()=>[
                 ActionTreeDto

package/fesm/dtos/role.dto.js

@@ -20,7 +20,9 @@ function _ts_decorate(decorators, target, key, desc) {
 function _ts_metadata(k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
+import { IdentityResponseDto } from '@flusys/nestjs-shared/dtos';
 import { ApiProperty, PartialType } from '@nestjs/swagger';
+import { Expose } from 'class-transformer';
 import { IsBoolean, IsInt, IsNotEmpty, IsOptional, IsString, IsUUID, MaxLength } from 'class-validator';
 export class CreateRoleDto {
     constructor(){
@@ -95,80 +97,38 @@ _ts_decorate([
     IsNotEmpty(),
     _ts_metadata("design:type", String)
 ], UpdateRoleDto.prototype, "id", void 0);
-export class RoleResponseDto {
-    constructor(){
-        _define_property(this, "id", void 0);
-        _define_property(this, "readOnly", void 0);
-        _define_property(this, "name", void 0);
-        _define_property(this, "description", void 0);
-        _define_property(this, "companyId", void 0);
-        _define_property(this, "isActive", void 0);
-        _define_property(this, "serial", void 0);
-        _define_property(this, "createdAt", void 0);
-        _define_property(this, "updatedAt", void 0);
-        _define_property(this, "deletedAt", void 0);
-        _define_property(this, "createdById", void 0);
-        _define_property(this, "updatedById", void 0);
-        _define_property(this, "deletedById", void 0);
+export class RoleResponseDto extends IdentityResponseDto {
+    constructor(...args){
+        super(...args), _define_property(this, "readOnly", void 0), _define_property(this, "name", void 0), _define_property(this, "description", void 0), _define_property(this, "companyId", void 0), _define_property(this, "isActive", void 0), _define_property(this, "serial", void 0);
     }
 }
 _ts_decorate([
-    ApiProperty(),
-    _ts_metadata("design:type", String)
-], RoleResponseDto.prototype, "id", void 0);
-_ts_decorate([
+    Expose(),
     ApiProperty(),
     _ts_metadata("design:type", Boolean)
 ], RoleResponseDto.prototype, "readOnly", void 0);
 _ts_decorate([
+    Expose(),
     ApiProperty(),
     _ts_metadata("design:type", String)
 ], RoleResponseDto.prototype, "name", void 0);
 _ts_decorate([
+    Expose(),
     ApiProperty(),
     _ts_metadata("design:type", Object)
 ], RoleResponseDto.prototype, "description", void 0);
 _ts_decorate([
+    Expose(),
     ApiProperty(),
     _ts_metadata("design:type", Object)
 ], RoleResponseDto.prototype, "companyId", void 0);
 _ts_decorate([
+    Expose(),
     ApiProperty(),
     _ts_metadata("design:type", Boolean)
 ], RoleResponseDto.prototype, "isActive", void 0);
 _ts_decorate([
+    Expose(),
     ApiProperty(),
     _ts_metadata("design:type", Object)
 ], RoleResponseDto.prototype, "serial", void 0);
-_ts_decorate([
-    ApiProperty(),
-    _ts_metadata("design:type", typeof Date === "undefined" ? Object : Date)
-], RoleResponseDto.prototype, "createdAt", void 0);
-_ts_decorate([
-    ApiProperty(),
-    _ts_metadata("design:type", typeof Date === "undefined" ? Object : Date)
-], RoleResponseDto.prototype, "updatedAt", void 0);
-_ts_decorate([
-    ApiProperty({
-        required: false
-    }),
-    _ts_metadata("design:type", Object)
-], RoleResponseDto.prototype, "deletedAt", void 0);
-_ts_decorate([
-    ApiProperty({
-        required: false
-    }),
-    _ts_metadata("design:type", Object)
-], RoleResponseDto.prototype, "createdById", void 0);
-_ts_decorate([
-    ApiProperty({
-        required: false
-    }),
-    _ts_metadata("design:type", Object)
-], RoleResponseDto.prototype, "updatedById", void 0);
-_ts_decorate([
-    ApiProperty({
-        required: false
-    }),
-    _ts_metadata("design:type", Object)
-], RoleResponseDto.prototype, "deletedById", void 0);

package/fesm/services/action.service.js

@@ -25,7 +25,7 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-import { HybridCache, RequestScopedApiService } from '@flusys/nestjs-shared/classes';
+import { HybridCache, ApiService } from '@flusys/nestjs-shared/classes';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
 import { BadRequestException, Inject, Injectable, Scope } from '@nestjs/common';
 import { In } from 'typeorm';
@@ -34,13 +34,7 @@ import { Action } from '../entities/action.entity';
 import { IAMConfigService } from './iam-config.service';
 import { IAMDataSourceService } from './iam-datasource.service';
 import { PermissionService } from './permission.service';
-export class ActionService extends RequestScopedApiService {
-    resolveEntity() {
-        return Action;
-    }
-    getDataSourceProvider() {
-        return this.dataSourceProvider;
-    }
+export class ActionService extends ApiService {
     // Query Customization
     async getSelectQuery(query, _user, select) {
         if (!select?.length) {
@@ -105,7 +99,7 @@ export class ActionService extends RequestScopedApiService {
         }
     }
     /** Get actions available for permission assignment (filtered by company whitelist) */ async getActionsForPermission(user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         this.requireUser(user, 'getActionsForPermission');
         let whereClause = {};
         if (this.iamConfigService.isCompanyFeatureEnabled() && user.companyId) {
@@ -124,7 +118,7 @@ export class ActionService extends RequestScopedApiService {
         return actions.map((action)=>this.convertEntityToResponseDto(action, false));
     }
     /** Get actions in hierarchical tree structure */ async getActionTree(user, search, isActive, withDeleted = false) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         this.requireUser(user, 'getActionTree');
         const query = this.repository.createQueryBuilder('action');
         if (!withDeleted) {
@@ -173,8 +167,8 @@ export class ActionService extends RequestScopedApiService {
         return rootNodes;
     }
     constructor(cacheManager, utilsService, iamConfigService, dataSourceProvider, permissionService){
-        super('action', null, cacheManager, utilsService, ActionService.name, true, 'iam'), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "iamConfigService", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "permissionService", void 0), // Custom Methods
-        _define_property(this, "actionSelectFields", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.iamConfigService = iamConfigService, this.dataSourceProvider = dataSourceProvider, this.permissionService = permissionService, this.actionSelectFields = [
+        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), // Custom Methods
+        _define_property(this, "actionSelectFields", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.iamConfigService = iamConfigService, this.permissionService = permissionService, this.actionSelectFields = [
             'id',
             'code',
             'name',

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

@@ -26,14 +26,12 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 import { MultiTenantDataSourceService } from '@flusys/nestjs-shared/modules';
-import { SYSTEM_MESSAGES } from '@flusys/nestjs-shared/constants';
-import { Inject, Injectable, InternalServerErrorException, Optional, Scope } from '@nestjs/common';
+import { Inject, Injectable, Optional, Scope } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import { Request } from 'express';
 import { PermissionModeHelper } from '../helpers';
 import { IAMConfigService } from './iam-config.service';
 export class IAMDataSourceService extends MultiTenantDataSourceService {
-    // Factory Methods
     static buildParentOptions(options) {
         return {
             bootstrapAppConfig: options.bootstrapAppConfig,
@@ -42,80 +40,26 @@ export class IAMDataSourceService extends MultiTenantDataSourceService {
             tenants: options.config?.tenants
         };
     }
-    // Feature Flags
     getEnableCompanyFeatureForTenant(tenant) {
         return tenant?.enableCompanyFeature ?? this.configService.isCompanyFeatureEnabled();
     }
     getEnableCompanyFeatureForCurrentTenant() {
         return this.getEnableCompanyFeatureForTenant(this.getCurrentTenant() ?? undefined);
     }
-    // Entity Management
     async getIAMEntities() {
         const { getIAMEntitiesByConfig } = await import('../entities');
         const enableCompanyFeature = this.getEnableCompanyFeatureForCurrentTenant();
         const permissionMode = PermissionModeHelper.toString(this.configService.getPermissionMode());
         return getIAMEntitiesByConfig(enableCompanyFeature, permissionMode);
     }
-    // Overrides
     async createDataSourceFromConfig(config) {
         const entities = await this.getIAMEntities();
         return await super.createDataSourceFromConfig(config, entities);
     }
-    async getSingleDataSource() {
-        if (!IAMDataSourceService.singleDataSource) {
-            if (IAMDataSourceService.singleConnectionLock) {
-                return IAMDataSourceService.singleConnectionLock;
-            }
-            const lockPromise = (async ()=>{
-                const config = this.getDefaultDatabaseConfig();
-                if (!config) {
-                    throw new InternalServerErrorException({
-                        message: 'Default database config is not available',
-                        messageKey: SYSTEM_MESSAGES.DATABASE_CONFIG_NOT_AVAILABLE
-                    });
-                }
-                const ds = await this.createDataSourceFromConfig(config);
-                IAMDataSourceService.singleDataSource = ds;
-                IAMDataSourceService.initialized = true;
-                return ds;
-            })();
-            IAMDataSourceService.singleConnectionLock = lockPromise;
-            try {
-                return await lockPromise;
-            } finally{
-                IAMDataSourceService.singleConnectionLock = null;
-            }
-        }
-        return IAMDataSourceService.singleDataSource;
-    }
-    async getOrCreateTenantConnection(tenant) {
-        // Return existing initialized connection from IAM-specific cache
-        const existing = IAMDataSourceService.tenantConnections.get(tenant.id);
-        if (existing?.isInitialized) {
-            return existing;
-        }
-        // If another request is creating this tenant's connection, wait for it
-        const pendingConnection = IAMDataSourceService.connectionLocks.get(tenant.id);
-        if (pendingConnection) {
-            return pendingConnection;
-        }
-        // Create connection with lock to prevent race conditions
-        const config = this.buildTenantDatabaseConfig(tenant);
-        const connectionPromise = this.createDataSourceFromConfig(config);
-        IAMDataSourceService.connectionLocks.set(tenant.id, connectionPromise);
-        try {
-            const dataSource = await connectionPromise;
-            IAMDataSourceService.tenantConnections.set(tenant.id, dataSource);
-            return dataSource;
-        } finally{
-            IAMDataSourceService.connectionLocks.delete(tenant.id);
-        }
-    }
     constructor(configService, request){
         super(IAMDataSourceService.buildParentOptions(configService.getOptions()), request), _define_property(this, "configService", void 0), this.configService = configService;
     }
 }
-// Override parent's static properties to have IAM-specific cache
 _define_property(IAMDataSourceService, "tenantConnections", new Map());
 _define_property(IAMDataSourceService, "singleDataSource", null);
 _define_property(IAMDataSourceService, "tenantsRegistry", new Map());

package/fesm/services/role.service.js

@@ -25,7 +25,7 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-import { HybridCache, RequestScopedApiService } from '@flusys/nestjs-shared/classes';
+import { HybridCache, ApiService } from '@flusys/nestjs-shared/classes';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
 import { applyCompanyFilter } from '@flusys/nestjs-shared/utils';
 import { Inject, Injectable, Scope } from '@nestjs/common';
@@ -33,13 +33,10 @@ import { RoleWithCompany } from '../entities/role-with-company.entity';
 import { Role } from '../entities/role.entity';
 import { IAMConfigService } from './iam-config.service';
 import { IAMDataSourceService } from './iam-datasource.service';
-export class RoleService extends RequestScopedApiService {
+export class RoleService extends ApiService {
     resolveEntity() {
         return this.iamConfigService.isCompanyFeatureEnabled() ? RoleWithCompany : Role;
     }
-    getDataSourceProvider() {
-        return this.dataSourceProvider;
-    }
     // Entity Conversion
     async convertSingleDtoToEntity(dto, user) {
         const entity = await super.convertSingleDtoToEntity(dto, user);
@@ -111,7 +108,7 @@ export class RoleService extends RequestScopedApiService {
         };
     }
     constructor(cacheManager, utilsService, iamConfigService, dataSourceProvider){
-        super('role', null, cacheManager, utilsService, RoleService.name, true, 'iam'), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "iamConfigService", void 0), _define_property(this, "dataSourceProvider", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.iamConfigService = iamConfigService, this.dataSourceProvider = dataSourceProvider;
+        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), this.cacheManager = cacheManager, this.utilsService = utilsService, this.iamConfigService = iamConfigService;
     }
 }
 RoleService = _ts_decorate([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flusys/nestjs-iam",
-  "version": "5.1.1",
+  "version": "5.1.3",
   "description": "Identity and Access Management (IAM) module for NestJS applications",
   "main": "cjs/index.js",
   "module": "fesm/index.js",
@@ -79,18 +79,18 @@
     }
   },
   "peerDependencies": {
-    "@nestjs/common": "^10.0.0 || ^11.0.0",
-    "@nestjs/config": "^3.0.0 || ^4.0.0",
-    "@nestjs/core": "^10.0.0 || ^11.0.0",
-    "@nestjs/swagger": "^7.0.0 || ^11.0.0",
-    "@nestjs/typeorm": "^10.0.0 || ^11.0.0",
-    "class-transformer": "^0.5.0",
-    "class-validator": "^0.14.0",
+    "@nestjs/common": "^11.0.0",
+    "@nestjs/config": "^4.0.0",
+    "@nestjs/core": "^11.0.0",
+    "@nestjs/swagger": "^11.0.0",
+    "@nestjs/typeorm": "^11.0.0",
+    "class-transformer": "^0.5.1",
+    "class-validator": "^0.14.0 || ^0.15.0",
     "typeorm": "^0.3.0",
-    "express": "^4.18.0"
+    "express": "^4.18.0 || ^5.0.0"
   },
   "dependencies": {
-    "@flusys/nestjs-core": "5.1.1",
-    "@flusys/nestjs-shared": "5.1.1"
+    "@flusys/nestjs-core": "5.1.3",
+    "@flusys/nestjs-shared": "5.1.3"
   }
 }

package/services/action.service.d.ts

@@ -1,22 +1,19 @@
-import { HybridCache, RequestScopedApiService } from '@flusys/nestjs-shared/classes';
+import { HybridCache, ApiService } from '@flusys/nestjs-shared/classes';
 import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
-import { EntityTarget, SelectQueryBuilder } from 'typeorm';
+import { SelectQueryBuilder } from 'typeorm';
 import { CreateActionDto, UpdateActionDto } from '../dtos/action.dto';
 import { ActionBase } from '../entities/action-base.entity';
 import { IAction, IActionTree } from '../interfaces/action.interface';
 import { IAMConfigService } from './iam-config.service';
 import { IAMDataSourceService } from './iam-datasource.service';
 import { PermissionService } from './permission.service';
-export declare class ActionService extends RequestScopedApiService<CreateActionDto, UpdateActionDto, IAction, ActionBase> {
+export declare class ActionService extends ApiService<CreateActionDto, UpdateActionDto, IAction, ActionBase> {
     protected cacheManager: HybridCache;
     protected utilsService: UtilsService;
     private readonly iamConfigService;
-    private readonly dataSourceProvider;
     private readonly permissionService;
     constructor(cacheManager: HybridCache, utilsService: UtilsService, iamConfigService: IAMConfigService, dataSourceProvider: IAMDataSourceService, permissionService: PermissionService);
-    protected resolveEntity(): EntityTarget<ActionBase>;
-    protected getDataSourceProvider(): IAMDataSourceService;
     getSelectQuery(query: SelectQueryBuilder<ActionBase>, _user: ILoggedUserInfo | null, select?: string[]): Promise<{
         query: SelectQueryBuilder<ActionBase>;
         isRaw: boolean;

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

@@ -17,6 +17,4 @@ export declare class IAMDataSourceService extends MultiTenantDataSourceService {
     getEnableCompanyFeatureForCurrentTenant(): boolean;
     getIAMEntities(): Promise<any[]>;
     protected createDataSourceFromConfig(config: IDatabaseConfig): Promise<DataSource>;
-    protected getSingleDataSource(): Promise<DataSource>;
-    protected getOrCreateTenantConnection(tenant: ITenantDatabaseConfig): Promise<DataSource>;
 }

package/services/role.service.d.ts

@@ -1,4 +1,4 @@
-import { HybridCache, RequestScopedApiService } from '@flusys/nestjs-shared/classes';
+import { HybridCache, ApiService } from '@flusys/nestjs-shared/classes';
 import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
 import { EntityTarget, SelectQueryBuilder } from 'typeorm';
@@ -7,14 +7,12 @@ import { RoleBase } from '../entities/role-base.entity';
 import { IRole } from '../interfaces/role.interface';
 import { IAMConfigService } from './iam-config.service';
 import { IAMDataSourceService } from './iam-datasource.service';
-export declare class RoleService extends RequestScopedApiService<CreateRoleDto, UpdateRoleDto, IRole, RoleBase> {
+export declare class RoleService extends ApiService<CreateRoleDto, UpdateRoleDto, IRole, RoleBase> {
     protected cacheManager: HybridCache;
     protected utilsService: UtilsService;
     private readonly iamConfigService;
-    private readonly dataSourceProvider;
     constructor(cacheManager: HybridCache, utilsService: UtilsService, iamConfigService: IAMConfigService, dataSourceProvider: IAMDataSourceService);
     protected resolveEntity(): EntityTarget<RoleBase>;
-    protected getDataSourceProvider(): IAMDataSourceService;
     convertSingleDtoToEntity(dto: CreateRoleDto | UpdateRoleDto, user: ILoggedUserInfo | null): Promise<RoleBase>;
     getSelectQuery(query: SelectQueryBuilder<RoleBase>, _user: ILoggedUserInfo | null, select?: string[]): Promise<{
         query: SelectQueryBuilder<RoleBase>;