Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modified Registration to display the Password requirments #2697

Merged
merged 3 commits into from
Mar 28, 2023
Merged

Modified Registration to display the Password requirments #2697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
058a191
Modified Registration to display the Password requirments
leigh-pointer Mar 24, 2023
9aa0374
Removed unused Using
leigh-pointer Mar 24, 2023
0f707a7
Moved message to the notification.
leigh-pointer Mar 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 55 additions & 12 deletions Oqtane.Client/Modules/Admin/Register/Index.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
@inject IUserService UserService
@inject IStringLocalizer<Index> Localizer
@inject IStringLocalizer<SharedResources> SharedLocalizer
@inject ISettingService SettingService

@if (PageState.Site.AllowRegistration)
{
Expand All @@ -15,7 +16,7 @@
<ModuleMessage Message="@Localizer["Info.Registration.Exists"]" Type="MessageType.Info" />
</Authorized>
<NotAuthorized>
<ModuleMessage Message="@Localizer["Info.Registration.InvalidEmail"]" Type="MessageType.Info" />
<ModuleMessage Message="@_passwordconstruction" Type="MessageType.Info" />
<form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
<div class="container">
<div class="row mb-1 align-items-center">
Expand All @@ -24,6 +25,14 @@
<input id="username" class="form-control" @bind="@_username" maxlength="256" required />
</div>
</div>
@* <div class="row mb-1 align-items-center">
<div class="col-sm-3"></div>
<div class="col-sm-9">
<div class="alert alert-info mb-0 mt-1" role="alert">
<small>@_passwordconstruction</small>
</div>
</div>
</div>*@
<div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="password" HelpText="Please choose a sufficiently secure password and enter it here" ResourceKey="Password"></Label>
<div class="col-sm-9">
Expand Down Expand Up @@ -68,21 +77,55 @@ else
}

@code {
private string _username = string.Empty;
private ElementReference form;
private bool validated = false;
private string _password = string.Empty;
private string _passwordtype = "password";
private string _togglepassword = string.Empty;
private string _confirm = string.Empty;
private string _email = string.Empty;
private string _displayname = string.Empty;
private string _username = string.Empty;
private ElementReference form;
private bool validated = false;
private string _password = string.Empty;
private string _passwordtype = "password";
private string _togglepassword = string.Empty;
private string _confirm = string.Empty;
private string _email = string.Empty;
private string _displayname = string.Empty;

//Password construction
private string _minimumlength;
private string _uniquecharacters;
private bool _requiredigit;
private bool _requireupper;
private bool _requirelower;
private bool _requirepunctuation;
private string _passwordconstruction;

public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;

protected override async Task OnInitializedAsync()
{
var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
var emailaddress = Localizer["Info.Registration.InvalidEmail"];
string passwordValidationCriteriaTemplate = Localizer["Password.ValidationCriteria"];

_minimumlength = SettingService.GetSetting(settings, "IdentityOptions:Password:RequiredLength", "6");
_uniquecharacters = SettingService.GetSetting(settings, "IdentityOptions:Password:RequiredUniqueChars", "1");
_requiredigit = bool.Parse(SettingService.GetSetting(settings, "IdentityOptions:Password:RequireDigit", "true"));
_requireupper = bool.Parse(SettingService.GetSetting(settings, "IdentityOptions:Password:RequireUppercase", "true"));
_requirelower = bool.Parse(SettingService.GetSetting(settings, "IdentityOptions:Password:RequireLowercase", "true"));
_requirepunctuation = bool.Parse(SettingService.GetSetting(settings, "IdentityOptions:Password:RequireNonAlphanumeric", "true"));

// Replace the placeholders with the actual values of the variables
string digitRequirement = _requiredigit ? Localizer["Password.DigitRequirement"] + ", " : "";
string uppercaseRequirement = _requireupper ? Localizer["Password.UppercaseRequirement"] + ", " : "";
string lowercaseRequirement = _requirelower ? Localizer["Password.LowercaseRequirement"] + ", " : "";
string punctuationRequirement = _requirepunctuation ? Localizer["Password.PunctuationRequirement"] + ", " : "";

// Replace the placeholders with the actual values of the variables
_passwordconstruction = emailaddress + "<br />" + string.Format(passwordValidationCriteriaTemplate,
_minimumlength, _uniquecharacters, digitRequirement, uppercaseRequirement, lowercaseRequirement, punctuationRequirement);
}

protected override void OnParametersSet()
protected override void OnParametersSet()
{
_togglepassword = SharedLocalizer["ShowPassword"];

}

private async Task Register()
Expand Down
15 changes: 15 additions & 0 deletions Oqtane.Client/Resources/Modules/Admin/Register/Index.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,4 +177,19 @@
<data name="Username.Text" xml:space="preserve">
<value>Username:</value>
</data>
<data name="Password.ValidationCriteria" xml:space="preserve">
<value>To ensure a strong and secure password, the password construction should meet the following criteria: it should have a minimum length of {0} characters, including at least {1} unique character(s), {2}{3}{4}{5} to meet the requirements.</value>
</data>
<data name="Password.DigitRequirement" xml:space="preserve">
<value>at least one digit</value>
</data>
<data name="Password.LowercaseRequirement" xml:space="preserve">
<value>at least one lowercase letter</value>
</data>
<data name="Password.PunctuationRequirement" xml:space="preserve">
<value>at least one punctuation mark</value>
</data>
<data name="Password.UppercaseRequirement" xml:space="preserve">
<value>at least one uppercase letter</value>
</data>
</root>