@flusys/nestjs-auth 0.1.0-beta.3 → 1.1.0-beta

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/interfaces/auth-email-provider.interface.d.ts

@@ -0,0 +1,6 @@
+export interface IAuthEmailProvider {
+    sendPasswordResetEmail(email: string, token: string, resetUrl: string): Promise<void>;
+    sendVerificationEmail(email: string, token: string, verifyUrl: string): Promise<void>;
+    sendWelcomeEmail?(email: string, name: string): Promise<void>;
+}
+export declare const AUTH_EMAIL_PROVIDER = "AUTH_EMAIL_PROVIDER";

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

@@ -1,15 +1,17 @@
 import { IBootstrapAppConfig, IDataSourceServiceOptions, IDynamicModuleConfig, IModuleOptionsFactory } from '@flusys/nestjs-core';
-import { ModuleMetadata, Type } from '@nestjs/common';
+import { ModuleMetadata, Provider, Type } from '@nestjs/common';
 export interface IAuthModuleConfig extends IDataSourceServiceOptions {
     jwtSecret?: string;
     jwtExpiration?: string;
     refreshTokenSecret?: string;
     refreshTokenExpiration?: string;
     refreshTokenCookieName?: string;
+    frontendUrl?: string;
 }
 export interface AuthModuleOptions extends IDynamicModuleConfig {
     bootstrapAppConfig?: IBootstrapAppConfig;
     config?: IAuthModuleConfig;
+    providers?: Provider[];
 }
 export interface AuthOptionsFactory extends IModuleOptionsFactory<IAuthModuleConfig> {
     createAuthOptions(): Promise<IAuthModuleConfig> | IAuthModuleConfig;
@@ -21,4 +23,5 @@ export interface AuthModuleAsyncOptions extends Pick<ModuleMetadata, 'imports'>,
     inject?: any[];
     useClass?: Type<AuthOptionsFactory>;
     useExisting?: Type<AuthOptionsFactory>;
+    providers?: Provider[];
 }

package/interfaces/authentication.interface.d.ts

@@ -51,3 +51,17 @@ export interface LoginResponseRequiresSelection {
     user: IUserMini;
     companies: CompanyWithBranches[];
 }
+export interface RegistrationResponse {
+    accessToken?: string;
+    refreshToken?: string;
+    user: IUserMini;
+    company?: ICompanyMini;
+    branch?: ICompanyBranchMini;
+    companyFeatureEnabled?: boolean;
+    requiresEmailVerification?: boolean;
+}
+export interface LoginResponseRequiresEmailVerification {
+    requiresEmailVerification: true;
+    email: string;
+    message: string;
+}

package/interfaces/index.d.ts

@@ -1,5 +1,7 @@
 export * from './authentication.interface';
+export * from './auth-email-provider.interface';
 export * from './company-branch.interface';
 export * from './company.interface';
 export * from './user.interface';
+export * from './user-enricher.interface';
 export * from './auth-module-options.interface';

package/interfaces/user-enricher.interface.d.ts

@@ -0,0 +1,67 @@
+import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
+import { QueryRunner, SelectQueryBuilder } from 'typeorm';
+import { User } from '../entities/user.entity';
+import { IUser } from './user.interface';
+export interface IProfileSection {
+    id: string;
+    name: string;
+    order: number;
+    icon?: string;
+    required?: boolean;
+    hasFileUpload?: boolean;
+    editPermission?: string;
+}
+export interface IProfileSectionData {
+    sectionId: string;
+    data: Record<string, any>;
+    isComplete: boolean;
+    files?: IProfileFile[];
+}
+export interface IProfileFile {
+    field: string;
+    id: string;
+    name: string;
+    url?: string;
+    type?: string;
+}
+export interface IProfileExtras {
+    roles?: IProfileRole[];
+    actions?: IProfileAction[];
+    sections?: IProfileSectionData[];
+    completionPercentage?: number;
+    [key: string]: any;
+}
+export interface IProfileRole {
+    id: string;
+    name: string;
+    description?: string | null;
+}
+export interface IProfileAction {
+    id: string;
+    name: string;
+    code: string;
+    description?: string | null;
+}
+export interface IEnrichedUser extends IUser {
+    [key: string]: any;
+}
+export interface IUserEnricher {
+    enrichListQuery?(query: SelectQueryBuilder<User>, user: ILoggedUserInfo | null): Promise<{
+        extraFields: string[];
+    }>;
+    enrichListItems?(users: IUser[], user: ILoggedUserInfo | null): Promise<IEnrichedUser[]>;
+    getProfileExtras?(userId: string, user: ILoggedUserInfo): Promise<IProfileExtras>;
+    updateProfileExtras?(userId: string, extras: Record<string, any>, queryRunner: QueryRunner): Promise<void>;
+    validateProfileExtras?(userId: string, extras: Record<string, any>, user: ILoggedUserInfo): Promise<void>;
+    getProfileSections?(): IProfileSection[];
+    getProfileSectionData?(userId: string, sectionId: string, user: ILoggedUserInfo): Promise<IProfileSectionData>;
+    updateProfileSection?(userId: string, sectionId: string, data: Record<string, any>, queryRunner: QueryRunner): Promise<void>;
+    handleSectionFileUpload?(userId: string, sectionId: string, field: string, fileInfo: {
+        name: string;
+        url: string;
+        size: number;
+        type: string;
+    }, queryRunner: QueryRunner): Promise<IProfileFile>;
+    handleSectionFileDelete?(userId: string, sectionId: string, field: string, fileId: string, queryRunner: QueryRunner): Promise<void>;
+    calculateProfileCompletion?(userId: string, user: ILoggedUserInfo): Promise<number>;
+}

