Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Add confirmation before disable twoFactorAuthenticator

dkuciab9d752d2c41a
diff --git a/src/Web/Grand.Web/Controllers/AccountController.cs b/src/Web/Grand.Web/Controllers/AccountController.cs
index dfe483634..668729bc6 100644
--- a/src/Web/Grand.Web/Controllers/AccountController.cs
+++ b/src/Web/Grand.Web/Controllers/AccountController.cs
@@ -1189,20 +1189,54 @@ namespace Grand.Web.Controllers
if (!_customerSettings.TwoFactorAuthenticationEnabled)
return RedirectToRoute("CustomerInfo");
- var customer = _workContext.CurrentCustomer;
- if (customer != null)
- {
- await _userFieldService.SaveField<bool>(customer, SystemCustomerFieldNames.TwoFactorEnabled, false);
- await _userFieldService.SaveField<string>(customer, SystemCustomerFieldNames.TwoFactorSecretKey, null);
+ if (!_workContext.CurrentCustomer.GetUserFieldFromEntity<bool>(SystemCustomerFieldNames.TwoFactorEnabled))
+ return RedirectToRoute("CustomerInfo");
+
+ var model = await _mediator.Send(new GetTwoFactorAuthentication() {
+ Customer = _workContext.CurrentCustomer,
+ Language = _workContext.WorkingLanguage,
+ Store = _workContext.CurrentStore,
+ });
+ return View(model);
+ }
- Success(_translationService.GetResource("Account.TwoFactorAuth.Disabled"));
+ [HttpPost]
+ public async Task<IActionResult> DisableTwoFactorAuthenticator(CustomerInfoModel.TwoFactorAuthenticationModel model,
+ [FromServices] ITwoFactorAuthenticationService twoFactorAuthenticationService)
+ {
+ if (!await _groupService.IsRegistered(_workContext.CurrentCustomer))
+ return Challenge();
+
+ if (!_customerSettings.TwoFactorAuthenticationEnabled)
+ return RedirectToRoute("CustomerInfo");
+
+ if (!_workContext.CurrentCustomer.GetUserFieldFromEntity<bool>(SystemCustomerFieldNames.TwoFactorEnabled))
return RedirectToRoute("CustomerInfo");
+
+ if (string.IsNullOrEmpty(model.Code))
+ {
+ ModelState.AddModelError("", _translationService.GetResource("Account.TwoFactorAuth.SecurityCodeIsRequired"));
}
- return View();
+ else
+ {
+ if (await twoFactorAuthenticationService.AuthenticateTwoFactor(model.SecretKey, model.Code, _workContext.CurrentCustomer, _customerSettings.TwoFactorAuthenticationType))
+ {
+ await _userFieldService.SaveField(_workContext.CurrentCustomer, SystemCustomerFieldNames.TwoFactorEnabled, false);
+ await _userFieldService.SaveField<string>(_workContext.CurrentCustomer, SystemCustomerFieldNames.TwoFactorSecretKey, null);
+
+ Success(_translationService.GetResource("Account.TwoFactorAuth.Disabled"));
+
+ return RedirectToRoute("CustomerInfo");
+ }
+ ModelState.AddModelError("", _translationService.GetResource("Account.TwoFactorAuth.WrongSecurityCode"));
+ }
+
+ return View(model);
}
+
#endregion
#region My account / Courses
diff --git a/src/Web/Grand.Web/Views/Account/DisableTwoFactorAuthenticator.cshtml b/src/Web/Grand.Web/Views/Account/DisableTwoFactorAuthenticator.cshtml
new file mode 100644
index 000000000..d11349827
--- /dev/null
+++ b/src/Web/Grand.Web/Views/Account/DisableTwoFactorAuthenticator.cshtml
@@ -0,0 +1,143 @@
+@model CustomerInfoModel.TwoFactorAuthenticationModel
+@using Grand.Web.Models.Customer;
+@inject IPageHeadBuilder pagebuilder
+@{ Layout = "_TwoColumns";
+ //title
+ pagebuilder.AddTitleParts(Loc["Title.TwoFactorAuth"]);
+ var code = "ManualEntryQrCode";
+ var imageUrl = "QrCodeImageUrl";
+ var errors = Model.CustomValues.ContainsKey("Errors") ? Model.CustomValues["Errors"] : null; }
+@section left
+{
+ @await Component.InvokeAsync("CustomerNavigation", new { selectedTabId = AccountNavigationEnum.Info })
+}
+
+<div class="page login-page">
+ <h2 class="generalTitle">@Loc["Account.TwoFactorAuth.Disable"]</h2>
+ <ul class="pl-0">
+ <li><b>@Loc[$"Account.TwoFactorAuth.{Model.TwoFactorAuthenticationType}.FirstLine"]</b></li>
+ <li>@Loc[$"Account.TwoFactorAuth.{Model.TwoFactorAuthenticationType}.SecondLine"]</li>
+ <li><b>@Loc[$"Account.TwoFactorAuth.{Model.TwoFactorAuthenticationType}.ThirdLine"]</b></li>
+ <li>@Loc[$"Account.TwoFactorAuth.{Model.TwoFactorAuthenticationType}.FourthLine"]</li>
+ </ul>
+ <div class="message-error">@errors</div>
+ @if (Model.TwoFactorAuthenticationType == Grand.Domain.Customers.TwoFactorAuthenticationType.AppVerification)
+ {
+@await Component.InvokeAsync("Widget", new { widgetZone = "Enable.TwoFactorAuthentication.AppVerification" })
+ <div class="mb-2">
+ <div class="row flex-md-row mt-3 mb-3">
+ @* login main block *@
+ <div class="col-lg-6 col-12 text-center">
+ <div class="card">
+ <div class="col-12 form-group mb-0">
+ <div>
+ <img src="@(Model.CustomValues[imageUrl])" />
+ </div>
+ <div>
+ @Loc["Account.TwoFactorAuth.ManualSetupCode"] @(Model.CustomValues[code])
+ </div>
+ </div>
+ <form asp-route="DisableTwoFactorAuthorization" asp-route-returnurl="@Context.Request.Query["ReturnUrl"]" method="post">
+ <input asp-for="SecretKey" type="hidden" />
+ <input asp-for="TwoFactorAuthenticationType" type="hidden" />
+ <input asp-for="@Model.CustomValues[code]" type="hidden" />
+ <input asp-for="@Model.CustomValues[imageUrl]" type="hidden" />
+ <div class="card-body">
+ <div class="row justify-content-center">
+ <div asp-validation-summary="ModelOnly" class="message-error"></div>
+ <div class="col-12 form-group mb-0">
+ <div class="form-group row">
+ <div class="col-lg-3 col-12">
+ <label asp-for="Code" class="col-form-label">@Loc["Account.TwoFactorAuth.DigitCode"]</label>
+ </div>
+ <div class="col-lg-9 col-12">
+ <input asp-for="Code" name="Code" type="text" class="form-control" />
+ <span asp-validation-for="Code"></span>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="card-footer">
+ <div class="buttons">
+ <input class="btn btn-info login-button" type="submit" value="@Loc["Account.TwoFactorAuth.SendCode"]" />
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>}
+ @if (Model.TwoFactorAuthenticationType == Grand.Domain.Customers.TwoFactorAuthenticationType.EmailVerification)
+ {
+@await Component.InvokeAsync("Widget", new { widgetZone = "Enable.TwoFactorAuthentication.EmailVerification" })
+ <div class="mb-2">
+ <div class="row flex-md-row mt-3 mb-3">
+ <div class="col-lg-6 col-12 text-center">
+ <div class="card">
+ <form asp-route="DisableEnableTwoFactorAuthorization" asp-route-returnurl="@Context.Request.Query["ReturnUrl"]" method="post">
+ <input asp-for="SecretKey" type="hidden" />
+ <input asp-for="TwoFactorAuthenticationType" type="hidden" />
+ <div class="card-body">
+ <div class="row justify-content-center">
+ <div asp-validation-summary="ModelOnly" class="message-error"></div>
+ <div class="col-12 form-group mb-0">
+ <div class="form-group row">
+ <div class="col-lg-3 col-12">
+ <label asp-for="Code" class="col-form-label">@Loc["Account.TwoFactorAuth.DigitCode"]</label>
+ </div>
+ <div class="col-lg-9 col-12">
+ <input asp-for="Code" name="Code" type="text" class="form-control" />
+ <span asp-validation-for="Code"></span>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="card-footer">
+ <div class="buttons">
+ <input class="btn btn-info login-button" type="submit" value="@Loc["Account.TwoFactorAuth.SendCode"]" />
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>}
+ @if (Model.TwoFactorAuthenticationType == Grand.Domain.Customers.TwoFactorAuthenticationType.SMSVerification && string.IsNullOrWhiteSpace(errors))
+ {
+@await Component.InvokeAsync("Widget", new { widgetZone = "Enable.TwoFactorAuthentication.SMSVerification" })
+ <div class="mb-2">
+ <div class="row flex-md-row mt-3 mb-3">
+ <div class="col-lg-6 col-12 text-center">
+ <div class="card">
+ <form asp-route="DisableEnableTwoFactorAuthorization" asp-route-returnurl="@Context.Request.Query["ReturnUrl"]" method="post">
+ <input asp-for="SecretKey" type="hidden" />
+ <input asp-for="TwoFactorAuthenticationType" type="hidden" />
+ <div class="card-body">
+ <div class="row">
+ <div asp-validation-summary="ModelOnly" class="message-error"></div>
+ <div class="col-12 form-group mb-0">
+ <div class="form-group row">
+ <div class="col-lg-3 col-12">
+ <label asp-for="Code" class="col-form-label">@Loc["Account.TwoFactorAuth.DigitCode"]</label>
+ </div>
+ <div class="col-lg-9 col-12">
+ <input asp-for="Code" name="Code" type="text" class="form-control" />
+ <span asp-validation-for="Code"></span>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="card-footer">
+ <div class="buttons">
+ <input class="btn btn-info login-button" type="submit" value="@Loc["Account.TwoFactorAuth.SendCode"]" />
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>}
+</div>
\ No newline at end of file