@flusys/nestjs-auth 1.1.0-beta → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (86) hide show
  1. package/README.md +590 -473
  2. package/cjs/config/auth.constants.js +8 -0
  3. package/cjs/controllers/authentication.controller.js +218 -39
  4. package/cjs/controllers/branch.controller.js +44 -1
  5. package/cjs/controllers/company-selection.controller.js +27 -20
  6. package/cjs/controllers/company.controller.js +44 -1
  7. package/cjs/controllers/user-permission.controller.js +82 -154
  8. package/cjs/controllers/user.controller.js +68 -15
  9. package/cjs/docs/auth-swagger.config.js +14 -7
  10. package/cjs/dtos/authentication.dto.js +16 -43
  11. package/cjs/dtos/index.js +0 -1
  12. package/cjs/dtos/user-permission.dto.js +28 -0
  13. package/cjs/dtos/user.dto.js +19 -4
  14. package/cjs/entities/user-company-permission.entity.js +0 -6
  15. package/cjs/interceptors/clear-token.interceptor.js +10 -23
  16. package/cjs/interceptors/set-token.interceptor.js +15 -55
  17. package/cjs/interfaces/auth-email-provider.interface.js +1 -1
  18. package/cjs/modules/auth.module.js +63 -147
  19. package/cjs/services/auth-config.service.js +22 -28
  20. package/cjs/services/auth-datasource.provider.js +9 -21
  21. package/cjs/services/auth-email.service.js +89 -85
  22. package/cjs/services/authentication.service.js +225 -396
  23. package/cjs/services/branch.service.js +9 -4
  24. package/cjs/services/company-selection-session.service.js +1 -1
  25. package/cjs/services/user-permission.service.js +43 -73
  26. package/cjs/services/user.service.js +78 -64
  27. package/cjs/strategies/jwt.strategy.js +44 -44
  28. package/cjs/validators/password.validator.js +45 -0
  29. package/config/auth.constants.d.ts +2 -0
  30. package/controllers/authentication.controller.d.ts +5 -3
  31. package/controllers/company-selection.controller.d.ts +6 -2
  32. package/controllers/user-permission.controller.d.ts +5 -4
  33. package/controllers/user.controller.d.ts +6 -0
  34. package/dtos/authentication.dto.d.ts +0 -4
  35. package/dtos/company-branch.dto.d.ts +0 -1
  36. package/dtos/company.dto.d.ts +0 -1
  37. package/dtos/index.d.ts +0 -1
  38. package/dtos/user-permission.dto.d.ts +4 -0
  39. package/dtos/user.dto.d.ts +1 -3
  40. package/entities/index.d.ts +3 -3
  41. package/entities/user-company-permission.entity.d.ts +0 -2
  42. package/fesm/config/auth.constants.js +6 -13
  43. package/fesm/controllers/authentication.controller.js +221 -42
  44. package/fesm/controllers/branch.controller.js +45 -2
  45. package/fesm/controllers/company-selection.controller.js +28 -21
  46. package/fesm/controllers/company.controller.js +45 -2
  47. package/fesm/controllers/user-permission.controller.js +84 -156
  48. package/fesm/controllers/user.controller.js +71 -18
  49. package/fesm/docs/auth-swagger.config.js +14 -7
  50. package/fesm/dtos/authentication.dto.js +17 -44
  51. package/fesm/dtos/index.js +0 -1
  52. package/fesm/dtos/user-permission.dto.js +28 -0
  53. package/fesm/dtos/user.dto.js +20 -5
  54. package/fesm/entities/user-company-permission.entity.js +0 -6
  55. package/fesm/interceptors/clear-token.interceptor.js +9 -22
  56. package/fesm/interceptors/set-token.interceptor.js +14 -54
  57. package/fesm/interfaces/auth-email-provider.interface.js +1 -1
  58. package/fesm/modules/auth.module.js +64 -148
  59. package/fesm/services/auth-config.service.js +23 -29
  60. package/fesm/services/auth-datasource.provider.js +10 -22
  61. package/fesm/services/auth-email.service.js +90 -86
  62. package/fesm/services/authentication.service.js +225 -396
  63. package/fesm/services/branch.service.js +9 -4
  64. package/fesm/services/company-selection-session.service.js +1 -1
  65. package/fesm/services/user-permission.service.js +44 -74
  66. package/fesm/services/user.service.js +79 -65
  67. package/fesm/strategies/jwt.strategy.js +44 -44
  68. package/fesm/validators/password.validator.js +48 -0
  69. package/interceptors/clear-token.interceptor.d.ts +0 -1
  70. package/interceptors/set-token.interceptor.d.ts +1 -1
  71. package/interfaces/authentication.interface.d.ts +0 -4
  72. package/interfaces/user-enricher.interface.d.ts +1 -4
  73. package/modules/auth.module.d.ts +6 -3
  74. package/package.json +4 -4
  75. package/services/auth-config.service.d.ts +6 -8
  76. package/services/auth-datasource.provider.d.ts +2 -4
  77. package/services/auth-email.service.d.ts +8 -4
  78. package/services/authentication.service.d.ts +15 -16
  79. package/services/company-selection-session.service.d.ts +1 -1
  80. package/services/user-permission.service.d.ts +6 -9
  81. package/services/user.service.d.ts +3 -0
  82. package/strategies/jwt.strategy.d.ts +4 -1
  83. package/validators/password.validator.d.ts +10 -0
  84. package/cjs/dtos/user-company-permission.dto.js +0 -110
  85. package/dtos/user-company-permission.dto.d.ts +0 -10
  86. package/fesm/dtos/user-company-permission.dto.js +0 -98
