@@ -121,8 +121,7 @@ public async Task<RegisterResponseModel> PostRegister([FromBody] RegisterRequest
121
121
var user = model . ToUser ( ) ;
122
122
var identityResult = await _registerUserCommand . RegisterUserViaOrganizationInviteToken ( user , model . MasterPasswordHash ,
123
123
model . Token , model . OrganizationUserId ) ;
124
- // delaysEnabled false is only for the new registration with email verification process
125
- return await ProcessRegistrationResult ( identityResult , user , delaysEnabled : true ) ;
124
+ return ProcessRegistrationResult ( identityResult , user ) ;
126
125
}
127
126
128
127
[ HttpPost ( "register/send-verification-email" ) ]
@@ -188,7 +187,6 @@ public async Task<RegisterResponseModel> PostRegisterFinish([FromBody] RegisterF
188
187
// Users will either have an emailed token or an email verification token - not both.
189
188
190
189
IdentityResult identityResult = null ;
191
- var delaysEnabled = ! _featureService . IsEnabled ( FeatureFlagKeys . EmailVerificationDisableTimingDelays ) ;
192
190
193
191
switch ( model . GetTokenType ( ) )
194
192
{
@@ -197,40 +195,40 @@ public async Task<RegisterResponseModel> PostRegisterFinish([FromBody] RegisterF
197
195
await _registerUserCommand . RegisterUserViaEmailVerificationToken ( user , model . MasterPasswordHash ,
198
196
model . EmailVerificationToken ) ;
199
197
200
- return await ProcessRegistrationResult ( identityResult , user , delaysEnabled ) ;
198
+ return ProcessRegistrationResult ( identityResult , user ) ;
201
199
break ;
202
200
case RegisterFinishTokenType . OrganizationInvite :
203
201
identityResult = await _registerUserCommand . RegisterUserViaOrganizationInviteToken ( user , model . MasterPasswordHash ,
204
202
model . OrgInviteToken , model . OrganizationUserId ) ;
205
203
206
- return await ProcessRegistrationResult ( identityResult , user , delaysEnabled ) ;
204
+ return ProcessRegistrationResult ( identityResult , user ) ;
207
205
break ;
208
206
case RegisterFinishTokenType . OrgSponsoredFreeFamilyPlan :
209
207
identityResult = await _registerUserCommand . RegisterUserViaOrganizationSponsoredFreeFamilyPlanInviteToken ( user , model . MasterPasswordHash , model . OrgSponsoredFreeFamilyPlanToken ) ;
210
208
211
- return await ProcessRegistrationResult ( identityResult , user , delaysEnabled ) ;
209
+ return ProcessRegistrationResult ( identityResult , user ) ;
212
210
break ;
213
211
case RegisterFinishTokenType . EmergencyAccessInvite :
214
212
Debug . Assert ( model . AcceptEmergencyAccessId . HasValue ) ;
215
213
identityResult = await _registerUserCommand . RegisterUserViaAcceptEmergencyAccessInviteToken ( user , model . MasterPasswordHash ,
216
214
model . AcceptEmergencyAccessInviteToken , model . AcceptEmergencyAccessId . Value ) ;
217
215
218
- return await ProcessRegistrationResult ( identityResult , user , delaysEnabled ) ;
216
+ return ProcessRegistrationResult ( identityResult , user ) ;
219
217
break ;
220
218
case RegisterFinishTokenType . ProviderInvite :
221
219
Debug . Assert ( model . ProviderUserId . HasValue ) ;
222
220
identityResult = await _registerUserCommand . RegisterUserViaProviderInviteToken ( user , model . MasterPasswordHash ,
223
221
model . ProviderInviteToken , model . ProviderUserId . Value ) ;
224
222
225
- return await ProcessRegistrationResult ( identityResult , user , delaysEnabled ) ;
223
+ return ProcessRegistrationResult ( identityResult , user ) ;
226
224
break ;
227
225
228
226
default :
229
227
throw new BadRequestException ( "Invalid registration finish request" ) ;
230
228
}
231
229
}
232
230
233
- private async Task < RegisterResponseModel > ProcessRegistrationResult ( IdentityResult result , User user , bool delaysEnabled )
231
+ private RegisterResponseModel ProcessRegistrationResult ( IdentityResult result , User user )
234
232
{
235
233
if ( result . Succeeded )
236
234
{
@@ -243,10 +241,6 @@ private async Task<RegisterResponseModel> ProcessRegistrationResult(IdentityResu
243
241
ModelState . AddModelError ( string . Empty , error . Description ) ;
244
242
}
245
243
246
- if ( delaysEnabled )
247
- {
248
- await Task . Delay ( Random . Shared . Next ( 100 , 130 ) ) ;
249
- }
250
244
throw new BadRequestException ( ModelState ) ;
251
245
}
252
246
0 commit comments