@flusys/nestjs-auth 5.1.2 → 5.2.0

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

@@ -83,53 +83,6 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 let AuthDataSourceProvider = class AuthDataSourceProvider extends _nestjsshared.MultiTenantDataSourceService {
-    async getSingleDataSource() {
-        if (!AuthDataSourceProvider.singleDataSource) {
-            if (AuthDataSourceProvider.singleConnectionLock) {
-                return AuthDataSourceProvider.singleConnectionLock;
-            }
-            const lockPromise = (async ()=>{
-                const config = this.getDefaultDatabaseConfig();
-                if (!config) {
-                    throw new _common.InternalServerErrorException({
-                        message: 'Default database config is not available',
-                        messageKey: _nestjsshared.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/cjs/services/branch.service.js

@@ -42,13 +42,7 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-let BranchService = class BranchService extends _classes.RequestScopedApiService {
-    resolveEntity() {
-        return _companybranchentity.CompanyBranch;
-    }
-    getDataSourceProvider() {
-        return this.dataSourceProvider;
-    }
+let BranchService = class BranchService extends _classes.ApiService {
     // Query Customization
     async getSelectQuery(query, _user, select) {
         if (!select?.length) {
@@ -91,7 +85,7 @@ let BranchService = class BranchService extends _classes.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', _companybranchentity.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/cjs/services/company.service.js

@@ -40,13 +40,7 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-let CompanyService = class CompanyService extends _classes.RequestScopedApiService {
-    resolveEntity() {
-        return _companyentity.Company;
-    }
-    getDataSourceProvider() {
-        return this.dataSourceProvider;
-    }
+let CompanyService = class CompanyService extends _classes.ApiService {
     // Query Customization
     async getSelectQuery(query, _user, select) {
         if (!select?.length) {
@@ -76,7 +70,7 @@ let CompanyService = class CompanyService extends _classes.RequestScopedApiServi
         };
     }
     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', _companyentity.Company, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService;
     }
 };
 CompanyService = _ts_decorate([

package/cjs/services/user.service.js

@@ -91,18 +91,12 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-let UserService = class UserService extends _classes.RequestScopedApiService {
-    resolveEntity() {
-        return _appuserentity.AppUser;
-    }
-    getDataSourceProvider() {
-        return this.dataSourceProvider;
-    }
-    async ensureRepositoryInitialized() {
-        await super.ensureRepositoryInitialized();
+let UserService = class UserService extends _classes.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([
                 _usercompanypermissionentity.UserCompanyPermission
             ]);
         }
@@ -117,7 +111,7 @@ let UserService = class UserService extends _classes.RequestScopedApiService {
                 messageKey: _config.AUTH_MESSAGES.PROFILE_ACCESS_DENIED
             });
         }
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const userEntity = await this.repository.findOne({
             where: {
                 id: userId
@@ -132,7 +126,7 @@ let UserService = class UserService extends _classes.RequestScopedApiService {
         return userEntity;
     }
     async verifyEmail(id) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         await this.repository.update(id, {
             emailVerified: true
         });
@@ -143,7 +137,7 @@ let UserService = class UserService extends _classes.RequestScopedApiService {
         ]);
     }
     async verifyPhone(id) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         await this.repository.update(id, {
             phoneVerified: true
         });
@@ -154,7 +148,7 @@ let UserService = class UserService extends _classes.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({
@@ -495,7 +489,7 @@ let UserService = class UserService extends _classes.RequestScopedApiService {
         return 100;
     }
     async profile(dto, user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         if (!this.dataSource) {
             throw new _common.BadRequestException({
                 message: 'DataSource not available',
@@ -559,7 +553,7 @@ let UserService = class UserService extends _classes.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 = (0, _classes.createModuleLogger)(this.constructor.name);
+        super('appuser', cacheManager, utilsService, UserService.name, true, 'auth', _appuserentity.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 = (0, _classes.createModuleLogger)(this.constructor.name);
     }
 };
 _ts_decorate([

package/controllers/authentication.controller.d.ts

@@ -7,7 +7,7 @@ import { AuthenticationService } from '../services/authentication.service';
 export declare class AuthenticationController {
     private readonly authService;
     private readonly authConfig?;
-    constructor(authService: AuthenticationService, authConfig?: AuthConfigService);
+    constructor(authService: AuthenticationService, authConfig?: AuthConfigService | undefined);
     login(loginDto: LoginDto): Promise<SingleResponseDto<LoginResponseDto | CompanySelectionResponseDto | LoginResponseRequiresEmailVerificationDto>>;
     register(req: Request, registrationDto: RegistrationDto): Promise<SingleResponseDto<RegistrationResponseDto>>;
     refreshToken(req: Request, refreshTokenDto: RefreshTokenDto): Promise<SingleResponseDto<{

package/controllers/branch.controller.d.ts

@@ -1,9 +1,9 @@
 import { CompanyBranchResponseDto, CreateCompanyBranchDto, UpdateCompanyBranchDto } from '../dtos/company-branch.dto';
 import { BranchService } from '../services/branch.service';
 declare const BranchController_base: abstract new (service: BranchService) => {
-    readonly enabledEndpoints: import("@flusys/nestjs-shared/classes").ApiEndpoint[] | "all";
+    readonly enabledEndpoints: import("@flusys/nestjs-shared").ApiEndpoint[] | "all";
     service: BranchService;
-    isEnabled(endpoint: import("@flusys/nestjs-shared/classes").ApiEndpoint): boolean;
+    isEnabled(endpoint: import("@flusys/nestjs-shared").ApiEndpoint): boolean;
     insert(addDto: CreateCompanyBranchDto, user: import("@flusys/nestjs-shared").ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").SingleResponseDto<CompanyBranchResponseDto>>;
     insertMany(addDto: CreateCompanyBranchDto[], user: import("@flusys/nestjs-shared").ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").BulkResponseDto<CompanyBranchResponseDto>>;
     getById(id: string, body: import("@flusys/nestjs-shared").GetByIdBodyDto, user: import("@flusys/nestjs-shared").ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").SingleResponseDto<CompanyBranchResponseDto>>;

package/controllers/company.controller.d.ts

@@ -1,9 +1,9 @@
 import { CompanyResponseDto, CreateCompanyDto, UpdateCompanyDto } from '../dtos/company.dto';
 import { CompanyService } from '../services/company.service';
 declare const CompanyController_base: abstract new (service: CompanyService) => {
-    readonly enabledEndpoints: import("@flusys/nestjs-shared/classes").ApiEndpoint[] | "all";
+    readonly enabledEndpoints: import("@flusys/nestjs-shared").ApiEndpoint[] | "all";
     service: CompanyService;
-    isEnabled(endpoint: import("@flusys/nestjs-shared/classes").ApiEndpoint): boolean;
+    isEnabled(endpoint: import("@flusys/nestjs-shared").ApiEndpoint): boolean;
     insert(addDto: CreateCompanyDto, user: import("@flusys/nestjs-shared").ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").SingleResponseDto<CompanyResponseDto>>;
     insertMany(addDto: CreateCompanyDto[], user: import("@flusys/nestjs-shared").ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").BulkResponseDto<CompanyResponseDto>>;
     getById(id: string, body: import("@flusys/nestjs-shared").GetByIdBodyDto, user: import("@flusys/nestjs-shared").ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").SingleResponseDto<CompanyResponseDto>>;

package/controllers/user.controller.d.ts

@@ -3,9 +3,9 @@ import { CreateUserDto, UpdateUserDto, UserResponseDto } from '../dtos/user.dto'
 import { IUser } from '../interfaces/user.interface';
 import { UserService } from '../services/user.service';
 declare const UserController_base: abstract new (service: UserService) => {
-    readonly enabledEndpoints: import("@flusys/nestjs-shared/classes").ApiEndpoint[] | "all";
+    readonly enabledEndpoints: import("@flusys/nestjs-shared").ApiEndpoint[] | "all";
     service: UserService;
-    isEnabled(endpoint: import("@flusys/nestjs-shared/classes").ApiEndpoint): boolean;
+    isEnabled(endpoint: import("@flusys/nestjs-shared").ApiEndpoint): boolean;
     insert(addDto: CreateUserDto, user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").SingleResponseDto<UserResponseDto>>;
     insertMany(addDto: CreateUserDto[], user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").BulkResponseDto<UserResponseDto>>;
     getById(id: string, body: import("@flusys/nestjs-shared").GetByIdBodyDto, user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").SingleResponseDto<UserResponseDto>>;
@@ -60,7 +60,7 @@ export declare class UserController extends UserController_base {
         success: boolean;
         message: string;
         messageKey: "user.profile.section.data.success";
-        data: import("..").IProfileSectionData;
+        data: import("..").IProfileSectionData | null;
     }>;
     updateProfileSection(id: string, sectionId: string, data: Record<string, any>, user: ILoggedUserInfo): Promise<{
         success: boolean;

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) {
@@ -81,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) {
@@ -66,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.2",
+  "version": "5.2.0",
   "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.2",
-    "@flusys/nestjs-shared": "5.1.2"
+    "@flusys/nestjs-core": "5.2.0",
+    "@flusys/nestjs-shared": "5.2.0"
   }
 }

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;

package/services/user.service.d.ts

@@ -1,27 +1,24 @@
-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 { CreateUserDto, UpdateUserDto } from '../dtos/user.dto';
 import { AppUser } from '../entities/app-user.entity';
 import { IEnrichedUser, IProfileExtras, IProfileSection, IProfileSectionData, IUserEnricher } from '../interfaces/user-enricher.interface';
 import { IUser } from '../interfaces/user.interface';
 import { AuthConfigService } from './auth-config.service';
 import { AuthDataSourceProvider } from './auth-datasource.provider';
-export declare class UserService extends RequestScopedApiService<CreateUserDto, UpdateUserDto, IUser, AppUser> {
+export declare class UserService extends ApiService<CreateUserDto, UpdateUserDto, IUser, AppUser> {
     protected cacheManager: HybridCache;
     protected utilsService: UtilsService;
-    private readonly dataSourceProvider;
     private readonly authConfig;
     private readonly userEnricher?;
     private permissionRepository?;
     private dataSource?;
     private readonly logAdapter;
-    constructor(cacheManager: HybridCache, utilsService: UtilsService, dataSourceProvider: AuthDataSourceProvider, authConfig: AuthConfigService, userEnricher?: IUserEnricher);
-    protected resolveEntity(): EntityTarget<AppUser>;
-    protected getDataSourceProvider(): AuthDataSourceProvider;
-    protected ensureRepositoryInitialized(): Promise<void>;
+    constructor(cacheManager: HybridCache, utilsService: UtilsService, dataSourceProvider: AuthDataSourceProvider, authConfig: AuthConfigService, userEnricher?: IUserEnricher | undefined);
+    protected ensureDataSourceRepository(): Promise<void>;
     private getUserForProfile;
     verifyEmail(id: string): Promise<void>;
     verifyPhone(id: string): Promise<void>;