package/interfaces/user.interface.d.ts

@@ -3,6 +3,7 @@ export interface IUserMini {
     id: string;
     email: string;
     name?: string;
+    phone?: string | null;
     profilePictureId?: string | null;
 }
 export interface IUser extends Identity {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flusys/nestjs-auth",
-  "version": "0.1.0-beta.3",
+  "version": "1.1.0-beta",
   "description": "Authentication and authorization infrastructure for NestJS applications",
   "main": "cjs/index.js",
   "module": "fesm/index.js",
@@ -91,7 +91,7 @@
     "typeorm": "^0.3.0"
   },
   "dependencies": {
-    "@flusys/nestjs-core": "0.1.0-beta.3",
-    "@flusys/nestjs-shared": "0.1.0-beta.3"
+    "@flusys/nestjs-core": "1.1.0-beta",
+    "@flusys/nestjs-shared": "1.1.0-beta"
   }
 }

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

@@ -12,6 +12,7 @@ export declare class AuthConfigService {
     getRefreshTokenSecret(): string;
     getRefreshTokenExpiration(): string;
     getRefreshTokenCookieName(): string;
+    getFrontendUrl(): string | undefined;
     getDefaultDatabaseConfig(): IDatabaseConfig | undefined;
     getTenantDefaultDatabaseConfig(): IDatabaseConfig | undefined;
     getTenants(): ITenantDatabaseConfig[];

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

@@ -0,0 +1,50 @@
+import { AuthDataSourceProvider } from './auth-datasource.provider';
+import { PendingRegistration } from '../entities/pending-registration.entity';
+import { IAuthEmailProvider } from '../interfaces';
+export declare class AuthEmailService {
+    private readonly dataSourceProvider?;
+    private readonly emailProvider?;
+    private readonly logger;
+    private readonly PASSWORD_RESET_EXPIRY;
+    private readonly EMAIL_VERIFICATION_EXPIRY;
+    constructor(dataSourceProvider?: AuthDataSourceProvider, emailProvider?: IAuthEmailProvider);
+    private getUserRepository;
+    private getUserTokenRepository;
+    private getPendingRegistrationRepository;
+    isEmailEnabled(): boolean;
+    private generateToken;
+    createPendingRegistration(data: {
+        email: string;
+        name?: string;
+        phone?: string;
+        password: string;
+        companyData?: PendingRegistration['companyData'];
+        verifyUrlBase: string;
+    }): Promise<{
+        success: boolean;
+        message: string;
+    }>;
+    forgotPassword(email: string, resetUrlBase: string): Promise<{
+        success: boolean;
+        message: string;
+    }>;
+    resetPassword(token: string, newPassword: string): Promise<{
+        success: boolean;
+        message: string;
+    }>;
+    verifyEmail(token: string): Promise<{
+        type: 'pending';
+        pending: PendingRegistration;
+    } | {
+        type: 'verified';
+        message: string;
+    }>;
+    resendVerificationEmail(email: string, verifyUrlBase: string): Promise<{
+        success: boolean;
+        message: string;
+    }>;
+    cleanupExpired(): Promise<{
+        deletedTokens: number;
+        deletedPending: number;
+    }>;
+}

package/services/authentication.service.d.ts

@@ -3,31 +3,43 @@ import { Repository } from 'typeorm';
 import { AuthConfigService } from './auth-config.service';
 import { AuthDataSourceProvider } from './auth-datasource.provider';
 import { RegistrationDto } from '../dtos/authentication.dto';
-import { LoginResponse, LoginResponseRequiresSelection, MeResponse } from '../interfaces/authentication.interface';
+import { HybridCache } from '@flusys/nestjs-shared/classes';
+import { LoginResponse, LoginResponseRequiresEmailVerification, LoginResponseRequiresSelection, MeResponse, RegistrationResponse } from '../interfaces/authentication.interface';
+import { AuthEmailService } from './auth-email.service';
 import { CompanyBranch } from '../entities/company-branch.entity';
 import { Company } from '../entities/company.entity';
+import { PendingRegistration } from '../entities/pending-registration.entity';
 import { UserCompanyPermission } from '../entities/user-company-permission.entity';
 import { User } from '../entities/user.entity';
 import { CompanySelectionSessionService } from './company-selection-session.service';
 export declare class AuthenticationService {
     private readonly jwtService;
     private readonly authConfig;
+    private readonly cacheManager?;
     private readonly dataSourceProvider?;
     private readonly sessionService?;
+    private readonly authEmailService?;
     private readonly injectedUserRepository?;
     private readonly injectedPermissionRepository?;
     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, authEmailService?: AuthEmailService, injectedUserRepository?: Repository<User>, injectedPermissionRepository?: Repository<UserCompanyPermission>, injectedCompanyRepository?: Repository<Company>, injectedBranchRepository?: Repository<CompanyBranch>);
     private getUserRepository;
     private getPermissionRepository;
     private getCompanyRepository;
     private getBranchRepository;
-    login(email: string, password: string): Promise<LoginResponse | LoginResponseRequiresSelection>;
+    login(email: string, password: string): Promise<LoginResponse | LoginResponseRequiresSelection | LoginResponseRequiresEmailVerification>;
     private handleCompanyBasedLogin;
-    register(dto: RegistrationDto): Promise<LoginResponse>;
+    register(dto: RegistrationDto, verifyUrlBase?: string): Promise<RegistrationResponse | {
+        requiresEmailVerification: true;
+        message: string;
+    }>;
+    private createUserDirectly;
+    createUserFromPendingRegistration(pending: PendingRegistration): Promise<RegistrationResponse>;
+    private handleCompanyRegistrationFromPending;
     private handleCompanyRegistration;
+    private processCompanyRegistration;
     private generateSlug;
     select(sessionId: string, companyId: string, branchId: string): Promise<LoginResponse>;
     switchCompany(userId: string, companyId: string, branchId: string): Promise<LoginResponse>;
@@ -36,7 +48,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>;
@@ -47,4 +61,6 @@ export declare class AuthenticationService {
     private generateLoginResponse;
     private generateLoginResponseWithCompany;
     private generateCompanySelectionResponse;
+    private generateRegistrationResponse;
+    private generateRegistrationResponseWithCompany;
 }

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/index.d.ts

@@ -1,4 +1,5 @@
 export * from './authentication.service';
+export * from './auth-email.service';
 export * from './company-selection-session.service';
 export * from './user.service';
 export * from './company.service';

package/services/user.service.d.ts

@@ -1,31 +1,31 @@
 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';
 import { CreateUserDto, UpdateUserDto } from '../dtos/user.dto';
 import { IUser } from '../interfaces/user.interface';
+import { IEnrichedUser, IProfileExtras, IProfileSection, IProfileSectionData, IUserEnricher } from '../interfaces/user-enricher.interface';
 import { User } from '../entities/user.entity';
 export declare class UserService extends RequestScopedApiService<CreateUserDto, UpdateUserDto, IUser, User, Repository<User>> {
     protected cacheManager: HybridCache;
     protected utilsService: UtilsService;
     private readonly dataSourceProvider;
     private readonly authConfig;
-    protected logger: Logger;
+    private readonly userEnricher?;
     private permissionRepository?;
     private dataSource?;
-    constructor(cacheManager: HybridCache, utilsService: UtilsService, dataSourceProvider: AuthDataSourceProvider, authConfig: AuthConfigService);
+    constructor(cacheManager: HybridCache, utilsService: UtilsService, dataSourceProvider: AuthDataSourceProvider, authConfig: AuthConfigService, userEnricher?: IUserEnricher);
     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 convertSingleDtoToEntity(dto: CreateUserDto | UpdateUserDto, user: ILoggedUserInfo | null): 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;
@@ -35,5 +35,16 @@ export declare class UserService extends RequestScopedApiService<CreateUserDto,
         isRaw: boolean;
     }>;
     insert(dto: CreateUserDto, user: ILoggedUserInfo | null): Promise<IUser>;
-    profile(dto: UpdateUserDto, user: ILoggedUserInfo): Promise<string>;
+    getProfileWithExtras(userId: string, user: ILoggedUserInfo): Promise<{
+        user: IUser;
+        extras?: IProfileExtras;
+    }>;
+    getEnrichedList(users: IUser[], user: ILoggedUserInfo | null): Promise<IEnrichedUser[]>;
+    getProfileSections(): Promise<IProfileSection[]>;
+    getProfileSectionData(userId: string, sectionId: string, user: ILoggedUserInfo): Promise<IProfileSectionData | null>;
+    updateProfileSection(userId: string, sectionId: string, data: Record<string, any>, user: ILoggedUserInfo): Promise<void>;
+    getProfileCompletion(userId: string, user: ILoggedUserInfo): Promise<number>;
+    profile(dto: UpdateUserDto & {
+        extras?: Record<string, any>;
+    }, user: ILoggedUserInfo): Promise<string>;
 }