1
0
mirror of https://github.com/bitwarden/server synced 2026-01-03 17:14:00 +00:00

Merge remote-tracking branch 'origin' into auth/pm-22975/client-version-validator

This commit is contained in:
Patrick Pimentel
2025-11-26 17:27:25 -05:00
64 changed files with 4754 additions and 816 deletions

View File

@@ -109,8 +109,12 @@ public class AccountsController : Controller
[HttpPost("register/send-verification-email")]
public async Task<IActionResult> PostRegisterSendVerificationEmail([FromBody] RegisterSendVerificationEmailRequestModel model)
{
// Only pass fromMarketing if the feature flag is enabled
var isMarketingFeatureEnabled = _featureService.IsEnabled(FeatureFlagKeys.MarketingInitiatedPremiumFlow);
var fromMarketing = isMarketingFeatureEnabled ? model.FromMarketing : null;
var token = await _sendVerificationEmailForRegistrationCommand.Run(model.Email, model.Name,
model.ReceiveMarketingEmails);
model.ReceiveMarketingEmails, fromMarketing);
if (token != null)
{