@@ -27,6 +27,7 @@ function _ts_param(paramIndex, decorator) {
27
27
  }
28
28
  import { RequestScopedApiService, HybridCache } from '@flusys/nestjs-shared/classes';
29
29
  import { UtilsService } from '@flusys/nestjs-shared/modules';
30
+ import { applyCompanyFilter } from '@flusys/nestjs-shared/utils';
30
31
  import { Inject, Injectable, Scope } from '@nestjs/common';
31
32
  import { CompanyBranch } from '../entities/company-branch.entity';
32
33
  import { AuthConfigService } from './auth-config.service';
@@ -66,10 +67,14 @@ export class BranchService extends RequestScopedApiService {
66
67
  }
67
68
  async getExtraManipulateQuery(query, filterDto, user) {
68
69
  const result = await super.getExtraManipulateQuery(query, filterDto, user);
69
- if (this.authConfig.isCompanyFeatureEnabled() && user?.companyId) {
70
- query.andWhere('company_branch.company_id = :companyId', {
71
- companyId: user.companyId
72
- });
70
+ // Only apply company filter if companyId is NOT explicitly provided in filter
71
+ // This prevents dual filtering when user selects a specific company
72
+ if (!filterDto?.filter?.companyId) {
73
+ applyCompanyFilter(query, {
74
+ isCompanyFeatureEnabled: this.authConfig.isCompanyFeatureEnabled(),
75
+ entityAlias: 'company_branch',
76
+ columnName: 'company_id'
77
+ }, user);
73
78
  }
74
79
  return result;
75
80
  }
@@ -33,7 +33,7 @@ const SESSION_TTL_MS = 5 * 60 * 1000; // 5 minutes
33
33
  export class CompanySelectionSessionService {
34
34
  /**
35
35
  * Create a new session for company/branch selection
36
- */ async createSession(userId, companyId) {
36
+ */ async createSession(userId) {
37
37
  const sessionId = randomUUID();
38
38
  const now = new Date();
39
39
  const expiresAt = new Date(now.getTime() + SESSION_TTL_MS);
@@ -25,126 +25,96 @@ function _ts_param(paramIndex, decorator) {
25
25
  decorator(target, key, paramIndex);
26
26
  };
27
27
  }
28
- import { BadRequestException, Inject, Injectable, Logger, NotFoundException, Scope } from '@nestjs/common';
28
+ import { ConflictException, Inject, Injectable, NotFoundException, Scope } from '@nestjs/common';
29
29
  import { PermissionType, UserCompanyPermission } from '../entities/user-company-permission.entity';
30
30
  import { AuthDataSourceProvider } from './auth-datasource.provider';
31
31
  export class UserPermissionService {
32
- /** Get repository lazily - initialized on first access */ async getRepository() {
32
+ async getRepository() {
33
33
  if (!this._repository) {
34
34
  this._repository = await this.dataSourceProvider.getRepository(UserCompanyPermission);
35
35
  }
36
36
  return this._repository;
37
37
  }
38
- // Company Permissions
39
- /** Find all companies a user has access to */ async findUserCompanies(userId) {
38
+ // Generic Permission Operations
39
+ /** Find all permissions of a specific type for a user */ async findUserPermissions(userId, type) {
40
40
  const repository = await this.getRepository();
41
41
  return repository.find({
42
42
  where: {
43
43
  userId,
44
- permissionType: PermissionType.COMPANY
44
+ permissionType: type
45
45
  },
46
46
  relations: [
47
- 'company'
47
+ type === PermissionType.COMPANY ? 'company' : 'branch'
48
48
  ],
49
49
  order: {
50
50
  createdAt: 'DESC'
51
51
  }
52
52
  });
53
53
  }
54
- /** Assign user to a company */ async assignUserToCompany(dto) {
54
+ /** Assign permission to user */ async assignPermission(userId, targetId, type, metadata) {
55
55
  const repository = await this.getRepository();
56
- // Check if already exists
56
+ const typeName = type === PermissionType.COMPANY ? 'company' : 'branch';
57
57
  const existing = await repository.findOne({
58
58
  where: {
59
- userId: dto.userId,
60
- targetId: dto.companyId,
61
- permissionType: PermissionType.COMPANY
59
+ userId,
60
+ targetId,
61
+ permissionType: type
62
62
  }
63
63
  });
64
64
  if (existing) {
65
- throw new BadRequestException('User already assigned to this company');
65
+ throw new ConflictException(`User already assigned to this ${typeName}`);
66
66
  }
67
- const permission = repository.create({
68
- userId: dto.userId,
69
- permissionType: PermissionType.COMPANY,
70
- targetId: dto.companyId,
71
- metadata: dto.metadata
72
- });
73
- await repository.save(permission);
74
- }
75
- /** Revoke user access to a company */ async revokeCompanyAccess(userId, companyId) {
76
- const repository = await this.getRepository();
77
- const permission = await repository.findOne({
78
- where: {
67
+ try {
68
+ await repository.save(repository.create({
79
69
  userId,
80
- targetId: companyId,
81
- permissionType: PermissionType.COMPANY
70
+ permissionType: type,
71
+ targetId,
72
+ metadata
73
+ }));
74
+ } catch (error) {
75
+ if (error?.code === 'ER_DUP_ENTRY' || error?.message?.includes('Duplicate entry')) {
76
+ throw new ConflictException(`User already assigned to this ${typeName}. Please refresh and try again.`);
82
77
  }
83
- });
84
- if (!permission) {
85
- throw new NotFoundException('Company permission not found');
78
+ throw error;
86
79
  }
87
- await repository.remove(permission);
88
80
  }
89
- // Branch Permissions
90
- /** Find all branches a user has access to */ async findUserBranches(userId) {
91
- const repository = await this.getRepository();
92
- return repository.find({
93
- where: {
94
- userId,
95
- permissionType: PermissionType.BRANCH
96
- },
97
- relations: [
98
- 'branch'
99
- ],
100
- order: {
101
- createdAt: 'DESC'
102
- }
103
- });
104
- }
105
- /** Assign user to a branch */ async assignUserToBranch(dto) {
106
- const repository = await this.getRepository();
107
- // Check if already exists
108
- const existing = await repository.findOne({
109
- where: {
110
- userId: dto.userId,
111
- targetId: dto.branchId,
112
- permissionType: PermissionType.BRANCH
113
- }
114
- });
115
- if (existing) {
116
- throw new BadRequestException('User already assigned to this branch');
117
- }
118
- const permission = repository.create({
119
- userId: dto.userId,
120
- permissionType: PermissionType.BRANCH,
121
- targetId: dto.branchId,
122
- metadata: dto.metadata
123
- });
124
- await repository.save(permission);
125
- }
126
- /** Revoke user access to a branch */ async revokeBranchAccess(userId, branchId) {
81
+ /** Revoke permission from user */ async revokePermission(userId, targetId, type) {
127
82
  const repository = await this.getRepository();
83
+ const typeName = type === PermissionType.COMPANY ? 'company' : 'branch';
128
84
  const permission = await repository.findOne({
129
85
  where: {
130
86
  userId,
131
- targetId: branchId,
132
- permissionType: PermissionType.BRANCH
87
+ targetId,
88
+ permissionType: type
133
89
  }
134
90
  });
135
91
  if (!permission) {
136
- throw new NotFoundException('Branch permission not found');
92
+ throw new NotFoundException(`${typeName.charAt(0).toUpperCase() + typeName.slice(1)} permission not found`);
137
93
  }
138
94
  await repository.remove(permission);
139
95
  }
140
- // NOTE: @Inject() required for bundled code - type metadata may be lost during esbuild
96
+ /** Find user branch permissions with optional company filter */ async findUserBranches(userId, companyId) {
97
+ const repository = await this.getRepository();
98
+ const queryBuilder = repository.createQueryBuilder('permission').leftJoinAndSelect('permission.branch', 'branch').where('permission.userId = :userId', {
99
+ userId
100
+ }).andWhere('permission.permissionType = :type', {
101
+ type: PermissionType.BRANCH
102
+ }).orderBy('permission.createdAt', 'DESC');
103
+ if (companyId) {
104
+ queryBuilder.andWhere('branch.companyId = :companyId', {
105
+ companyId
106
+ });
107
+ }
108
+ return queryBuilder.getMany();
109
+ }
141
110
  constructor(dataSourceProvider){
142
111
  _define_property(this, "dataSourceProvider", void 0);
143
- _define_property(this, "logger", void 0);
144
112
  _define_property(this, "_repository", void 0);
113
+ // Convenience Methods
114
+ _define_property(this, "findUserCompanies", void 0);
145
115
  this.dataSourceProvider = dataSourceProvider;
146
- this.logger = new Logger(UserPermissionService.name);
147
116
  this._repository = null;
117
+ this.findUserCompanies = (userId)=>this.findUserPermissions(userId, PermissionType.COMPANY);
148
118
  }
149
119
  }
150
120
  UserPermissionService = _ts_decorate([
@@ -28,7 +28,7 @@ function _ts_param(paramIndex, decorator) {
28
28
  import { RequestScopedApiService, HybridCache } from '@flusys/nestjs-shared/classes';
29
29
  import { UtilsService } from '@flusys/nestjs-shared/modules';
30
30
  import { ErrorHandler } from '@flusys/nestjs-shared/utils';
31
- import { BadRequestException, Inject, Injectable, NotFoundException, Optional, Scope } from '@nestjs/common';
31
+ import { BadRequestException, ForbiddenException, Inject, Injectable, NotFoundException, Optional, Scope } from '@nestjs/common';
32
32
  import * as bcrypt from 'bcrypt';
33
33
  import { AuthConfigService } from './auth-config.service';
34
34
  import { AuthDataSourceProvider } from './auth-datasource.provider';
@@ -59,6 +59,24 @@ export class UserService extends RequestScopedApiService {
59
59
  }
60
60
  }
61
61
  // Custom Methods
62
+ /**
63
+ * Validate profile ownership, ensure repository initialized, and fetch user.
64
+ * Throws ForbiddenException if not owner, NotFoundException if user not found.
65
+ */ async getUserForProfile(userId, user) {
66
+ if (userId !== user.id) {
67
+ throw new ForbiddenException('Cannot access another user\'s profile');
68
+ }
69
+ await this.ensureRepositoryInitialized();
70
+ const userEntity = await this.repository.findOne({
71
+ where: {
72
+ id: userId
73
+ }
74
+ });
75
+ if (!userEntity) {
76
+ throw new NotFoundException('User not found');
77
+ }
78
+ return userEntity;
79
+ }
62
80
  /** Verify email */ async verifyEmail(id) {
63
81
  // Ensure repository is initialized for custom method
64
82
  await this.ensureRepositoryInitialized();
@@ -127,26 +145,51 @@ export class UserService extends RequestScopedApiService {
127
145
  return entity;
128
146
  }
129
147
  /** Convert entity to response DTO (removes password). In raw mode with company feature, isActive comes from permission table. */ convertEntityToResponseDto(entity, isRaw) {
148
+ if (isRaw) {
149
+ return this.convertRawToResponseDto(entity);
150
+ }
151
+ return this.convertEntityToDto(entity);
152
+ }
153
+ /** Convert raw query result to response DTO */ convertRawToResponseDto(raw) {
130
154
  // When raw mode is used with company feature, isActive comes from computed field
131
- // Raw mode uses snake_case column names (due to SnakeNamingStrategy)
132
- const isActive = isRaw && entity.user_companyIsActive !== undefined ? Boolean(entity.user_companyIsActive) : isRaw ? entity.user_is_active : entity.isActive;
155
+ const isActive = raw.user_companyIsActive !== undefined ? Boolean(raw.user_companyIsActive) : raw.user_is_active;
133
156
  return {
134
- id: isRaw ? entity.user_id : entity.id,
135
- name: isRaw ? entity.user_name : entity.name,
136
- phone: isRaw ? entity.user_phone : entity.phone,
137
- email: isRaw ? entity.user_email : entity.email,
138
- profilePictureId: isRaw ? entity.user_profile_picture_id : entity.profilePictureId,
157
+ id: raw.user_id,
158
+ name: raw.user_name,
159
+ phone: raw.user_phone,
160
+ email: raw.user_email,
161
+ profilePictureId: raw.user_profile_picture_id,
139
162
  isActive,
140
- emailVerified: isRaw ? entity.user_email_verified : entity.emailVerified,
141
- phoneVerified: isRaw ? entity.user_phone_verified : entity.phoneVerified,
142
- lastLoginAt: isRaw ? entity.user_last_login_at : entity.lastLoginAt,
143
- additionalFields: isRaw ? entity.user_additional_fields : entity.additionalFields,
144
- createdAt: isRaw ? entity.user_created_at : entity.createdAt,
145
- updatedAt: isRaw ? entity.user_updated_at : entity.updatedAt,
146
- deletedAt: isRaw ? entity.user_deleted_at : entity.deletedAt,
147
- createdById: isRaw ? entity.user_created_by_id : entity.createdById,
148
- updatedById: isRaw ? entity.user_updated_by_id : entity.updatedById,
149
- deletedById: isRaw ? entity.user_deleted_by_id : entity.deletedById
163
+ emailVerified: raw.user_email_verified,
164
+ phoneVerified: raw.user_phone_verified,
165
+ lastLoginAt: raw.user_last_login_at,
166
+ additionalFields: raw.user_additional_fields,
167
+ createdAt: raw.user_created_at,
168
+ updatedAt: raw.user_updated_at,
169
+ deletedAt: raw.user_deleted_at,
170
+ createdById: raw.user_created_by_id,
171
+ updatedById: raw.user_updated_by_id,
172
+ deletedById: raw.user_deleted_by_id
173
+ };
174
+ }
175
+ /** Convert entity to response DTO */ convertEntityToDto(entity) {
176
+ return {
177
+ id: entity.id,
178
+ name: entity.name,
179
+ phone: entity.phone,
180
+ email: entity.email,
181
+ profilePictureId: entity.profilePictureId,
182
+ isActive: entity.isActive,
183
+ emailVerified: entity.emailVerified,
184
+ phoneVerified: entity.phoneVerified,
185
+ lastLoginAt: entity.lastLoginAt,
186
+ additionalFields: entity.additionalFields,
187
+ createdAt: entity.createdAt,
188
+ updatedAt: entity.updatedAt,
189
+ deletedAt: entity.deletedAt,
190
+ createdById: entity.createdById,
191
+ updatedById: entity.updatedById,
192
+ deletedById: entity.deletedById
150
193
  };
151
194
  }
152
195
  /** Convert entity list to response DTO list */ convertEntityListToResponseListDto(entities, isRaw) {
@@ -291,15 +334,7 @@ export class UserService extends RequestScopedApiService {
291
334
  * Get user profile with extras from enricher
292
335
  * Returns base user data plus any extra data provided by enricher (roles, permissions, etc.)
293
336
  */ async getProfileWithExtras(userId, user) {
294
- await this.ensureRepositoryInitialized();
295
- const userEntity = await this.repository.findOne({
296
- where: {
297
- id: userId
298
- }
299
- });
300
- if (!userEntity) {
301
- throw new NotFoundException('User not found');
302
- }
337
+ const userEntity = await this.getUserForProfile(userId, user);
303
338
  const userData = this.convertEntityToResponseDto(userEntity, false);
304
339
  // Get extras from enricher if available
305
340
  let extras;
@@ -334,16 +369,7 @@ export class UserService extends RequestScopedApiService {
334
369
  /**
335
370
  * Get specific profile section data
336
371
  */ async getProfileSectionData(userId, sectionId, user) {
337
- await this.ensureRepositoryInitialized();
338
- // Verify user exists
339
- const userEntity = await this.repository.findOne({
340
- where: {
341
- id: userId
342
- }
343
- });
344
- if (!userEntity) {
345
- throw new NotFoundException('User not found');
346
- }
372
+ await this.getUserForProfile(userId, user);
347
373
  if (this.userEnricher?.getProfileSectionData) {
348
374
  return this.userEnricher.getProfileSectionData(userId, sectionId, user);
349
375
  }
@@ -352,19 +378,10 @@ export class UserService extends RequestScopedApiService {
352
378
  /**
353
379
  * Update specific profile section
354
380
  */ async updateProfileSection(userId, sectionId, data, user) {
355
- await this.ensureRepositoryInitialized();
381
+ const userEntity = await this.getUserForProfile(userId, user);
356
382
  if (!this.dataSource) {
357
383
  throw new BadRequestException('DataSource not available');
358
384
  }
359
- // Verify user exists
360
- const userEntity = await this.repository.findOne({
361
- where: {
362
- id: userId
363
- }
364
- });
365
- if (!userEntity) {
366
- throw new NotFoundException('User not found');
367
- }
368
385
  if (!this.userEnricher?.updateProfileSection) {
369
386
  throw new BadRequestException('Profile sections not supported');
370
387
  }
@@ -391,16 +408,7 @@ export class UserService extends RequestScopedApiService {
391
408
  /**
392
409
  * Get profile completion percentage
393
410
  */ async getProfileCompletion(userId, user) {
394
- await this.ensureRepositoryInitialized();
395
- // Verify user exists
396
- const userEntity = await this.repository.findOne({
397
- where: {
398
- id: userId
399
- }
400
- });
401
- if (!userEntity) {
402
- throw new NotFoundException('User not found');
403
- }
411
+ await this.getUserForProfile(userId, user);
404
412
  if (this.userEnricher?.calculateProfileCompletion) {
405
413
  return this.userEnricher.calculateProfileCompletion(userId, user);
406
414
  }
@@ -431,16 +439,22 @@ export class UserService extends RequestScopedApiService {
431
439
  }
432
440
  // Handle password update
433
441
  if (dto.password) {
434
- // If updating own profile, require old password
435
- if (!dto.id || dto.id === user.id) {
436
- // This would need oldPassword in DTO - for now, skip if not provided
437
- // In real implementation, add oldPassword to UpdateUserDto
442
+ // If updating own profile, require old password verification
443
+ const isOwnProfile = !dto.id || dto.id === user.id;
444
+ if (isOwnProfile) {
445
+ if (!dto.oldPassword) {
446
+ throw new BadRequestException('Current password is required to change your password');
447
+ }
448
+ const isPasswordValid = await bcrypt.compare(dto.oldPassword, findUser.password);
449
+ if (!isPasswordValid) {
450
+ throw new BadRequestException('Current password is incorrect');
451
+ }
438
452
  }
439
- const salt = await bcrypt.genSalt();
440
- findUser.password = await bcrypt.hash(dto.password, salt);
453
+ findUser.password = await bcrypt.hash(dto.password, BCRYPT_SALT_ROUNDS);
441
454
  }
442
- // Merge other fields (excluding password and extras)
443
- const { password, extras, ...restDto } = dto;
455
+ // Merge other fields (excluding password, oldPassword, extras, and sensitive flags)
456
+ // Users cannot self-modify emailVerified, phoneVerified, or isActive via profile update
457
+ const { password, oldPassword, extras, emailVerified, phoneVerified, isActive, ...restDto } = dto;
444
458
  Object.assign(findUser, restDto);
445
459
  await queryRunner.manager.save(this.repository.target, findUser);
446
460
  // Handle extras update via enricher
@@ -24,75 +24,75 @@ import { Injectable, UnauthorizedException } from '@nestjs/common';
24
24
  import { ModuleRef } from '@nestjs/core';
25
25
  import { PassportStrategy } from '@nestjs/passport';
26
26
  import { ExtractJwt, Strategy } from 'passport-jwt';
27
+ import { User } from '../entities/user.entity';
27
28
  import { AuthConfigService } from '../services/auth-config.service';
28
29
  import { AuthDataSourceProvider } from '../services/auth-datasource.provider';
29
30
  import { AuthenticationService } from '../services/authentication.service';
30
- import { User } from '../entities/user.entity';
31
- /**
32
- * Type guard to check if payload includes company context
33
- */ function isTokenPayloadWithCompany(payload) {
31
+ function hasCompanyContext(payload) {
34
32
  return 'companyId' in payload && 'branchId' in payload;
35
33
  }
36
34
  export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {
37
35
  async validate(_req, payload) {
38
- // Resolve request-scoped services for this request
39
- let userRepository = null;
40
- let authService = null;
36
+ const userRepo = await this.resolveUserRepository();
37
+ await this.checkTokenRevocation(payload);
38
+ const user = await userRepo.findOne({
39
+ where: {
40
+ id: payload.id,
41
+ isActive: true
42
+ }
43
+ });
44
+ if (!user) {
45
+ throw new UnauthorizedException('User not found or inactive');
46
+ }
47
+ return this.buildUserInfo(payload);
48
+ }
49
+ async resolveUserRepository() {
41
50
  try {
42
- const dataSourceProvider = await this.moduleRef.resolve(AuthDataSourceProvider, undefined, {
51
+ const provider = await this.moduleRef.resolve(AuthDataSourceProvider, undefined, {
43
52
  strict: false
44
53
  });
45
- if (dataSourceProvider) {
46
- userRepository = await dataSourceProvider.getRepository(User);
54
+ if (provider) {
55
+ return provider.getRepository(User);
47
56
  }
48
- // Resolve AuthenticationService for token revocation check
49
- authService = await this.moduleRef.resolve(AuthenticationService, undefined, {
50
- strict: false
51
- });
52
- } catch (error) {
57
+ } catch {
53
58
  throw new UnauthorizedException('Unable to access user data');
54
59
  }
55
- if (!userRepository) {
56
- throw new UnauthorizedException('User repository not available');
57
- }
58
- // Check if token is revoked (logged out)
59
- if (authService && payload.iat) {
60
- const isRevoked = await authService.isTokenRevoked(payload.id, payload.iat);
61
- if (isRevoked) {
60
+ throw new UnauthorizedException('User repository not available');
61
+ }
62
+ async checkTokenRevocation(payload) {
63
+ if (!payload.iat) return;
64
+ try {
65
+ const authService = await this.moduleRef.resolve(AuthenticationService, undefined, {
66
+ strict: false
67
+ });
68
+ if (authService && await authService.isTokenRevoked(payload.id, payload.iat)) {
62
69
  throw new UnauthorizedException('Token has been revoked');
63
70
  }
71
+ } catch (err) {
72
+ if (err instanceof UnauthorizedException) throw err;
64
73
  }
65
- // Find user and check if active
66
- const user = await userRepository.findOne({
67
- where: {
68
- id: payload.id,
69
- isActive: true
70
- }
71
- });
72
- if (!user) {
73
- throw new UnauthorizedException('User not found or inactive');
74
- }
75
- const result = {
74
+ }
75
+ buildUserInfo(payload) {
76
+ const base = {
76
77
  id: payload.id,
77
78
  email: payload.email
78
79
  };
79
- // Company context - use type guard for type safety
80
- if (isTokenPayloadWithCompany(payload)) {
81
- result.companyId = payload.companyId;
82
- // Only set branchId if it's not empty string
83
- if (payload.branchId) {
84
- result.branchId = payload.branchId;
85
- }
80
+ if (!hasCompanyContext(payload)) {
81
+ return base;
86
82
  }
87
- return result;
83
+ return {
84
+ ...base,
85
+ companyId: payload.companyId,
86
+ ...payload.branchId && {
87
+ branchId: payload.branchId
88
+ }
89
+ };
88
90
  }
89
91
  constructor(authConfig, moduleRef){
90
92
  super({
91
93
  jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
92
94
  ignoreExpiration: false,
93
- // Use secretOrKeyProvider instead of secretOrKey to defer secret lookup
94
- // This ensures AuthConfigService is fully initialized when using forRootAsync
95
- secretOrKeyProvider: (_request, _rawJwtToken, done)=>{
95
+ secretOrKeyProvider: (_req, _token, done)=>{
96
96
  done(null, this.authConfig.getJwtSecret());
97
97
  },
98
98
  passReqToCallback: true
@@ -0,0 +1,48 @@
1
+ import { registerDecorator } from 'class-validator';
2
+ /**
3
+ * Strong password validation decorator.
4
+ * Validates that passwords meet complexity requirements to prevent weak passwords.
5
+ *
6
+ * @example
7
+ * ```typescript
8
+ * @IsStrongPassword()
9
+ * password!: string;
10
+ *
11
+ * // With custom options
12
+ * @IsStrongPassword({ minLength: 12, requireSpecialChar: false })
13
+ * password!: string;
14
+ * ```
15
+ */ export function IsStrongPassword(options = {}, validationOptions) {
16
+ const { minLength = 8, maxLength = 128, requireUppercase = true, requireLowercase = true, requireNumber = true, requireSpecialChar = true } = options;
17
+ return function(object, propertyName) {
18
+ registerDecorator({
19
+ name: 'isStrongPassword',
20
+ target: object.constructor,
21
+ propertyName: propertyName,
22
+ options: validationOptions,
23
+ validator: {
24
+ validate (value) {
25
+ if (typeof value !== 'string') return false;
26
+ const checks = [
27
+ value.length >= minLength,
28
+ value.length <= maxLength,
29
+ !requireUppercase || /[A-Z]/.test(value),
30
+ !requireLowercase || /[a-z]/.test(value),
31
+ !requireNumber || /[0-9]/.test(value),
32
+ !requireSpecialChar || /[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?~`]/.test(value)
33
+ ];
34
+ return checks.every(Boolean);
35
+ },
36
+ defaultMessage (args) {
37
+ const requirements = [];
38
+ if (minLength > 0) requirements.push(`at least ${minLength} characters`);
39
+ if (requireUppercase) requirements.push('one uppercase letter');
40
+ if (requireLowercase) requirements.push('one lowercase letter');
41
+ if (requireNumber) requirements.push('one number');
42
+ if (requireSpecialChar) requirements.push('one special character (!@#$%^&*...)');
43
+ return `Password must contain ${requirements.join(', ')}`;
44
+ }
45
+ }
46
+ });
47
+ };
48
+ }
@@ -6,5 +6,4 @@ export declare class ClearToken implements NestInterceptor {
6
6
  constructor(authConfig?: AuthConfigService);
7
7
  private get cookieName();
8
8
  intercept(context: ExecutionContext, next: CallHandler): Observable<unknown>;
9
- private clearRefreshTokenCookie;
10
9
  }
@@ -5,7 +5,7 @@ export declare class SetToken implements NestInterceptor {
5
5
  private readonly authConfig?;
6
6
  constructor(authConfig?: AuthConfigService);
7
7
  private get cookieName();
8
+ private get maxAgeMs();
8
9
  intercept(context: ExecutionContext, next: CallHandler): Observable<unknown>;
9
- private isBrowserRequest;
10
10
  private setRefreshTokenCookie;
11
11
  }
@@ -22,7 +22,6 @@ export interface LoginResponse {
22
22
  user: IUserMini;
23
23
  company?: ICompanyMini;
24
24
  branch?: ICompanyBranchMini;
25
- companyFeatureEnabled?: boolean;
26
25
  }
27
26
  export interface MeResponse {
28
27
  user: IUserMini;
@@ -33,14 +32,12 @@ export interface BranchForSelection {
33
32
  id: string;
34
33
  name: string;
35
34
  slug: string;
36
- isActive: boolean;
37
35
  logoId?: string | null;
38
36
  }
39
37
  export interface CompanyWithBranches {
40
38
  id: string;
41
39
  name: string;
42
40
  slug: string;
43
- isActive: boolean;
44
41
  logoId?: string | null;
45
42
  branches: BranchForSelection[];
46
43
  }
@@ -57,7 +54,6 @@ export interface RegistrationResponse {
57
54
  user: IUserMini;
58
55
  company?: ICompanyMini;
59
56
  branch?: ICompanyBranchMini;
60
- companyFeatureEnabled?: boolean;
61
57
  requiresEmailVerification?: boolean;
62
58
  }
63
59
  export interface LoginResponseRequiresEmailVerification {
@@ -29,7 +29,6 @@ export interface IProfileExtras {
29
29
  actions?: IProfileAction[];
30
30
  sections?: IProfileSectionData[];
31
31
  completionPercentage?: number;
32
- [key: string]: any;
33
32
  }
34
33
  export interface IProfileRole {
35
34
  id: string;
@@ -42,9 +41,7 @@ export interface IProfileAction {
42
41
  code: string;
43
42
  description?: string | null;
44
43
  }
45
- export interface IEnrichedUser extends IUser {
46
- [key: string]: any;
47
- }
44
+ export type IEnrichedUser = IUser & IProfileExtras;
48
45
  export interface IUserEnricher {
49
46
  enrichListQuery?(query: SelectQueryBuilder<User>, user: ILoggedUserInfo | null): Promise<{
50
47
  extraFields: string[];