-
-
-
-
+
+
+ ...
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
}
else
{
@@ -63,8 +61,6 @@ else
@code {
private string _username = string.Empty;
- private ElementReference form;
- private bool validated = false;
private string _password = string.Empty;
private string _confirm = string.Empty;
private string _email = string.Empty;
@@ -74,58 +70,49 @@ else
private async Task Register()
{
- validated = true;
- var interop = new Interop(JSRuntime);
- if (await interop.FormValid(form))
+ try
{
- try
+ bool _isEmailValid = Utilities.IsValidEmail(_email);
+
+ if (_username != "" && _password != "" && _confirm != "" && _isEmailValid)
{
- bool _isEmailValid = Utilities.IsValidEmail(_email);
-
- if (_username != "" && _password != "" && _confirm != "" && _isEmailValid)
+ if (_password == _confirm)
{
- if (_password == _confirm)
+ var user = new User
{
- var user = new User
- {
- SiteId = PageState.Site.SiteId,
- Username = _username,
- DisplayName = (_displayname == string.Empty ? _username : _displayname),
- Email = _email,
- Password = _password
- };
- user = await UserService.AddUserAsync(user);
+ SiteId = PageState.Site.SiteId,
+ Username = _username,
+ DisplayName = (_displayname == string.Empty ? _username : _displayname),
+ Email = _email,
+ Password = _password
+ };
+ user = await UserService.AddUserAsync(user);
- if (user != null)
- {
- await logger.LogInformation("User Created {Username} {Email}", _username, _email);
- AddModuleMessage(Localizer["Info.User.AccountCreate"], MessageType.Info);
- }
- else
- {
- await logger.LogError("Error Adding User {Username} {Email}", _username, _email);
- AddModuleMessage(Localizer["Error.User.AddInfo"], MessageType.Error);
- }
+ if (user != null)
+ {
+ await logger.LogInformation("User Created {Username} {Email}", _username, _email);
+ AddModuleMessage(Localizer["Info.User.AccountCreate"], MessageType.Info);
}
else
{
- AddModuleMessage(Localizer["Message.Password.NoMatch"], MessageType.Warning);
+ await logger.LogError("Error Adding User {Username} {Email}", _username, _email);
+ AddModuleMessage(Localizer["Error.User.AddInfo"], MessageType.Error);
}
}
else
{
- AddModuleMessage(Localizer["Message.Required.UserInfo"], MessageType.Warning);
+ AddModuleMessage(Localizer["Message.Password.NoMatch"], MessageType.Warning);
}
}
- catch (Exception ex)
+ else
{
- await logger.LogError(ex, "Error Adding User {Username} {Email} {Error}", _username, _email, ex.Message);
- AddModuleMessage(Localizer["Error.User.Add"], MessageType.Error);
+ AddModuleMessage(Localizer["Message.Required.UserInfo"], MessageType.Warning);
}
}
- else
+ catch (Exception ex)
{
- AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+ await logger.LogError(ex, "Error Adding User {Username} {Email} {Error}", _username, _email, ex.Message);
+ AddModuleMessage(Localizer["Error.User.Add"], MessageType.Error);
}
}
@@ -133,4 +120,4 @@ else
{
NavigationManager.NavigateTo(NavigateUrl(string.Empty));
}
-}
+}
\ No newline at end of file
diff --git a/Oqtane.Client/Modules/Admin/Reset/Index.razor b/Oqtane.Client/Modules/Admin/Reset/Index.razor
index 31ebb1f5..64acc352 100644
--- a/Oqtane.Client/Modules/Admin/Reset/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Reset/Index.razor
@@ -5,28 +5,24 @@
@inject IStringLocalizer
Localizer
@inject IStringLocalizer SharedLocalizer
-