@flusys/nestjs-auth 0.1.0-beta.2 → 1.0.0-beta

package/fesm/services/user.service.js

@@ -28,30 +28,22 @@ function _ts_param(paramIndex, decorator) {
 import { RequestScopedApiService, HybridCache } from '@flusys/nestjs-shared/classes';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
 import { ErrorHandler } from '@flusys/nestjs-shared/utils';
-import { BadRequestException, Inject, Injectable, Logger, NotFoundException, Scope } from '@nestjs/common';
+import { BadRequestException, Inject, Injectable, NotFoundException, Scope } from '@nestjs/common';
 import * as bcrypt from 'bcrypt';
 import { AuthConfigService } from './auth-config.service';
 import { AuthDataSourceProvider } from './auth-datasource.provider';
+import { BCRYPT_SALT_ROUNDS } from '../config';
 import { PermissionType } from '../enums';
 import { UserCompanyPermission } from '../entities/user-company-permission.entity';
 import { User } from '../entities/user.entity';
 export class UserService extends RequestScopedApiService {
-    /**
-   * Resolve entity class for this service
-   * @returns User entity class
-   */ resolveEntity() {
+    resolveEntity() {
         return User;
     }
-    /**
-   * Get DataSource provider for this service
-   * @returns AuthDataSourceProvider instance
-   */ getDataSourceProvider() {
+    getDataSourceProvider() {
         return this.dataSourceProvider;
     }
-    /**
-   * Override ensureRepositoryInitialized to also initialize permission repository and dataSource
-   * CRITICAL: Also initializes permissionRepository and dataSource for company feature support
-   */ async ensureRepositoryInitialized() {
+    async ensureRepositoryInitialized() {
         await super.ensureRepositoryInitialized();
         // Initialize permission repository if company feature is enabled
         const isCompanyFeatureEnabled = this.authConfig.isCompanyFeatureEnabled();
@@ -65,26 +57,8 @@ export class UserService extends RequestScopedApiService {
             this.dataSource = await this.getDataSourceForService();
         }
     }
-    // ==========================================================================
-    // CUSTOM METHODS (Beyond RequestScopedApiService)
-    // ==========================================================================
-    /**
-   * Update last login timestamp
-   */ async updateLastLogin(id) {
-        // Ensure repository is initialized for custom method
-        await this.ensureRepositoryInitialized();
-        await this.repository.update(id, {
-            lastLoginAt: new Date()
-        });
-        await this.clearCacheForId([
-            {
-                id
-            }
-        ]);
-    }
-    /**
-   * Verify email
-   */ async verifyEmail(id) {
+    // Custom Methods
+    /** Verify email */ async verifyEmail(id) {
         // Ensure repository is initialized for custom method
         await this.ensureRepositoryInitialized();
         await this.repository.update(id, {
@@ -97,9 +71,7 @@ export class UserService extends RequestScopedApiService {
             }
         ]);
     }
-    /**
-   * Verify phone
-   */ async verifyPhone(id) {
+    /** Verify phone */ async verifyPhone(id) {
         // Ensure repository is initialized for custom method
         await this.ensureRepositoryInitialized();
         await this.repository.update(id, {
@@ -112,12 +84,7 @@ export class UserService extends RequestScopedApiService {
             }
         ]);
     }
-    /**
-   * Update user status
-   *
-   * When company feature is disabled: Updates User.isActive directly
-   * When company feature is enabled: Updates UserCompanyPermission.isActive for the logged user's company
-   */ async updateStatus(id, isActive, user) {
+    /** Update user status. When company feature enabled, updates permission isActive for logged user's company. */ async updateStatus(id, isActive, user) {
         // Ensure repository is initialized for custom method
         await this.ensureRepositoryInitialized();
         const isCompanyFeatureEnabled = this.authConfig.isCompanyFeatureEnabled();
@@ -148,50 +115,43 @@ export class UserService extends RequestScopedApiService {
             }
         ]);
     }
-    // ==========================================================================
-    // APISERVICE OVERRIDES (Customize behavior)
-    // ==========================================================================
-    /**
-   * Override: Convert DTO to entity (hash password before saving)
-   */ async convertSingleDtoToEntity(dto, user) {
+    // ApiService Overrides
+    /** Convert DTO to entity (hash password before saving) */ async convertSingleDtoToEntity(dto, user) {
         // Repository initialization is handled automatically by RequestScopedApiService
         const entity = await super.convertSingleDtoToEntity(dto, user);
         // Hash password if provided
         if (dto.password) {
-            entity.password = await bcrypt.hash(dto.password, 10);
+            entity.password = await bcrypt.hash(dto.password, BCRYPT_SALT_ROUNDS);
         }
         return entity;
     }
-    /**
-   * Override: Convert entity to response DTO (remove password!)
-   *
-   * When company feature is enabled and raw mode is used, isActive comes from
-   * the permission table (user_companyIsActive). Otherwise, it comes from User entity.
-   */ convertEntityToResponseDto(entity, isRaw) {
+    /** Convert entity to response DTO (removes password). In raw mode with company feature, isActive comes from permission table. */ convertEntityToResponseDto(entity, isRaw) {
         // When raw mode is used with company feature, isActive comes from computed field
-        const isActive = isRaw && entity.user_companyIsActive !== undefined ? Boolean(entity.user_companyIsActive) : entity.isActive;
+        // Raw mode uses snake_case column names (due to SnakeNamingStrategy)
+        const isActive = isRaw && entity.user_companyIsActive !== undefined ? Boolean(entity.user_companyIsActive) : isRaw ? entity.user_is_active : entity.isActive;
         return {
             id: isRaw ? entity.user_id : entity.id,
             name: isRaw ? entity.user_name : entity.name,
             phone: isRaw ? entity.user_phone : entity.phone,
             email: isRaw ? entity.user_email : entity.email,
-            profilePictureId: isRaw ? entity.user_profilePictureId : entity.profilePictureId,
+            profilePictureId: isRaw ? entity.user_profile_picture_id : entity.profilePictureId,
             isActive,
-            emailVerified: isRaw ? entity.user_emailVerified : entity.emailVerified,
-            phoneVerified: isRaw ? entity.user_phoneVerified : entity.phoneVerified,
-            lastLoginAt: isRaw ? entity.user_lastLoginAt : entity.lastLoginAt,
-            additionalFields: isRaw ? entity.user_additionalFields : entity.additionalFields,
-            createdAt: isRaw ? entity.user_createdAt : entity.createdAt,
-            updatedAt: isRaw ? entity.user_updatedAt : entity.updatedAt,
-            deletedAt: isRaw ? entity.user_deletedAt : entity.deletedAt,
-            createdById: isRaw ? entity.user_createdById : entity.createdById,
-            updatedById: isRaw ? entity.user_updatedById : entity.updatedById,
-            deletedById: isRaw ? entity.user_deletedById : entity.deletedById
+            emailVerified: isRaw ? entity.user_email_verified : entity.emailVerified,
+            phoneVerified: isRaw ? entity.user_phone_verified : entity.phoneVerified,
+            lastLoginAt: isRaw ? entity.user_last_login_at : entity.lastLoginAt,
+            additionalFields: isRaw ? entity.user_additional_fields : entity.additionalFields,
+            createdAt: isRaw ? entity.user_created_at : entity.createdAt,
+            updatedAt: isRaw ? entity.user_updated_at : entity.updatedAt,
+            deletedAt: isRaw ? entity.user_deleted_at : entity.deletedAt,
+            createdById: isRaw ? entity.user_created_by_id : entity.createdById,
+            updatedById: isRaw ? entity.user_updated_by_id : entity.updatedById,
+            deletedById: isRaw ? entity.user_deleted_by_id : entity.deletedById
         };
     }
-    /**
-   * Override: Global search - search by name, email, or phone
-   */ async getGlobalSearchQuery(query, search, _user) {
+    /** Convert entity list to response DTO list */ convertEntityListToResponseListDto(entities, isRaw) {
+        return entities.map((entity)=>this.convertEntityToResponseDto(entity, isRaw));
+    }
+    /** Global search - search by name, email, or phone */ async getGlobalSearchQuery(query, search, _user) {
         query.andWhere('(user.name LIKE :search OR user.email LIKE :search OR user.phone LIKE :search)', {
             search: `%${search}%`
         });
@@ -200,16 +160,7 @@ export class UserService extends RequestScopedApiService {
             isRaw: false
         };
     }
-    /**
-   * Override: getExtraManipulateQuery - Add company permission-based isActive check when company feature enabled
-   *
-   * Note: When company feature is disabled at bootstrap, this method returns without modifications.
-   * All company-related filtering is skipped, and users are returned normally with isActive from User entity.
-   *
-   * When company feature is enabled:
-   * - isActive is computed from UserCompanyPermission table
-   * - Returns isRaw: true to use raw query results
-   */ async getExtraManipulateQuery(query, filterAndPaginationDto, user) {
+    /** Add company permission-based isActive check when company feature enabled. Returns isRaw: true for computed fields. */ async getExtraManipulateQuery(query, filterAndPaginationDto, user) {
         // Repository initialization is handled automatically by RequestScopedApiService
         const result = await super.getExtraManipulateQuery(query, filterAndPaginationDto, user);
         // Only apply company filtering if:
@@ -264,12 +215,7 @@ export class UserService extends RequestScopedApiService {
         }
         return result;
     }
-    /**
-   * Override: insert - Create company permission when company feature is enabled
-   *
-   * Note: When company feature is disabled at bootstrap, this method falls back to parent implementation.
-   * No company permissions are created, and user is inserted normally.
-   */ async insert(dto, user) {
+    /** Insert user. Creates company permission when company feature is enabled. */ async insert(dto, user) {
         // Repository initialization is handled automatically by RequestScopedApiService
         // Check if company feature is enabled
         const isCompanyFeatureEnabled = this.authConfig.isCompanyFeatureEnabled();
@@ -336,9 +282,7 @@ export class UserService extends RequestScopedApiService {
             await queryRunner.release();
         }
     }
-    /**
-   * Update user profile with password handling
-   */ async profile(dto, user) {
+    /** Update user profile with password handling */ async profile(dto, user) {
         // Repository initialization is handled automatically by RequestScopedApiService
         if (!this.dataSource) {
             throw new BadRequestException('DataSource not available');
@@ -385,10 +329,8 @@ export class UserService extends RequestScopedApiService {
             await queryRunner.release();
         }
     }
-    // NOTE: @Inject() required for bundled code - type metadata may be lost during esbuild
     constructor(cacheManager, utilsService, dataSourceProvider, authConfig){
-        // Repository will be set asynchronously by RequestScopedApiService
-        super('user', null, cacheManager, utilsService, UserService.name, true), _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, "logger", void 0), _define_property(this, "permissionRepository", void 0), _define_property(this, "dataSource", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.dataSourceProvider = dataSourceProvider, this.authConfig = authConfig, this.logger = new Logger(UserService.name);
+        super('user', null, cacheManager, utilsService, UserService.name, true), _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, "permissionRepository", void 0), _define_property(this, "dataSource", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.dataSourceProvider = dataSourceProvider, this.authConfig = authConfig;
     }
 }
 UserService = _ts_decorate([

package/fesm/strategies/jwt.strategy.js

@@ -26,6 +26,7 @@ import { PassportStrategy } from '@nestjs/passport';
 import { ExtractJwt, Strategy } from 'passport-jwt';
 import { AuthConfigService } from '../services/auth-config.service';
 import { AuthDataSourceProvider } from '../services/auth-datasource.provider';
+import { AuthenticationService } from '../services/authentication.service';
 import { User } from '../entities/user.entity';
 /**
  * Type guard to check if payload includes company context
@@ -34,8 +35,9 @@ import { User } from '../entities/user.entity';
 }
 export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {
     async validate(_req, payload) {
-        // Resolve request-scoped AuthDataSourceProvider for this request
+        // Resolve request-scoped services for this request
         let userRepository = null;
+        let authService = null;
         try {
             const dataSourceProvider = await this.moduleRef.resolve(AuthDataSourceProvider, undefined, {
                 strict: false
@@ -43,12 +45,23 @@ export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {
             if (dataSourceProvider) {
                 userRepository = await dataSourceProvider.getRepository(User);
             }
+            // Resolve AuthenticationService for token revocation check
+            authService = await this.moduleRef.resolve(AuthenticationService, undefined, {
+                strict: false
+            });
         } catch (error) {
             throw new UnauthorizedException('Unable to access user data');
         }
         if (!userRepository) {
             throw new UnauthorizedException('User repository not available');
         }
+        // Check if token is revoked (logged out)
+        if (authService && payload.iat) {
+            const isRevoked = await authService.isTokenRevoked(payload.id, payload.iat);
+            if (isRevoked) {
+                throw new UnauthorizedException('Token has been revoked');
+            }
+        }
         // Find user and check if active
         const user = await userRepository.findOne({
             where: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flusys/nestjs-auth",
-  "version": "0.1.0-beta.2",
+  "version": "1.0.0-beta",
   "description": "Authentication and authorization infrastructure for NestJS applications",
   "main": "cjs/index.js",
   "module": "fesm/index.js",
@@ -81,7 +81,7 @@
     "@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.0",
+    "bcrypt": "^5.0.0 || ^6.0.0",
     "class-transformer": "^0.5.0",
     "class-validator": "^0.14.0",
     "nodemailer": "^6.0.0",
@@ -91,7 +91,7 @@
     "typeorm": "^0.3.0"
   },
   "dependencies": {
-    "@flusys/nestjs-core": "0.1.0-beta.2",
-    "@flusys/nestjs-shared": "0.1.0-beta.2"
+    "@flusys/nestjs-core": "1.0.0-beta",
+    "@flusys/nestjs-shared": "1.0.0-beta"
   }
 }

package/services/authentication.service.d.ts

@@ -3,6 +3,7 @@ import { Repository } from 'typeorm';
 import { AuthConfigService } from './auth-config.service';
 import { AuthDataSourceProvider } from './auth-datasource.provider';
 import { RegistrationDto } from '../dtos/authentication.dto';
+import { HybridCache } from '@flusys/nestjs-shared/classes';
 import { LoginResponse, LoginResponseRequiresSelection, MeResponse } from '../interfaces/authentication.interface';
 import { CompanyBranch } from '../entities/company-branch.entity';
 import { Company } from '../entities/company.entity';
@@ -12,6 +13,7 @@ import { CompanySelectionSessionService } from './company-selection-session.serv
 export declare class AuthenticationService {
     private readonly jwtService;
     private readonly authConfig;
+    private readonly cacheManager?;
     private readonly dataSourceProvider?;
     private readonly sessionService?;
     private readonly injectedUserRepository?;
@@ -19,7 +21,7 @@ export declare class AuthenticationService {
     private readonly injectedCompanyRepository?;
     private readonly injectedBranchRepository?;
     private readonly logger;
-    constructor(jwtService: JwtService, authConfig: AuthConfigService, dataSourceProvider?: AuthDataSourceProvider, sessionService?: CompanySelectionSessionService, injectedUserRepository?: Repository<User>, injectedPermissionRepository?: Repository<UserCompanyPermission>, injectedCompanyRepository?: Repository<Company>, injectedBranchRepository?: Repository<CompanyBranch>);
+    constructor(jwtService: JwtService, authConfig: AuthConfigService, cacheManager?: HybridCache, dataSourceProvider?: AuthDataSourceProvider, sessionService?: CompanySelectionSessionService, injectedUserRepository?: Repository<User>, injectedPermissionRepository?: Repository<UserCompanyPermission>, injectedCompanyRepository?: Repository<Company>, injectedBranchRepository?: Repository<CompanyBranch>);
     private getUserRepository;
     private getPermissionRepository;
     private getCompanyRepository;
@@ -36,7 +38,9 @@ export declare class AuthenticationService {
         refreshToken: string;
     }>;
     changePassword(userId: string, currentPassword: string, newPassword: string): Promise<void>;
-    logout(_userId: string): Promise<void>;
+    logout(userId: string): Promise<void>;
+    isTokenRevoked(userId: string, tokenIssuedAt?: number): Promise<boolean>;
+    private parseExpiryToMs;
     getUserCompanies(userId: string): Promise<Company[]>;
     getUserBranches(userId: string, companyId: string): Promise<CompanyBranch[]>;
     getCompanyById(companyId: string): Promise<Company | null>;

package/services/branch.service.d.ts

@@ -1,7 +1,6 @@
 import { RequestScopedApiService, HybridCache } from '@flusys/nestjs-shared/classes';
 import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
-import { Logger } from '@nestjs/common';
 import { EntityTarget, Repository, SelectQueryBuilder } from 'typeorm';
 import { CreateCompanyBranchDto, UpdateCompanyBranchDto } from '../dtos/company-branch.dto';
 import { ICompanyBranch } from '../interfaces/company-branch.interface';
@@ -13,20 +12,18 @@ export declare class BranchService extends RequestScopedApiService<CreateCompany
     protected utilsService: UtilsService;
     private readonly dataSourceProvider;
     private readonly authConfig;
-    protected logger: Logger;
     constructor(cacheManager: HybridCache, utilsService: UtilsService, dataSourceProvider: AuthDataSourceProvider, authConfig: AuthConfigService);
     protected resolveEntity(): EntityTarget<CompanyBranch>;
     protected getDataSourceProvider(): AuthDataSourceProvider;
-    convertSingleDtoToEntity(dto: CreateCompanyBranchDto | UpdateCompanyBranchDto, _user: ILoggedUserInfo): Promise<CompanyBranch>;
     getSelectQuery(query: SelectQueryBuilder<CompanyBranch>, _user: ILoggedUserInfo | null, select?: string[]): Promise<{
         query: SelectQueryBuilder<CompanyBranch>;
         isRaw: boolean;
     }>;
-    protected getGlobalSearchQuery(query: SelectQueryBuilder<CompanyBranch>, search: string, _user: ILoggedUserInfo | null): Promise<{
+    protected getGlobalSearchQuery(query: SelectQueryBuilder<CompanyBranch>, search: string): Promise<{
         query: SelectQueryBuilder<CompanyBranch>;
         isRaw: boolean;
     }>;
-    protected getExtraManipulateQuery(query: SelectQueryBuilder<CompanyBranch>, _filterAndPaginationDto: any, user: ILoggedUserInfo | null): Promise<{
+    protected getExtraManipulateQuery(query: SelectQueryBuilder<CompanyBranch>, filterDto: any, user: ILoggedUserInfo | null): Promise<{
         query: SelectQueryBuilder<CompanyBranch>;
         isRaw: boolean;
     }>;

package/services/company.service.d.ts

@@ -1,7 +1,6 @@
 import { RequestScopedApiService, HybridCache } from '@flusys/nestjs-shared/classes';
 import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
-import { Logger } from '@nestjs/common';
 import { EntityTarget, Repository, SelectQueryBuilder } from 'typeorm';
 import { CreateCompanyDto, UpdateCompanyDto } from '../dtos/company.dto';
 import { Company } from '../entities/company.entity';
@@ -11,16 +10,14 @@ export declare class CompanyService extends RequestScopedApiService<CreateCompan
     protected cacheManager: HybridCache;
     protected utilsService: UtilsService;
     private readonly dataSourceProvider;
-    protected logger: Logger;
     constructor(cacheManager: HybridCache, utilsService: UtilsService, dataSourceProvider: AuthDataSourceProvider);
     protected resolveEntity(): EntityTarget<Company>;
     protected getDataSourceProvider(): AuthDataSourceProvider;
-    convertSingleDtoToEntity(dto: CreateCompanyDto | UpdateCompanyDto, _user: ILoggedUserInfo): Promise<Company>;
     getSelectQuery(query: SelectQueryBuilder<Company>, _user: ILoggedUserInfo | null, select?: string[]): Promise<{
         query: SelectQueryBuilder<Company>;
         isRaw: boolean;
     }>;
-    protected getGlobalSearchQuery(query: SelectQueryBuilder<Company>, search: string, _user: ILoggedUserInfo | null): Promise<{
+    protected getGlobalSearchQuery(query: SelectQueryBuilder<Company>, search: string): Promise<{
         query: SelectQueryBuilder<Company>;
         isRaw: boolean;
     }>;

package/services/user.service.d.ts

@@ -1,7 +1,6 @@
 import { RequestScopedApiService, HybridCache } from '@flusys/nestjs-shared/classes';
 import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
-import { Logger } from '@nestjs/common';
 import { EntityTarget, Repository } from 'typeorm';
 import { AuthConfigService } from './auth-config.service';
 import { AuthDataSourceProvider } from './auth-datasource.provider';
@@ -13,19 +12,18 @@ export declare class UserService extends RequestScopedApiService<CreateUserDto,
     protected utilsService: UtilsService;
     private readonly dataSourceProvider;
     private readonly authConfig;
-    protected logger: Logger;
     private permissionRepository?;
     private dataSource?;
     constructor(cacheManager: HybridCache, utilsService: UtilsService, dataSourceProvider: AuthDataSourceProvider, authConfig: AuthConfigService);
     protected resolveEntity(): EntityTarget<User>;
     protected getDataSourceProvider(): AuthDataSourceProvider;
     protected ensureRepositoryInitialized(): Promise<void>;
-    updateLastLogin(id: string): Promise<void>;
     verifyEmail(id: string): Promise<void>;
     verifyPhone(id: string): Promise<void>;
     updateStatus(id: string, isActive: boolean, user?: ILoggedUserInfo | null): Promise<void>;
     protected convertSingleDtoToEntity(dto: CreateUserDto | UpdateUserDto, user: any): Promise<User>;
     protected convertEntityToResponseDto(entity: User, isRaw: boolean): IUser;
+    protected convertEntityListToResponseListDto(entities: User[], isRaw: boolean): IUser[];
     protected getGlobalSearchQuery(query: any, search: string, _user: any): Promise<{
         query: any;
         isRaw: boolean;