AppStd/EnvelopeGenerator
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor(EnvelopeLocked): Umbenennung von AccessCodeName in CodeType.

Browse Source 
- HomeController aktualisiert.
This commit is contained in:
Developer 02
2024-12-11 15:22:33 +01:00
parent 556d02870e
commit 6b6c8e407c
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
EnvelopeGenerator.Web/Controllers/HomeController.cs
View File

@@ -193,9 +193,9 @@ namespace EnvelopeGenerator.Web.Controllers
{ {
var res = await _msgService.SendSmsCodeAsync(er_secret.PhoneNumber!, envelopeReceiverId: envelopeReceiverId); var res = await _msgService.SendSmsCodeAsync(er_secret.PhoneNumber!, envelopeReceiverId: envelopeReceiverId);
if (res.Ok) if (res.Ok)
return View("EnvelopeLocked").WithData("AccessCodeName", "smsCode").WithData("Expiration", res.Expiration); return View("EnvelopeLocked").WithData("CodeType", "smsCode").WithData("Expiration", res.Expiration);
else if (!res.Allowed) else if (!res.Allowed)
return View("EnvelopeLocked").WithData("AccessCodeName", "smsCode").WithData("Expiration", res.AllowedAt); return View("EnvelopeLocked").WithData("CodeType", "smsCode").WithData("Expiration", res.AllowedAt);
else else
{ {
var res_json = JsonConvert.SerializeObject(res); var res_json = JsonConvert.SerializeObject(res);
@@ -205,7 +205,7 @@ namespace EnvelopeGenerator.Web.Controllers
} }
else else
{ {
return View("EnvelopeLocked").WithData("AccessCodeName", "authenticatorCode"); return View("EnvelopeLocked").WithData("CodeType", "authenticatorCode");
} }
} }
@@ -221,13 +221,13 @@ namespace EnvelopeGenerator.Web.Controllers
if (er_secret.AccessCode != auth.AccessCode) if (er_secret.AccessCode != auth.AccessCode)
{ {
//Constants.EnvelopeStatus.AccessCodeIncorrect //Constants.EnvelopeStatus.AccessCodeIncorrect
await _historyService.RecordAsync(er_secret.EnvelopeId, er_secret.Receiver!.EmailAddress, Constants.EnvelopeStatus.AccessCodeIncorrect); await _historyService.RecordAsync(er_secret.EnvelopeId, er_secret.Receiver!.EmailAddress, EnvelopeStatus.AccessCodeIncorrect);
Response.StatusCode = StatusCodes.Status401Unauthorized; Response.StatusCode = StatusCodes.Status401Unauthorized;
return View("EnvelopeLocked") return View("EnvelopeLocked")
.WithData("ErrorMessage", _localizer[WebKey.WrongAccessCode].Value); .WithData("ErrorMessage", _localizer[WebKey.WrongAccessCode].Value);
} }
await _historyService.RecordAsync(er_secret.EnvelopeId, er_secret.Receiver!.EmailAddress, Constants.EnvelopeStatus.AccessCodeCorrect); await _historyService.RecordAsync(er_secret.EnvelopeId, er_secret.Receiver!.EmailAddress, EnvelopeStatus.AccessCodeCorrect);
//check if the user has phone is added //check if the user has phone is added
if (er_secret.TFAEnabled) if (er_secret.TFAEnabled)

10
EnvelopeGenerator.Web/Views/Home/EnvelopeLocked.cshtml
View File

@@ -6,10 +6,10 @@
var logo = _logoOpt.Value; var logo = _logoOpt.Value;
ViewData["Title"] = _localizer[WebKey.DocProtected]; ViewData["Title"] = _localizer[WebKey.DocProtected];
var userCulture = ViewData["UserCulture"] as Culture; var userCulture = ViewData["UserCulture"] as Culture;
string accessCodeName = ViewData["AccessCodeName"] is string _accessCodeName ? _accessCodeName : "accessCode"; string codeType = ViewData["CodeType"] is string _accessCodeName ? _accessCodeName : "accessCode";
string codePropName = char.ToUpper(accessCodeName[0]) + accessCodeName.Substring(1); string codePropName = char.ToUpper(codeType[0]) + codeType.Substring(1);
bool viaSms = accessCodeName == "smsCode"; bool viaSms = codeType == "smsCode";
bool viaAuthenticator = accessCodeName == "authenticatorCode"; bool viaAuthenticator = codeType == "authenticatorCode";
bool viaTFA = viaSms || viaAuthenticator; bool viaTFA = viaSms || viaAuthenticator;
DateTime? expiration = ViewData["Expiration"] is DateTime _expiration ? _expiration : null; DateTime? expiration = ViewData["Expiration"] is DateTime _expiration ? _expiration : null;
bool tfaEnabled = ViewData["TFAEnabled"] is bool _tfaEnabled && _tfaEnabled; bool tfaEnabled = ViewData["TFAEnabled"] is bool _tfaEnabled && _tfaEnabled;
@@ -36,7 +36,7 @@
<div class="access-code-panel justify-content-center align-items-center p-0 m-0"> <div class="access-code-panel justify-content-center align-items-center p-0 m-0">
<form id="form-access-code" class="form form-floating mb-0" method="post"> <form id="form-access-code" class="form form-floating mb-0" method="post">
<div class="form-floating access-code-form-floating"> <div class="form-floating access-code-form-floating">
<input type="password" id="access_code" class="form-control" name="@accessCodeName" placeholder="@_localizer[viaSms ? WebKey.LockedSmsAccessCode : WebKey.LockedAccessCode]" required="required"> <input type="password" id="access_code" class="form-control" name="@codeType" placeholder="@_localizer[viaSms ? WebKey.LockedSmsAccessCode : WebKey.LockedAccessCode]" required="required">
<label for="access_code">@_localizer[viaSms ? WebKey.LockedSmsAccessCode : WebKey.LockedAccessCode]</label> <label for="access_code">@_localizer[viaSms ? WebKey.LockedSmsAccessCode : WebKey.LockedAccessCode]</label>
<button type="submit" class="btn btn-primary"> <button type="submit" class="btn btn-primary">
<span class="material-symbols-outlined"> <span class="material-symbols-outlined">