mirror of
https://github.com/bitwarden/server
synced 2026-01-02 08:33:48 +00:00
[PM-22190] Remove gathering and reporting of ReferenceEvents (#5897)
* Remove gathering and reporting of ReferenceEvents * Fix test that relied on reference events throwing --------- Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
d7d90e7f3e
commit
c7b1c7f6d5
@@ -16,9 +16,6 @@ using Bit.Core.Repositories;
|
||||
using Bit.Core.Services;
|
||||
using Bit.Core.Settings;
|
||||
using Bit.Core.Tokens;
|
||||
using Bit.Core.Tools.Enums;
|
||||
using Bit.Core.Tools.Models.Business;
|
||||
using Bit.Core.Tools.Services;
|
||||
using Bit.Core.Utilities;
|
||||
using Bit.Identity.Models.Request.Accounts;
|
||||
using Bit.Identity.Models.Response.Accounts;
|
||||
@@ -39,7 +36,6 @@ public class AccountsController : Controller
|
||||
private readonly IDataProtectorTokenFactory<WebAuthnLoginAssertionOptionsTokenable> _assertionOptionsDataProtector;
|
||||
private readonly IGetWebAuthnLoginCredentialAssertionOptionsCommand _getWebAuthnLoginCredentialAssertionOptionsCommand;
|
||||
private readonly ISendVerificationEmailForRegistrationCommand _sendVerificationEmailForRegistrationCommand;
|
||||
private readonly IReferenceEventService _referenceEventService;
|
||||
private readonly IFeatureService _featureService;
|
||||
private readonly IDataProtectorTokenFactory<RegistrationEmailVerificationTokenable> _registrationEmailVerificationTokenDataFactory;
|
||||
|
||||
@@ -86,7 +82,6 @@ public class AccountsController : Controller
|
||||
IDataProtectorTokenFactory<WebAuthnLoginAssertionOptionsTokenable> assertionOptionsDataProtector,
|
||||
IGetWebAuthnLoginCredentialAssertionOptionsCommand getWebAuthnLoginCredentialAssertionOptionsCommand,
|
||||
ISendVerificationEmailForRegistrationCommand sendVerificationEmailForRegistrationCommand,
|
||||
IReferenceEventService referenceEventService,
|
||||
IFeatureService featureService,
|
||||
IDataProtectorTokenFactory<RegistrationEmailVerificationTokenable> registrationEmailVerificationTokenDataFactory,
|
||||
GlobalSettings globalSettings
|
||||
@@ -99,7 +94,6 @@ public class AccountsController : Controller
|
||||
_assertionOptionsDataProtector = assertionOptionsDataProtector;
|
||||
_getWebAuthnLoginCredentialAssertionOptionsCommand = getWebAuthnLoginCredentialAssertionOptionsCommand;
|
||||
_sendVerificationEmailForRegistrationCommand = sendVerificationEmailForRegistrationCommand;
|
||||
_referenceEventService = referenceEventService;
|
||||
_featureService = featureService;
|
||||
_registrationEmailVerificationTokenDataFactory = registrationEmailVerificationTokenDataFactory;
|
||||
|
||||
@@ -115,15 +109,6 @@ public class AccountsController : Controller
|
||||
var token = await _sendVerificationEmailForRegistrationCommand.Run(model.Email, model.Name,
|
||||
model.ReceiveMarketingEmails);
|
||||
|
||||
var refEvent = new ReferenceEvent
|
||||
{
|
||||
Type = ReferenceEventType.SignupEmailSubmit,
|
||||
ClientId = _currentContext.ClientId,
|
||||
ClientVersion = _currentContext.ClientVersion,
|
||||
Source = ReferenceEventSource.Registration
|
||||
};
|
||||
await _referenceEventService.RaiseEventAsync(refEvent);
|
||||
|
||||
if (token != null)
|
||||
{
|
||||
return Ok(token);
|
||||
@@ -142,18 +127,6 @@ public class AccountsController : Controller
|
||||
var user = await _userRepository.GetByEmailAsync(model.Email);
|
||||
var userExists = user != null;
|
||||
|
||||
var refEvent = new ReferenceEvent
|
||||
{
|
||||
Type = ReferenceEventType.SignupEmailClicked,
|
||||
ClientId = _currentContext.ClientId,
|
||||
ClientVersion = _currentContext.ClientVersion,
|
||||
Source = ReferenceEventSource.Registration,
|
||||
EmailVerificationTokenValid = tokenValid,
|
||||
UserAlreadyExists = userExists
|
||||
};
|
||||
|
||||
await _referenceEventService.RaiseEventAsync(refEvent);
|
||||
|
||||
if (!tokenValid || userExists)
|
||||
{
|
||||
throw new BadRequestException("Expired link. Please restart registration or try logging in. You may already have an account");
|
||||
|
||||
Reference in New Issue
Block a user