@flusys/nestjs-auth 5.1.1 → 5.1.3

package/fesm/dtos/user.dto.js

@@ -21,6 +21,7 @@ function _ts_metadata(k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
+import { Expose } from 'class-transformer';
 import { IsBoolean, IsEmail, IsNotEmpty, IsObject, IsOptional, IsString, IsUUID, MaxLength } from 'class-validator';
 import { IsStrongPassword } from '../validators/password.validator';
 export class CreateUserDto {
@@ -37,6 +38,7 @@ export class CreateUserDto {
     }
 }
 _ts_decorate([
+    Expose(),
     ApiProperty({
         example: 'John Doe',
         description: 'Full name'
@@ -45,6 +47,7 @@ _ts_decorate([
     _ts_metadata("design:type", String)
 ], CreateUserDto.prototype, "name", void 0);
 _ts_decorate([
+    Expose(),
     ApiPropertyOptional({
         example: '+1234567890',
         description: 'Phone number'
@@ -54,6 +57,7 @@ _ts_decorate([
     _ts_metadata("design:type", String)
 ], CreateUserDto.prototype, "phone", void 0);
 _ts_decorate([
+    Expose(),
     ApiProperty({
         example: 'john@example.com',
         description: 'Email address'
@@ -62,6 +66,7 @@ _ts_decorate([
     _ts_metadata("design:type", String)
 ], CreateUserDto.prototype, "email", void 0);
 _ts_decorate([
+    Expose(),
     ApiProperty({
         example: 'SecureP@ss123',
         description: 'Password (must meet complexity requirements)'
@@ -73,6 +78,7 @@ _ts_decorate([
     _ts_metadata("design:type", String)
 ], CreateUserDto.prototype, "password", void 0);
 _ts_decorate([
+    Expose(),
     ApiPropertyOptional({
         description: 'Profile picture file ID'
     }),
@@ -81,6 +87,7 @@ _ts_decorate([
     _ts_metadata("design:type", String)
 ], CreateUserDto.prototype, "profilePictureId", void 0);
 _ts_decorate([
+    Expose(),
     ApiPropertyOptional({
         default: true,
         description: 'Is user active'
@@ -90,6 +97,7 @@ _ts_decorate([
     _ts_metadata("design:type", Boolean)
 ], CreateUserDto.prototype, "isActive", void 0);
 _ts_decorate([
+    Expose(),
     ApiPropertyOptional({
         default: false,
         description: 'Is email verified'
@@ -99,6 +107,7 @@ _ts_decorate([
     _ts_metadata("design:type", Boolean)
 ], CreateUserDto.prototype, "emailVerified", void 0);
 _ts_decorate([
+    Expose(),
     ApiPropertyOptional({
         default: false,
         description: 'Is phone verified'
@@ -108,6 +117,7 @@ _ts_decorate([
     _ts_metadata("design:type", Boolean)
 ], CreateUserDto.prototype, "phoneVerified", void 0);
 _ts_decorate([
+    Expose(),
     ApiPropertyOptional({
         description: 'Additional custom fields'
     }),
@@ -131,6 +141,7 @@ export class UpdateUserDto {
     }
 }
 _ts_decorate([
+    Expose(),
     ApiProperty({
         description: 'User ID'
     }),
@@ -138,6 +149,7 @@ _ts_decorate([
     _ts_metadata("design:type", String)
 ], UpdateUserDto.prototype, "id", void 0);
 _ts_decorate([
+    Expose(),
     ApiPropertyOptional({
         example: 'John Doe',
         description: 'Full name'
@@ -147,6 +159,7 @@ _ts_decorate([
     _ts_metadata("design:type", String)
 ], UpdateUserDto.prototype, "name", void 0);
 _ts_decorate([
+    Expose(),
     ApiPropertyOptional({
         example: '+1234567890',
         description: 'Phone number'
@@ -156,6 +169,7 @@ _ts_decorate([
     _ts_metadata("design:type", String)
 ], UpdateUserDto.prototype, "phone", void 0);
 _ts_decorate([
+    Expose(),
     ApiPropertyOptional({
         example: 'john@example.com',
         description: 'Email address'
@@ -165,6 +179,7 @@ _ts_decorate([
     _ts_metadata("design:type", String)
 ], UpdateUserDto.prototype, "email", void 0);
 _ts_decorate([
+    Expose(),
     ApiPropertyOptional({
         description: 'New password (must meet complexity requirements)'
     }),
@@ -175,6 +190,7 @@ _ts_decorate([
     _ts_metadata("design:type", String)
 ], UpdateUserDto.prototype, "password", void 0);
 _ts_decorate([
+    Expose(),
     ApiPropertyOptional({
         description: 'Current password (required when changing password on own profile)'
     }),
@@ -183,6 +199,7 @@ _ts_decorate([
     _ts_metadata("design:type", String)
 ], UpdateUserDto.prototype, "oldPassword", void 0);
 _ts_decorate([
+    Expose(),
     ApiPropertyOptional({
         description: 'Profile picture file ID'
     }),
@@ -191,6 +208,7 @@ _ts_decorate([
     _ts_metadata("design:type", String)
 ], UpdateUserDto.prototype, "profilePictureId", void 0);
 _ts_decorate([
+    Expose(),
     ApiPropertyOptional({
         description: 'Is user active'
     }),
@@ -199,6 +217,7 @@ _ts_decorate([
     _ts_metadata("design:type", Boolean)
 ], UpdateUserDto.prototype, "isActive", void 0);
 _ts_decorate([
+    Expose(),
     ApiPropertyOptional({
         description: 'Is email verified'
     }),
@@ -207,6 +226,7 @@ _ts_decorate([
     _ts_metadata("design:type", Boolean)
 ], UpdateUserDto.prototype, "emailVerified", void 0);
 _ts_decorate([
+    Expose(),
     ApiPropertyOptional({
         description: 'Is phone verified'
     }),
@@ -215,6 +235,7 @@ _ts_decorate([
     _ts_metadata("design:type", Boolean)
 ], UpdateUserDto.prototype, "phoneVerified", void 0);
 _ts_decorate([
+    Expose(),
     ApiPropertyOptional({
         description: 'Additional custom fields'
     }),
@@ -242,18 +263,21 @@ _ts_decorate([
     }
 }
 _ts_decorate([
+    Expose(),
     ApiProperty({
         example: '550e8400-e29b-41d4-a716-446655440000'
     }),
     _ts_metadata("design:type", String)
 ], UserResponseDto.prototype, "id", void 0);
 _ts_decorate([
+    Expose(),
     ApiProperty({
         example: 'John Doe'
     }),
     _ts_metadata("design:type", String)
 ], UserResponseDto.prototype, "name", void 0);
 _ts_decorate([
+    Expose(),
     ApiPropertyOptional({
         example: '+1-555-123-4567',
         nullable: true
@@ -261,12 +285,14 @@ _ts_decorate([
     _ts_metadata("design:type", Object)
 ], UserResponseDto.prototype, "phone", void 0);
 _ts_decorate([
+    Expose(),
     ApiProperty({
         example: 'john@example.com'
     }),
     _ts_metadata("design:type", String)
 ], UserResponseDto.prototype, "email", void 0);
 _ts_decorate([
+    Expose(),
     ApiPropertyOptional({
         example: 'pic_abc123',
         nullable: true
@@ -274,24 +300,28 @@ _ts_decorate([
     _ts_metadata("design:type", Object)
 ], UserResponseDto.prototype, "profilePictureId", void 0);
 _ts_decorate([
+    Expose(),
     ApiProperty({
         example: true
     }),
     _ts_metadata("design:type", Boolean)
 ], UserResponseDto.prototype, "isActive", void 0);
 _ts_decorate([
+    Expose(),
     ApiProperty({
         example: true
     }),
     _ts_metadata("design:type", Boolean)
 ], UserResponseDto.prototype, "emailVerified", void 0);
 _ts_decorate([
+    Expose(),
     ApiProperty({
         example: false
     }),
     _ts_metadata("design:type", Boolean)
 ], UserResponseDto.prototype, "phoneVerified", void 0);
 _ts_decorate([
+    Expose(),
     ApiPropertyOptional({
         example: '2024-12-18T10:30:00.000Z',
         nullable: true
@@ -299,6 +329,7 @@ _ts_decorate([
     _ts_metadata("design:type", Object)
 ], UserResponseDto.prototype, "lastLoginAt", void 0);
 _ts_decorate([
+    Expose(),
     ApiPropertyOptional({
         example: {
             department: 'Engineering',
@@ -309,18 +340,21 @@ _ts_decorate([
     _ts_metadata("design:type", Object)
 ], UserResponseDto.prototype, "additionalFields", void 0);
 _ts_decorate([
+    Expose(),
     ApiProperty({
         example: '2024-01-15T10:30:00.000Z'
     }),
     _ts_metadata("design:type", typeof Date === "undefined" ? Object : Date)
 ], UserResponseDto.prototype, "createdAt", void 0);
 _ts_decorate([
+    Expose(),
     ApiProperty({
         example: '2024-12-18T14:45:00.000Z'
     }),
     _ts_metadata("design:type", typeof Date === "undefined" ? Object : Date)
 ], UserResponseDto.prototype, "updatedAt", void 0);
 _ts_decorate([
+    Expose(),
     ApiPropertyOptional({
         example: null,
         nullable: true

package/fesm/services/auth-datasource.provider.js

@@ -25,60 +25,13 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-import { MultiTenantDataSourceService, SYSTEM_MESSAGES } from '@flusys/nestjs-shared';
-import { Inject, Injectable, InternalServerErrorException, Optional, Scope } from '@nestjs/common';
+import { MultiTenantDataSourceService } from '@flusys/nestjs-shared';
+import { Inject, Injectable, Optional, Scope } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import { Request } from 'express';
 import { AuthModuleOptions } from '../interfaces/auth-module-options.interface';
 import { AUTH_MODULE_OPTIONS } from '../config/auth.constants';
 export class AuthDataSourceProvider extends MultiTenantDataSourceService {
-    async getSingleDataSource() {
-        if (!AuthDataSourceProvider.singleDataSource) {
-            if (AuthDataSourceProvider.singleConnectionLock) {
-                return AuthDataSourceProvider.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);
-                AuthDataSourceProvider.singleDataSource = ds;
-                AuthDataSourceProvider.initialized = true;
-                return ds;
-            })();
-            AuthDataSourceProvider.singleConnectionLock = lockPromise;
-            try {
-                return await lockPromise;
-            } finally{
-                AuthDataSourceProvider.singleConnectionLock = null;
-            }
-        }
-        return AuthDataSourceProvider.singleDataSource;
-    }
-    async getOrCreateTenantConnection(tenant) {
-        const existing = AuthDataSourceProvider.tenantConnections.get(tenant.id);
-        if (existing?.isInitialized) {
-            return existing;
-        }
-        const pendingConnection = AuthDataSourceProvider.connectionLocks.get(tenant.id);
-        if (pendingConnection) {
-            return pendingConnection;
-        }
-        const config = this.buildTenantDatabaseConfig(tenant);
-        const connectionPromise = this.createDataSourceFromConfig(config);
-        AuthDataSourceProvider.connectionLocks.set(tenant.id, connectionPromise);
-        try {
-            const dataSource = await connectionPromise;
-            AuthDataSourceProvider.tenantConnections.set(tenant.id, dataSource);
-            return dataSource;
-        } finally{
-            AuthDataSourceProvider.connectionLocks.delete(tenant.id);
-        }
-    }
     static buildParentOptions(options) {
         return {
             bootstrapAppConfig: options.bootstrapAppConfig,

package/fesm/services/branch.service.js

@@ -25,20 +25,14 @@ 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';
 import { CompanyBranch } from '../entities/company-branch.entity';
 import { AuthConfigService } from './auth-config.service';
 import { AuthDataSourceProvider } from './auth-datasource.provider';
-export class BranchService extends RequestScopedApiService {
-    resolveEntity() {
-        return CompanyBranch;
-    }
-    getDataSourceProvider() {
-        return this.dataSourceProvider;
-    }
+export class BranchService extends ApiService {
     // Query Customization
     async getSelectQuery(query, _user, select) {
         if (!select?.length) {
@@ -46,6 +40,8 @@ export class BranchService extends RequestScopedApiService {
                 'id',
                 'name',
                 'slug',
+                'email',
+                'phone',
                 'isActive',
                 'createdAt'
             ];
@@ -79,7 +75,7 @@ export class BranchService extends RequestScopedApiService {
         return result;
     }
     constructor(cacheManager, utilsService, dataSourceProvider, authConfig){
-        super('company_branch', null, cacheManager, utilsService, BranchService.name, true, 'auth'), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "authConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.dataSourceProvider = dataSourceProvider, this.authConfig = authConfig;
+        super('company_branch', cacheManager, utilsService, BranchService.name, true, 'auth', CompanyBranch, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "authConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.authConfig = authConfig;
     }
 }
 BranchService = _ts_decorate([

package/fesm/services/company.service.js

@@ -25,18 +25,12 @@ 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 { Inject, Injectable, Scope } from '@nestjs/common';
 import { Company } from '../entities/company.entity';
 import { AuthDataSourceProvider } from './auth-datasource.provider';
-export class CompanyService extends RequestScopedApiService {
-    resolveEntity() {
-        return Company;
-    }
-    getDataSourceProvider() {
-        return this.dataSourceProvider;
-    }
+export class CompanyService extends ApiService {
     // Query Customization
     async getSelectQuery(query, _user, select) {
         if (!select?.length) {
@@ -44,6 +38,8 @@ export class CompanyService extends RequestScopedApiService {
                 'id',
                 'name',
                 'slug',
+                'email',
+                'phone',
                 'isActive',
                 'createdAt'
             ];
@@ -64,7 +60,7 @@ export class CompanyService extends RequestScopedApiService {
         };
     }
     constructor(cacheManager, utilsService, dataSourceProvider){
-        super('company', null, cacheManager, utilsService, CompanyService.name, true, 'auth'), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "dataSourceProvider", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.dataSourceProvider = dataSourceProvider;
+        super('company', cacheManager, utilsService, CompanyService.name, true, 'auth', Company, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService;
     }
 }
 CompanyService = _ts_decorate([

package/fesm/services/user.service.js

@@ -26,7 +26,7 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 import { LogAction } from '@flusys/nestjs-shared';
-import { createModuleLogger, HybridCache, RequestScopedApiService } from '@flusys/nestjs-shared/classes';
+import { createModuleLogger, HybridCache, ApiService } from '@flusys/nestjs-shared/classes';
 import { SYSTEM_MESSAGES } from '@flusys/nestjs-shared/constants';
 import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
@@ -40,18 +40,12 @@ import { PermissionType } from '../enums';
 import { IUserEnricher } from '../interfaces/user-enricher.interface';
 import { AuthConfigService } from './auth-config.service';
 import { AuthDataSourceProvider } from './auth-datasource.provider';
-export class UserService extends RequestScopedApiService {
-    resolveEntity() {
-        return AppUser;
-    }
-    getDataSourceProvider() {
-        return this.dataSourceProvider;
-    }
-    async ensureRepositoryInitialized() {
-        await super.ensureRepositoryInitialized();
+export class UserService extends ApiService {
+    async ensureDataSourceRepository() {
+        await super.ensureDataSourceRepository();
         const isCompanyFeatureEnabled = this.authConfig.isCompanyFeatureEnabled();
         if (isCompanyFeatureEnabled && !this.permissionRepository) {
-            [this.permissionRepository] = await this.initializeAdditionalRepositories([
+            [this.permissionRepository] = await this.resolveRepositories([
                 UserCompanyPermission
             ]);
         }
@@ -66,7 +60,7 @@ export class UserService extends RequestScopedApiService {
                 messageKey: AUTH_MESSAGES.PROFILE_ACCESS_DENIED
             });
         }
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const userEntity = await this.repository.findOne({
             where: {
                 id: userId
@@ -81,7 +75,7 @@ export class UserService extends RequestScopedApiService {
         return userEntity;
     }
     async verifyEmail(id) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         await this.repository.update(id, {
             emailVerified: true
         });
@@ -92,7 +86,7 @@ export class UserService extends RequestScopedApiService {
         ]);
     }
     async verifyPhone(id) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         await this.repository.update(id, {
             phoneVerified: true
         });
@@ -103,7 +97,7 @@ export class UserService extends RequestScopedApiService {
         ]);
     }
     async updateStatus(id, isActive, user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const isCompanyFeatureEnabled = this.authConfig.isCompanyFeatureEnabled();
         if (isCompanyFeatureEnabled && user?.companyId && this.permissionRepository) {
             const permission = await this.permissionRepository.findOne({
@@ -444,7 +438,7 @@ export class UserService extends RequestScopedApiService {
         return 100;
     }
     async profile(dto, user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         if (!this.dataSource) {
             throw new BadRequestException({
                 message: 'DataSource not available',
@@ -508,7 +502,7 @@ export class UserService extends RequestScopedApiService {
         }
     }
     constructor(cacheManager, utilsService, dataSourceProvider, authConfig, userEnricher){
-        super('appuser', null, cacheManager, utilsService, UserService.name, true, 'auth'), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "authConfig", void 0), _define_property(this, "userEnricher", void 0), _define_property(this, "permissionRepository", void 0), _define_property(this, "dataSource", void 0), _define_property(this, "logAdapter", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.dataSourceProvider = dataSourceProvider, this.authConfig = authConfig, this.userEnricher = userEnricher, this.logAdapter = createModuleLogger(this.constructor.name);
+        super('appuser', cacheManager, utilsService, UserService.name, true, 'auth', AppUser, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "authConfig", void 0), _define_property(this, "userEnricher", void 0), _define_property(this, "permissionRepository", void 0), _define_property(this, "dataSource", void 0), _define_property(this, "logAdapter", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.authConfig = authConfig, this.userEnricher = userEnricher, this.logAdapter = createModuleLogger(this.constructor.name);
     }
 }
 _ts_decorate([

package/interceptors/clear-token.interceptor.d.ts

@@ -3,7 +3,7 @@ import { Observable } from 'rxjs';
 import { AuthConfigService } from '../services/auth-config.service';
 export declare class ClearToken implements NestInterceptor {
     private readonly authConfig?;
-    constructor(authConfig?: AuthConfigService);
+    constructor(authConfig?: AuthConfigService | undefined);
     private get cookieName();
     intercept(context: ExecutionContext, next: CallHandler): Observable<unknown>;
 }

package/interceptors/set-token.interceptor.d.ts

@@ -3,7 +3,7 @@ import { Observable } from 'rxjs';
 import { AuthConfigService } from '../services/auth-config.service';
 export declare class SetToken implements NestInterceptor {
     private readonly authConfig?;
-    constructor(authConfig?: AuthConfigService);
+    constructor(authConfig?: AuthConfigService | undefined);
     private get cookieName();
     private get maxAgeMs();
     intercept(context: ExecutionContext, next: CallHandler): Observable<unknown>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flusys/nestjs-auth",
-  "version": "5.1.1",
+  "version": "5.1.3",
   "description": "Authentication and authorization infrastructure for NestJS applications",
   "main": "cjs/index.js",
   "module": "fesm/index.js",
@@ -74,26 +74,26 @@
     }
   },
   "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/jwt": "^10.0.0 || ^11.0.0",
-    "@nestjs/passport": "^10.0.0 || ^11.0.0",
-    "@nestjs/swagger": "^7.0.0 || ^11.0.0",
-    "@nestjs/typeorm": "^10.0.0 || ^11.0.0",
-    "bcrypt": "^5.0.1 || ^6.0.0",
-    "class-transformer": "^0.5.0",
-    "class-validator": "^0.14.0",
-    "nodemailer": "^7.0.0",
+    "@nestjs/common": "^11.0.0",
+    "@nestjs/config": "^4.0.0",
+    "@nestjs/core": "^11.0.0",
+    "@nestjs/jwt": "^11.0.0",
+    "@nestjs/passport": "^11.0.0",
+    "@nestjs/swagger": "^11.0.0",
+    "@nestjs/typeorm": "^11.0.0",
+    "bcrypt": "^6.0.0",
+    "class-transformer": "^0.5.1",
+    "class-validator": "^0.14.0 || ^0.15.0",
+    "nodemailer": "^7.0.0 || ^8.0.0",
     "passport": "^0.7.0",
     "passport-jwt": "^4.0.0",
     "passport-local": "^1.0.0",
     "typeorm": "^0.3.0",
-    "express": "^4.18.0",
+    "express": "^4.18.0 || ^5.0.0",
     "rxjs": "^7.8.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/auth-datasource.provider.d.ts

@@ -12,8 +12,6 @@ export declare class AuthDataSourceProvider extends MultiTenantDataSourceService
     protected static readonly connectionLocks: Map<string, Promise<DataSource>>;
     protected static singleConnectionLock: Promise<DataSource> | null;
     constructor(authOptions: AuthModuleOptions, request?: Request);
-    protected getSingleDataSource(): Promise<DataSource>;
-    protected getOrCreateTenantConnection(tenant: ITenantDatabaseConfig): Promise<DataSource>;
     private static buildParentOptions;
     isCompanyFeatureEnabled(tenant?: ITenantDatabaseConfig): boolean;
     isEmailVerificationEnabled(tenant?: ITenantDatabaseConfig): boolean;

package/services/auth-email.service.d.ts

@@ -6,7 +6,7 @@ export declare class AuthEmailService {
     private readonly emailProvider?;
     private readonly PASSWORD_RESET_EXPIRY;
     private readonly EMAIL_VERIFICATION_EXPIRY;
-    constructor(dataSourceProvider?: AuthDataSourceProvider, emailProvider?: IAuthEmailProvider);
+    constructor(dataSourceProvider?: AuthDataSourceProvider | undefined, emailProvider?: IAuthEmailProvider | undefined);
     isEmailEnabled(): boolean;
     private getRepository;
     private generateToken;

package/services/authentication.service.d.ts

@@ -20,7 +20,7 @@ export declare class AuthenticationService {
     private readonly authEmailService?;
     private readonly userEnricher?;
     private readonly notificationAdapter?;
-    constructor(jwtService: JwtService, authConfig: AuthConfigService, cacheManager?: HybridCache, dataSourceProvider?: AuthDataSourceProvider, sessionService?: CompanySelectionSessionService, authEmailService?: AuthEmailService, userEnricher?: IUserEnricher, notificationAdapter?: INotificationAdapter);
+    constructor(jwtService: JwtService, authConfig: AuthConfigService, cacheManager?: HybridCache | undefined, dataSourceProvider?: AuthDataSourceProvider | undefined, sessionService?: CompanySelectionSessionService | undefined, authEmailService?: AuthEmailService | undefined, userEnricher?: IUserEnricher | undefined, notificationAdapter?: INotificationAdapter | undefined);
     private isCompanyFeatureEnabled;
     private isEmailVerificationEnabled;
     private getUserRepository;

package/services/branch.service.d.ts

@@ -1,21 +1,18 @@
-import { HybridCache, RequestScopedApiService } from '@flusys/nestjs-shared/classes';
+import { HybridCache, ApiService } from '@flusys/nestjs-shared/classes';
 import { FilterAndPaginationDto } from '@flusys/nestjs-shared/dtos';
 import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
-import { EntityTarget, SelectQueryBuilder } from 'typeorm';
+import { SelectQueryBuilder } from 'typeorm';
 import { CreateCompanyBranchDto, UpdateCompanyBranchDto } from '../dtos/company-branch.dto';
 import { CompanyBranch } from '../entities/company-branch.entity';
 import { ICompanyBranch } from '../interfaces/company-branch.interface';
 import { AuthConfigService } from './auth-config.service';
 import { AuthDataSourceProvider } from './auth-datasource.provider';
-export declare class BranchService extends RequestScopedApiService<CreateCompanyBranchDto, UpdateCompanyBranchDto, ICompanyBranch, CompanyBranch> {
+export declare class BranchService extends ApiService<CreateCompanyBranchDto, UpdateCompanyBranchDto, ICompanyBranch, CompanyBranch> {
     protected cacheManager: HybridCache;
     protected utilsService: UtilsService;
-    private readonly dataSourceProvider;
     private readonly authConfig;
     constructor(cacheManager: HybridCache, utilsService: UtilsService, dataSourceProvider: AuthDataSourceProvider, authConfig: AuthConfigService);
-    protected resolveEntity(): EntityTarget<CompanyBranch>;
-    protected getDataSourceProvider(): AuthDataSourceProvider;
     getSelectQuery(query: SelectQueryBuilder<CompanyBranch>, _user: ILoggedUserInfo | null, select?: string[]): Promise<{
         query: SelectQueryBuilder<CompanyBranch>;
         isRaw: boolean;

package/services/company.service.d.ts

@@ -1,18 +1,15 @@
-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 { CreateCompanyDto, UpdateCompanyDto } from '../dtos/company.dto';
 import { Company } from '../entities/company.entity';
 import { ICompany } from '../interfaces/company.interface';
 import { AuthDataSourceProvider } from './auth-datasource.provider';
-export declare class CompanyService extends RequestScopedApiService<CreateCompanyDto, UpdateCompanyDto, ICompany, Company> {
+export declare class CompanyService extends ApiService<CreateCompanyDto, UpdateCompanyDto, ICompany, Company> {
     protected cacheManager: HybridCache;
     protected utilsService: UtilsService;
-    private readonly dataSourceProvider;
     constructor(cacheManager: HybridCache, utilsService: UtilsService, dataSourceProvider: AuthDataSourceProvider);
-    protected resolveEntity(): EntityTarget<Company>;
-    protected getDataSourceProvider(): AuthDataSourceProvider;
     getSelectQuery(query: SelectQueryBuilder<Company>, _user: ILoggedUserInfo | null, select?: string[]): Promise<{
         query: SelectQueryBuilder<Company>;
         isRaw: boolean;