@nauth-toolkit/mfa-sms 0.8.1 → 0.8.2

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.
@@ -242,10 +242,16 @@ export interface VerifyTOTPSetupDTO {
242
242
  */
243
243
  export interface SetupSMSMFADTO {
244
244
  /**
245
- * Phone number in E.164 format
245
+ * Phone number in E.164 format.
246
+ *
247
+ * Optional: when omitted the phone on the account is used. Required when the account has
248
+ * no phone. When supplied and different from the account phone, the account phone is
249
+ * replaced, marked unverified, existing SMS MFA devices are removed, and the code is sent
250
+ * to the new number.
251
+ *
246
252
  * @example '+1234567890'
247
253
  */
248
- phoneNumber: string;
254
+ phoneNumber?: string;
249
255
  /**
250
256
  * User-friendly device name
251
257
  * @example 'My iPhone', 'Work Phone'
@@ -260,16 +266,16 @@ export interface SetupSMSMFADTO {
260
266
  * @example
261
267
  * ```typescript
262
268
  * {
263
- * phoneNumber: '+1234567890',
264
269
  * code: '123456'
265
270
  * }
266
271
  * ```
267
272
  */
268
273
  export interface VerifySMSMFASetupDTO {
269
274
  /**
270
- * Phone number receiving the code
275
+ * Optional consistency check: must equal the phone on the account when supplied.
276
+ * The device is always bound to the account phone; use setup() to change the number.
271
277
  */
272
- phoneNumber: string;
278
+ phoneNumber?: string;
273
279
  /**
274
280
  * SMS verification code
275
281
  */
@@ -1 +1 @@
1
- {"version":3,"file":"mfa.dto.d.ts","sourceRoot":"","sources":["../../../src/dto/mfa.dto.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mfa.dto.d.ts","sourceRoot":"","sources":["../../../src/dto/mfa.dto.ts"],"names":[],"mappings":"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"}
@@ -453,7 +453,7 @@
453
453
  "properties": {
454
454
  "phoneNumber": {
455
455
  "type": "string",
456
- "description": "Phone number in E.164 format",
456
+ "description": "Phone number in E.164 format.\n\nOptional: when omitted the phone on the account is used. Required when the account has no phone. When supplied and different from the account phone, the account phone is replaced, marked unverified, existing SMS MFA devices are removed, and the code is sent to the new number.",
457
457
  "examples": [
458
458
  "+1234567890"
459
459
  ]
@@ -463,9 +463,6 @@
463
463
  "description": "User-friendly device name"
464
464
  }
465
465
  },
466
- "required": [
467
- "phoneNumber"
468
- ],
469
466
  "additionalProperties": false,
470
467
  "description": "Setup SMS MFA DTO\n\nConfigure SMS as MFA method. Sends verification code to phone number."
471
468
  },
@@ -683,7 +680,7 @@
683
680
  "properties": {
684
681
  "phoneNumber": {
685
682
  "type": "string",
686
- "description": "Phone number receiving the code"
683
+ "description": "Optional consistency check: must equal the phone on the account when supplied. The device is always bound to the account phone; use setup() to change the number."
687
684
  },
688
685
  "code": {
689
686
  "type": "string",
@@ -691,7 +688,6 @@
691
688
  }
692
689
  },
693
690
  "required": [
694
- "phoneNumber",
695
691
  "code"
696
692
  ],
697
693
  "additionalProperties": false,
@@ -29,22 +29,26 @@ export declare class SMSMFAProviderService extends BaseMFAProviderService {
29
29
  /**
30
30
  * Setup SMS MFA for user
31
31
  *
32
- * Sends verification code to phone number, or auto-completes setup if phone is already verified.
33
- * User must verify code to complete setup (unless phone is already verified).
32
+ * Resolves the phone number to enrol and either auto-completes (phone on file already
33
+ * verified and no different number supplied) or sends a verification code.
34
34
  *
35
- * @param user - User setting up SMS MFA
36
- * @param setupData - Setup data (must be SetupSMSMFADTO)
35
+ * When `setupData.phoneNumber` is supplied it is saved to the account through
36
+ * `PhoneVerificationService.setPhoneAndSendVerification()` (E.164 check, uniqueness,
37
+ * verification reset, hooks) and the code goes to that number. A number different from
38
+ * the phone on file replaces it and retires existing SMS MFA devices, the same outcome as
39
+ * changing the phone through the profile endpoint. Calling again without `phoneNumber`
40
+ * resends to the phone on file. This makes SMS enrolment possible for accounts that have
41
+ * no phone (email-only or social signup).
42
+ *
43
+ * @param setupData - Setup data (SetupSMSMFADTO, plus `challengeSessionId` when called from a challenge)
37
44
  * @returns Setup result with deviceId if auto-completed, or maskedPhone if code was sent
38
- * @throws {NAuthException} If SMS is not enabled or phone verification service unavailable
45
+ * @throws {NAuthException} VALIDATION_FAILED | PHONE_REQUIRED | INVALID_PHONE_FORMAT | PHONE_EXISTS | RATE_LIMIT_SMS | RATE_LIMIT_RESEND
39
46
  *
40
47
  * @example
41
48
  * ```typescript
42
- * const result = await provider.setup(user, {
43
- * phoneNumber: '+1234567890',
44
- * deviceName: 'My Phone'
45
- * });
46
- * // If phone verified: { deviceId: 123, autoCompleted: true }
47
- * // If phone not verified: { maskedPhone: '***-***-7890' } (SMS code sent)
49
+ * const result = await provider.setup({ phoneNumber: '+14155552671', deviceName: 'My Phone' });
50
+ * // Phone on file verified, no number supplied: { deviceId: 123, autoCompleted: true }
51
+ * // Otherwise: { maskedPhone: '+1***2671' } (SMS code sent)
48
52
  * ```
49
53
  */
50
54
  setup(setupData?: unknown): Promise<{
@@ -53,6 +57,19 @@ export declare class SMSMFAProviderService extends BaseMFAProviderService {
53
57
  } | {
54
58
  maskedPhone: string;
55
59
  }>;
60
+ /**
61
+ * Retire SMS MFA devices after the account phone changed during setup.
62
+ *
63
+ * Mirrors `UserService.updateUserAttributes()`: the devices were bound to the old number,
64
+ * so they are deleted, the removal is audited, and MFA is switched off when no active
65
+ * device of any type remains (the user is mid-enrolment and will re-enable it on verify).
66
+ *
67
+ * @param userId - Internal user ID
68
+ * @param sub - User external identifier (for logs)
69
+ * @param oldPhone - Phone the devices were tied to
70
+ * @param newPhone - Phone now on file (unverified)
71
+ */
72
+ private retireSmsDevicesForPhoneChange;
56
73
  /**
57
74
  * Verify and complete SMS MFA setup
58
75
  *
@@ -64,18 +81,18 @@ export declare class SMSMFAProviderService extends BaseMFAProviderService {
64
81
  *
65
82
  * Note: SMS MFA is treated as a singleton method in NAuth (one active SMS device per user).
66
83
  *
67
- * @param user - User completing SMS MFA setup
68
- * @param verificationData - Verification data (must be VerifySMSMFASetupDTO)
84
+ * The device is always bound to the phone on the account (`user.phone`), which the code
85
+ * just verified. `verificationData.phoneNumber` is optional and only a consistency check:
86
+ * when supplied it must equal the account phone. Change the number with `setup()` instead.
87
+ *
88
+ * @param verificationData - Verification data (VerifySMSMFASetupDTO, plus `challengeSessionId` when called from a challenge)
69
89
  * @param deviceName - Optional device name override
70
90
  * @returns MFA device ID (created or existing)
71
- * @throws {NAuthException} If code is invalid
91
+ * @throws {NAuthException} VALIDATION_FAILED | PHONE_REQUIRED | VERIFICATION_CODE_INVALID | VERIFICATION_CODE_EXPIRED | VERIFICATION_TOO_MANY_ATTEMPTS
72
92
  *
73
93
  * @example
74
94
  * ```typescript
75
- * const deviceId = await provider.verifySetup(user, {
76
- * phoneNumber: '+1234567890',
77
- * code: '123456'
78
- * });
95
+ * const deviceId = await provider.verifySetup({ code: '123456' });
79
96
  * ```
80
97
  */
81
98
  verifySetup(verificationData: unknown, deviceName?: string): Promise<number>;
@@ -1 +1 @@
1
- {"version":3,"file":"sms-mfa-provider.service.d.ts","sourceRoot":"","sources":["../../src/sms-mfa-provider.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC,OAAO,EACL,aAAa,EACb,QAAQ,EACR,WAAW,EACX,WAAW,EAGX,wBAAwB,EACxB,SAAS,EAGT,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAG1G;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,qBAAa,qBAAsB,SAAQ,sBAAsB;IAS7D,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAC;IAR5C,QAAQ,CAAC,UAAU,iBAAiB;gBAGlC,mBAAmB,EAAE,UAAU,CAAC,aAAa,CAAC,EAC9C,cAAc,EAAE,UAAU,CAAC,QAAQ,CAAC,EACpC,MAAM,EAAE,WAAW,EACnB,MAAM,EAAE,WAAW,EACnB,eAAe,EAAE,OAAO,EACP,wBAAwB,CAAC,EAAE,wBAAwB,YAAA,EACpE,gBAAgB,CAAC,EAAE,gBAAgB,EACnC,YAAY,CAAC,EAAE,gBAAgB,EAC/B,iBAAiB,CAAC,EAAE,iBAAiB;IAcvC;;;;;;;;;;;;;;;;;;;;OAoBG;IACG,KAAK,CAAC,SAAS,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,IAAI,CAAA;KAAE,GAAG;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC;IAyE9G;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACG,WAAW,CAAC,gBAAgB,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA2ElF;;;;;;;;;;;;;;;OAeG;IACG,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAqEhE;;;;;;;;;;;;;;OAcG;IACG,aAAa,CAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CA6ClE"}
1
+ {"version":3,"file":"sms-mfa-provider.service.d.ts","sourceRoot":"","sources":["../../src/sms-mfa-provider.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC,OAAO,EACL,aAAa,EACb,QAAQ,EACR,WAAW,EACX,WAAW,EAIX,wBAAwB,EACxB,SAAS,EAIT,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAG1G;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,qBAAa,qBAAsB,SAAQ,sBAAsB;IAS7D,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAC;IAR5C,QAAQ,CAAC,UAAU,iBAAiB;gBAGlC,mBAAmB,EAAE,UAAU,CAAC,aAAa,CAAC,EAC9C,cAAc,EAAE,UAAU,CAAC,QAAQ,CAAC,EACpC,MAAM,EAAE,WAAW,EACnB,MAAM,EAAE,WAAW,EACnB,eAAe,EAAE,OAAO,EACP,wBAAwB,CAAC,EAAE,wBAAwB,YAAA,EACpE,gBAAgB,CAAC,EAAE,gBAAgB,EACnC,YAAY,CAAC,EAAE,gBAAgB,EAC/B,iBAAiB,CAAC,EAAE,iBAAiB;IAcvC;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACG,KAAK,CAAC,SAAS,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,IAAI,CAAA;KAAE,GAAG;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC;IAuF9G;;;;;;;;;;;OAWG;YACW,8BAA8B;IAyD5C;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACG,WAAW,CAAC,gBAAgB,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA+GlF;;;;;;;;;;;;;;;OAeG;IACG,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAqEhE;;;;;;;;;;;;;;OAcG;IACG,aAAa,CAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CA6ClE"}
@@ -36,22 +36,26 @@ class SMSMFAProviderService extends internal_1.BaseMFAProviderService {
36
36
  /**
37
37
  * Setup SMS MFA for user
38
38
  *
39
- * Sends verification code to phone number, or auto-completes setup if phone is already verified.
40
- * User must verify code to complete setup (unless phone is already verified).
39
+ * Resolves the phone number to enrol and either auto-completes (phone on file already
40
+ * verified and no different number supplied) or sends a verification code.
41
41
  *
42
- * @param user - User setting up SMS MFA
43
- * @param setupData - Setup data (must be SetupSMSMFADTO)
42
+ * When `setupData.phoneNumber` is supplied it is saved to the account through
43
+ * `PhoneVerificationService.setPhoneAndSendVerification()` (E.164 check, uniqueness,
44
+ * verification reset, hooks) and the code goes to that number. A number different from
45
+ * the phone on file replaces it and retires existing SMS MFA devices, the same outcome as
46
+ * changing the phone through the profile endpoint. Calling again without `phoneNumber`
47
+ * resends to the phone on file. This makes SMS enrolment possible for accounts that have
48
+ * no phone (email-only or social signup).
49
+ *
50
+ * @param setupData - Setup data (SetupSMSMFADTO, plus `challengeSessionId` when called from a challenge)
44
51
  * @returns Setup result with deviceId if auto-completed, or maskedPhone if code was sent
45
- * @throws {NAuthException} If SMS is not enabled or phone verification service unavailable
52
+ * @throws {NAuthException} VALIDATION_FAILED | PHONE_REQUIRED | INVALID_PHONE_FORMAT | PHONE_EXISTS | RATE_LIMIT_SMS | RATE_LIMIT_RESEND
46
53
  *
47
54
  * @example
48
55
  * ```typescript
49
- * const result = await provider.setup(user, {
50
- * phoneNumber: '+1234567890',
51
- * deviceName: 'My Phone'
52
- * });
53
- * // If phone verified: { deviceId: 123, autoCompleted: true }
54
- * // If phone not verified: { maskedPhone: '***-***-7890' } (SMS code sent)
56
+ * const result = await provider.setup({ phoneNumber: '+14155552671', deviceName: 'My Phone' });
57
+ * // Phone on file verified, no number supplied: { deviceId: 123, autoCompleted: true }
58
+ * // Otherwise: { maskedPhone: '+1***2671' } (SMS code sent)
55
59
  * ```
56
60
  */
57
61
  async setup(setupData) {
@@ -64,47 +68,119 @@ class SMSMFAProviderService extends internal_1.BaseMFAProviderService {
64
68
  const dto = setupData;
65
69
  const userEntity = user;
66
70
  const isPhoneVerified = userEntity.isPhoneVerified || false;
67
- // Get phone number from setupData or user object
68
- const phoneNumber = dto?.phoneNumber || userEntity.phone;
69
- if (!phoneNumber) {
71
+ const currentPhone = userEntity.phone || undefined;
72
+ const suppliedPhone = typeof dto?.phoneNumber === 'string' && dto.phoneNumber.trim() !== ''
73
+ ? dto.phoneNumber.replace(/\s/g, '')
74
+ : undefined;
75
+ const targetPhone = suppliedPhone || currentPhone;
76
+ if (!targetPhone) {
70
77
  throw new core_1.NAuthException(core_1.AuthErrorCode.PHONE_REQUIRED, 'Phone number is required for SMS MFA setup. Please provide a phone number.');
71
78
  }
72
79
  // ============================================================================
73
- // Special case: If phone is already verified, auto-complete MFA setup
74
- // No SMS code needed - create device directly
80
+ // Auto-complete: phone on file is verified and the caller did not ask for a
81
+ // different number. No SMS code needed - create device directly.
75
82
  // ============================================================================
76
- if (isPhoneVerified) {
83
+ if (isPhoneVerified && targetPhone === currentPhone) {
77
84
  this.logger?.log?.(`Phone already verified for user ${user.sub}, auto-completing SMS MFA setup`);
78
- // Auto-create MFA device without code verification
79
- const deviceId = await this.verifySetup({
80
- phoneNumber,
81
- code: '', // Code not needed when phone is verified
82
- }, dto?.deviceName);
85
+ const deviceId = await this.verifySetup({ code: '' }, dto?.deviceName);
83
86
  return { deviceId, autoCompleted: true };
84
87
  }
85
- // Phone not verified - send SMS verification code
86
88
  // Check if phone verification service is available
87
89
  if (!this.phoneVerificationService) {
88
90
  throw new core_1.NAuthException(core_1.AuthErrorCode.VALIDATION_FAILED, 'Phone verification service is not available. SMS provider must be configured.');
89
91
  }
90
- // Send SMS verification code (phone not verified, so code is required)
91
- // Link verification token to challenge session if provided in setupData
92
- const sendDto = new core_1.SendVerificationSMSDTO();
93
- sendDto.sub = user.sub;
94
- const setupDataWithSession = setupData;
95
- if (setupDataWithSession?.challengeSessionId) {
96
- sendDto.challengeSessionId = setupDataWithSession.challengeSessionId;
97
- this.logger?.debug?.(`Linking SMS verification token to challenge session: challengeSessionId=${setupDataWithSession.challengeSessionId}`);
92
+ if (dto?.challengeSessionId) {
93
+ this.logger?.debug?.(`Linking SMS verification token to challenge session: challengeSessionId=${dto.challengeSessionId}`);
98
94
  }
99
- else {
100
- this.logger?.warn?.(`No challengeSessionId provided in setupData for SMS MFA setup. Token will not be linked to challenge session.`);
95
+ // ============================================================================
96
+ // Number supplied: persist it (new or unchanged-but-unverified) and send the code
97
+ // through the shared core path. A changed number also retires SMS devices tied to
98
+ // the old one so login codes cannot go to an unverified number.
99
+ // ============================================================================
100
+ if (suppliedPhone) {
101
+ const setPhoneDto = Object.assign(new core_1.SetPhoneAndSendVerificationDTO(), {
102
+ sub: user.sub,
103
+ phone: suppliedPhone,
104
+ challengeSessionId: dto?.challengeSessionId,
105
+ });
106
+ const result = await this.phoneVerificationService.setPhoneAndSendVerification(setPhoneDto);
107
+ if (result.phoneChanged && currentPhone) {
108
+ await this.retireSmsDevicesForPhoneChange(userEntity.id, user.sub, currentPhone, suppliedPhone);
109
+ }
110
+ const maskedPhone = this.maskPhone(suppliedPhone);
111
+ this.logger?.log?.(`SMS MFA code sent to: ${maskedPhone}`);
112
+ return { maskedPhone };
101
113
  }
114
+ // ============================================================================
115
+ // No number supplied, phone on file not verified: send (or resend) to it
116
+ // ============================================================================
117
+ const sendDto = new core_1.SendVerificationSMSDTO();
118
+ sendDto.sub = user.sub;
119
+ sendDto.challengeSessionId = dto?.challengeSessionId;
102
120
  await this.phoneVerificationService.sendVerificationSMS(sendDto);
103
- const maskedPhone = this.maskPhone(phoneNumber);
121
+ const maskedPhone = this.maskPhone(targetPhone);
104
122
  this.logger?.log?.(`SMS MFA code sent to: ${maskedPhone}`);
105
123
  // Return masked phone for frontend display
106
124
  return { maskedPhone };
107
125
  }
126
+ /**
127
+ * Retire SMS MFA devices after the account phone changed during setup.
128
+ *
129
+ * Mirrors `UserService.updateUserAttributes()`: the devices were bound to the old number,
130
+ * so they are deleted, the removal is audited, and MFA is switched off when no active
131
+ * device of any type remains (the user is mid-enrolment and will re-enable it on verify).
132
+ *
133
+ * @param userId - Internal user ID
134
+ * @param sub - User external identifier (for logs)
135
+ * @param oldPhone - Phone the devices were tied to
136
+ * @param newPhone - Phone now on file (unverified)
137
+ */
138
+ async retireSmsDevicesForPhoneChange(userId, sub, oldPhone, newPhone) {
139
+ const smsDevices = (await this.mfaDeviceRepository.find({
140
+ where: { userId, type: core_1.MFAMethod.SMS, isActive: true },
141
+ }));
142
+ if (smsDevices.length === 0) {
143
+ return;
144
+ }
145
+ this.logger?.log?.(`Deleting ${smsDevices.length} SMS MFA device(s) for user ${sub} due to phone number change during SMS MFA setup`);
146
+ for (const device of smsDevices) {
147
+ await this.mfaDeviceRepository.delete(device.id);
148
+ }
149
+ try {
150
+ await this.auditService?.recordEvent({
151
+ userId,
152
+ eventType: core_1.AuthAuditEventType.MFA_DEVICE_REMOVED,
153
+ eventStatus: 'INFO',
154
+ reason: 'phone_changed',
155
+ description: 'SMS MFA device(s) removed due to phone number change during SMS MFA setup',
156
+ metadata: {
157
+ method: core_1.MFAMethod.SMS,
158
+ deletedCount: smsDevices.length,
159
+ oldPhone: this.maskPhone(oldPhone),
160
+ newPhone: this.maskPhone(newPhone),
161
+ reason: 'phone_number_changed_requires_reverification',
162
+ },
163
+ });
164
+ }
165
+ catch (auditError) {
166
+ const errorMessage = auditError instanceof Error ? auditError.message : 'Unknown error';
167
+ this.logger?.error?.(`Failed to record MFA_DEVICE_REMOVED audit event for phone change: ${errorMessage}`, {
168
+ error: auditError,
169
+ userId,
170
+ });
171
+ }
172
+ const remaining = (await this.mfaDeviceRepository.find({
173
+ where: { userId, isActive: true },
174
+ }));
175
+ if (remaining.length === 0) {
176
+ await this.userRepository.update({ id: userId }, {
177
+ mfaEnabled: false,
178
+ mfaMethods: [],
179
+ preferredMfaMethod: null,
180
+ });
181
+ this.logger?.log?.(`MFA disabled for user ${sub} - no active MFA devices remaining after phone change`);
182
+ }
183
+ }
108
184
  /**
109
185
  * Verify and complete SMS MFA setup
110
186
  *
@@ -116,18 +192,18 @@ class SMSMFAProviderService extends internal_1.BaseMFAProviderService {
116
192
  *
117
193
  * Note: SMS MFA is treated as a singleton method in NAuth (one active SMS device per user).
118
194
  *
119
- * @param user - User completing SMS MFA setup
120
- * @param verificationData - Verification data (must be VerifySMSMFASetupDTO)
195
+ * The device is always bound to the phone on the account (`user.phone`), which the code
196
+ * just verified. `verificationData.phoneNumber` is optional and only a consistency check:
197
+ * when supplied it must equal the account phone. Change the number with `setup()` instead.
198
+ *
199
+ * @param verificationData - Verification data (VerifySMSMFASetupDTO, plus `challengeSessionId` when called from a challenge)
121
200
  * @param deviceName - Optional device name override
122
201
  * @returns MFA device ID (created or existing)
123
- * @throws {NAuthException} If code is invalid
202
+ * @throws {NAuthException} VALIDATION_FAILED | PHONE_REQUIRED | VERIFICATION_CODE_INVALID | VERIFICATION_CODE_EXPIRED | VERIFICATION_TOO_MANY_ATTEMPTS
124
203
  *
125
204
  * @example
126
205
  * ```typescript
127
- * const deviceId = await provider.verifySetup(user, {
128
- * phoneNumber: '+1234567890',
129
- * code: '123456'
130
- * });
206
+ * const deviceId = await provider.verifySetup({ code: '123456' });
131
207
  * ```
132
208
  */
133
209
  async verifySetup(verificationData, deviceName) {
@@ -147,21 +223,26 @@ class SMSMFAProviderService extends internal_1.BaseMFAProviderService {
147
223
  if (!this.phoneVerificationService) {
148
224
  throw new core_1.NAuthException(core_1.AuthErrorCode.VALIDATION_FAILED, 'Phone verification service is not available. SMS provider must be configured.');
149
225
  }
150
- if (!dto.code || dto.code.trim() === '') {
226
+ if (!dto?.code || dto.code.trim() === '') {
151
227
  throw new core_1.NAuthException(core_1.AuthErrorCode.VALIDATION_FAILED, 'Verification code is required');
152
228
  }
153
229
  try {
154
- // Verify phone with code - this will mark phone as verified in the database
230
+ // Verify phone with code - this will mark phone as verified in the database.
231
+ // Scope the lookup to the challenge session when the code was issued for one.
155
232
  const verifyDto = new core_1.VerifyPhoneWithCodeBySubDTO();
156
233
  verifyDto.sub = user.sub;
157
234
  verifyDto.code = dto.code;
235
+ verifyDto.challengeSessionId = dto.challengeSessionId;
158
236
  await this.phoneVerificationService.verifyPhoneWithCodeBySub(verifyDto);
159
237
  this.logger?.log?.(`Phone verified during SMS MFA setup for user ${user.sub} - phone is now marked as verified in database`);
160
238
  }
161
239
  catch (error) {
162
- // Re-throw with more specific error message
163
240
  const errorMessage = error instanceof Error ? error.message : 'Unknown error';
164
241
  this.logger?.error?.(`Failed to verify phone during SMS MFA setup for user ${user.sub}: ${errorMessage}`, error);
242
+ // Preserve specific codes (expired, too many attempts, phone required); wrap only unknown errors
243
+ if (error instanceof core_1.NAuthException) {
244
+ throw error;
245
+ }
165
246
  throw new core_1.NAuthException(core_1.AuthErrorCode.VERIFICATION_CODE_INVALID, 'Invalid SMS code');
166
247
  }
167
248
  }
@@ -170,15 +251,34 @@ class SMSMFAProviderService extends internal_1.BaseMFAProviderService {
170
251
  this.logger?.log?.(`Phone already verified for user ${user.sub}, skipping SMS code verification during MFA setup`);
171
252
  }
172
253
  // ============================================================================
254
+ // Bind the device to the (now verified) phone on the account, never to a
255
+ // caller-supplied number.
256
+ // ============================================================================
257
+ const freshUser = (await this.userRepository.findOne({ where: { id: userId } }));
258
+ const accountPhone = freshUser?.phone || undefined;
259
+ if (!accountPhone) {
260
+ throw new core_1.NAuthException(core_1.AuthErrorCode.PHONE_REQUIRED, 'No phone number associated with this account');
261
+ }
262
+ const suppliedPhone = typeof dto?.phoneNumber === 'string' && dto.phoneNumber.trim() !== ''
263
+ ? dto.phoneNumber.replace(/\s/g, '')
264
+ : undefined;
265
+ if (suppliedPhone && suppliedPhone !== accountPhone) {
266
+ throw new core_1.NAuthException(core_1.AuthErrorCode.VALIDATION_FAILED, 'Phone number does not match the number on this account. Call setup again with the new number.');
267
+ }
268
+ // ============================================================================
173
269
  // Create MFA device (transaction-safe, singleton semantics)
174
270
  // ============================================================================
175
271
  // We de-duplicate by method (userId + method) to preserve legacy behavior.
176
272
  const device = await this.createDevice(userId, {
177
273
  name: deviceName || 'SMS Phone',
178
- phoneNumber: dto.phoneNumber,
274
+ phoneNumber: accountPhone,
179
275
  isActive: true,
180
276
  isPrimary: !userMfaEnabled, // First device becomes primary
181
277
  }, { dedupeWhere: {} });
278
+ // A reused (deduped) device may carry a stale number or be inactive; align it with the account
279
+ if (device.phoneNumber !== accountPhone || !device.isActive) {
280
+ await this.mfaDeviceRepository.update(device.id, { phoneNumber: accountPhone, isActive: true });
281
+ }
182
282
  // Enable MFA if not already enabled
183
283
  await this.enableMFAForUser(user);
184
284
  this.logger?.log?.(`SMS MFA setup completed for user: ${user.sub}`);
@@ -1 +1 @@
1
- {"version":3,"file":"sms-mfa-provider.service.js","sourceRoot":"","sources":["../../src/sms-mfa-provider.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sms-mfa-provider.service.js","sourceRoot":"","sources":["../../src/sms-mfa-provider.service.ts"],"names":[],"mappings":"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"}