reset - systemInfo validation changes
This commit is contained in:
		| @ -7,52 +7,54 @@ | ||||
|  | ||||
| @if (PageState.Site.AllowRegistration) | ||||
| { | ||||
|     <AuthorizeView Roles="@RoleNames.Registered"> | ||||
|         <Authorizing> | ||||
|             <text>...</text> | ||||
|         </Authorizing> | ||||
|         <Authorized> | ||||
|             <ModuleMessage Message="@Localizer["Info.Registration.Exists"]" Type="MessageType.Info" /> | ||||
|         </Authorized> | ||||
|         <NotAuthorized> | ||||
|             <ModuleMessage Message="@Localizer["Info.Registration.InvalidEmail"]" Type="MessageType.Info" /> | ||||
|             <div class="container"> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="username" HelpText="Your username. Note that this field can not be modified once it is saved." ResourceKey="Username"></Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <input id="username" class="form-control" @bind="@_username"  /> | ||||
|     <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate> | ||||
|         <AuthorizeView Roles="@RoleNames.Registered"> | ||||
|             <Authorizing> | ||||
|                 <text>...</text> | ||||
|             </Authorizing> | ||||
|             <Authorized> | ||||
|                 <ModuleMessage Message="@Localizer["Info.Registration.Exists"]" Type="MessageType.Info" /> | ||||
|             </Authorized> | ||||
|             <NotAuthorized> | ||||
|                 <ModuleMessage Message="@Localizer["Info.Registration.InvalidEmail"]" Type="MessageType.Info" /> | ||||
|                 <div class="container"> | ||||
|                     <div class="row mb-1 align-items-center"> | ||||
|                         <Label Class="col-sm-3" For="username" HelpText="Your username. Note that this field can not be modified once it is saved." ResourceKey="Username"></Label> | ||||
|                         <div class="col-sm-9"> | ||||
|                             <input id="username" class="form-control" @bind="@_username" required /> | ||||
|                         </div> | ||||
|                     </div> | ||||
|                     <div class="row mb-1 align-items-center"> | ||||
|                         <Label Class="col-sm-3" For="password" HelpText="If you wish to change your password you can enter it here. Please choose a sufficiently secure password." ResourceKey="Password"></Label> | ||||
|                         <div class="col-sm-9"> | ||||
|                             <input id="password" type="password" class="form-control" @bind="@_password" autocomplete="new-password" required /> | ||||
|                         </div> | ||||
|                     </div> | ||||
|                     <div class="row mb-1 align-items-center"> | ||||
|                         <Label Class="col-sm-3" For="confirm" HelpText="If you are changing your password you must enter it again to confirm it matches" ResourceKey="Confirm"></Label> | ||||
|                         <div class="col-sm-9"> | ||||
|                             <input id="confirm" type="password" class="form-control" @bind="@_confirm" autocomplete="new-password" required /> | ||||
|                         </div> | ||||
|                     </div> | ||||
|                     <div class="row mb-1 align-items-center"> | ||||
|                         <Label Class="col-sm-3" For="email" HelpText="Your email address where you wish to receive notifications" ResourceKey="Email"></Label> | ||||
|                         <div class="col-sm-9"> | ||||
|                             <input id="email" class="form-control" @bind="@_email" required /> | ||||
|                         </div> | ||||
|                     </div> | ||||
|                     <div class="row mb-1 align-items-center"> | ||||
|                         <Label Class="col-sm-3" For="displayname" HelpText="Your full name" ResourceKey="DisplayName"></Label> | ||||
|                         <div class="col-sm-9"> | ||||
|                             <input id="displayname" class="form-control" @bind="@_displayname" required /> | ||||
|                         </div> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="password" HelpText="If you wish to change your password you can enter it here. Please choose a sufficiently secure password." ResourceKey="Password"></Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <input id="password" type="password" class="form-control" @bind="@_password" autocomplete="new-password" /> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="confirm" HelpText="If you are changing your password you must enter it again to confirm it matches" ResourceKey="Confirm"></Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <input id="confirm" type="password" class="form-control" @bind="@_confirm" autocomplete="new-password" /> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="email" HelpText="Your email address where you wish to receive notifications" ResourceKey="Email"></Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <input id="email" class="form-control" @bind="@_email" /> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="displayname" HelpText="Your full name" ResourceKey="DisplayName"></Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <input id="displayname" class="form-control" @bind="@_displayname" /> | ||||
|                     </div> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <br /> | ||||
|             <button type="button" class="btn btn-primary" @onclick="Register">@Localizer["Register"]</button> | ||||
|             <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button> | ||||
|         </NotAuthorized> | ||||
|     </AuthorizeView> | ||||
|                 <br /> | ||||
|                 <button type="button" class="btn btn-primary" @onclick="Register">@Localizer["Register"]</button> | ||||
|                 <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button> | ||||
|             </NotAuthorized> | ||||
|         </AuthorizeView> | ||||
|     </form> | ||||
| } | ||||
| else | ||||
| { | ||||
| @ -61,6 +63,8 @@ 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; | ||||
| @ -70,49 +74,58 @@ else | ||||
|  | ||||
|     private async Task Register() | ||||
|     { | ||||
|         try | ||||
|         validated = true; | ||||
|         var interop = new Interop(JSRuntime); | ||||
|         if (await interop.FormValid(form)) | ||||
|         { | ||||
|             bool _isEmailValid = Utilities.IsValidEmail(_email); | ||||
|  | ||||
|             if (_username != "" && _password != "" && _confirm != "" && _isEmailValid) | ||||
|             try | ||||
|             { | ||||
|                 if (_password == _confirm) | ||||
|                 { | ||||
|                     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); | ||||
|                 bool _isEmailValid = Utilities.IsValidEmail(_email); | ||||
|  | ||||
|                     if (user != null) | ||||
|                 if (_username != "" && _password != "" && _confirm != "" && _isEmailValid) | ||||
|                 { | ||||
|                     if (_password == _confirm) | ||||
|                     { | ||||
|                         await logger.LogInformation("User Created {Username} {Email}", _username, _email); | ||||
|                         AddModuleMessage(Localizer["Info.User.AccountCreate"], MessageType.Info); | ||||
|                         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); | ||||
|  | ||||
|                         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); | ||||
|                         } | ||||
|                     } | ||||
|                     else | ||||
|                     { | ||||
|                         await logger.LogError("Error Adding User {Username} {Email}", _username, _email); | ||||
|                         AddModuleMessage(Localizer["Error.User.AddInfo"], MessageType.Error); | ||||
|                         AddModuleMessage(Localizer["Message.Password.NoMatch"], MessageType.Warning); | ||||
|                     } | ||||
|                 } | ||||
|                 else | ||||
|                 { | ||||
|                     AddModuleMessage(Localizer["Message.Password.NoMatch"], MessageType.Warning); | ||||
|                     AddModuleMessage(Localizer["Message.Required.UserInfo"], MessageType.Warning); | ||||
|                 } | ||||
|             } | ||||
|             else | ||||
|             catch (Exception ex) | ||||
|             { | ||||
|                 AddModuleMessage(Localizer["Message.Required.UserInfo"], MessageType.Warning); | ||||
|                 await logger.LogError(ex, "Error Adding User {Username} {Email} {Error}", _username, _email, ex.Message); | ||||
|                 AddModuleMessage(Localizer["Error.User.Add"], MessageType.Error); | ||||
|             } | ||||
|         } | ||||
|         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(SharedLocalizer["Message.InfoRequired"], MessageType.Warning); | ||||
|         } | ||||
|     } | ||||
|  | ||||
| @ -120,4 +133,4 @@ else | ||||
|     { | ||||
|         NavigationManager.NavigateTo(NavigateUrl(string.Empty)); | ||||
|     } | ||||
| } | ||||
| } | ||||
|  | ||||
| @ -5,24 +5,28 @@ | ||||
| @inject IStringLocalizer<Index> Localizer | ||||
| @inject IStringLocalizer<SharedResources> SharedLocalizer | ||||
|  | ||||
| <div class="container"> | ||||
|     <div class="form-group"> | ||||
|         <label for="Username" class="control-label">@SharedLocalizer["Username"] </label> | ||||
|         <input type="text" class="form-control" placeholder="Username" @bind="@_username" readonly id="Username" /> | ||||
| <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate> | ||||
|     <div class="container"> | ||||
|         <div class="form-group"> | ||||
|             <label for="Username" class="control-label">@SharedLocalizer["Username"] </label> | ||||
|             <input type="text" class="form-control" placeholder="Username" @bind="@_username" readonly id="Username" /> | ||||
|         </div> | ||||
|         <div class="form-group"> | ||||
|             <label for="Password" class="control-label">@SharedLocalizer["Password"] </label> | ||||
|             <input type="password" class="form-control" placeholder="Password" @bind="@_password" id="Password" maxlength="256" required /> | ||||
|         </div> | ||||
|         <div class="form-group"> | ||||
|             <label for="Confirm" class="control-label">@Localizer["Password.Confirm"] </label> | ||||
|             <input type="password" class="form-control" placeholder="Password" @bind="@_confirm" id="Confirm" maxlength="256" required /> | ||||
|         </div> | ||||
|         <button type="button" class="btn btn-primary" @onclick="Reset">@Localizer["Password.Reset"]</button> | ||||
|         <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button> | ||||
|     </div> | ||||
|     <div class="form-group"> | ||||
|         <label for="Password" class="control-label">@SharedLocalizer["Password"] </label> | ||||
|         <input type="password" class="form-control" placeholder="Password" @bind="@_password" id="Password" /> | ||||
|     </div> | ||||
|     <div class="form-group"> | ||||
|         <label for="Confirm" class="control-label">@Localizer["Password.Confirm"] </label> | ||||
|         <input type="password" class="form-control" placeholder="Password" @bind="@_confirm" id="Confirm" /> | ||||
|     </div> | ||||
|     <button type="button" class="btn btn-primary" @onclick="Reset">@Localizer["Password.Reset"]</button> | ||||
|     <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button> | ||||
| </div> | ||||
| </form> | ||||
|  | ||||
| @code { | ||||
|     private ElementReference form; | ||||
|     private bool validated = false; | ||||
|     private string _username = string.Empty; | ||||
|     private string _password = string.Empty; | ||||
|     private string _confirm = string.Empty; | ||||
| @ -43,45 +47,54 @@ | ||||
|  | ||||
|     private async Task Reset() | ||||
|     { | ||||
|         try | ||||
|         validated = true; | ||||
|         var interop = new Interop(JSRuntime); | ||||
|         if (await interop.FormValid(form)) | ||||
|         { | ||||
|             if (_username != string.Empty && _password != string.Empty && _confirm != string.Empty) | ||||
|             try | ||||
|             { | ||||
|                 if (_password == _confirm) | ||||
|                 if (_username != string.Empty && _password != string.Empty && _confirm != string.Empty) | ||||
|                 { | ||||
|                     var user = new User | ||||
|                     if (_password == _confirm) | ||||
|                     { | ||||
|                         SiteId = PageState.Site.SiteId, | ||||
|                         Username = _username, | ||||
|                         Password = _password | ||||
|                     }; | ||||
|                     user = await UserService.ResetPasswordAsync(user, PageState.QueryString["token"]); | ||||
|                         var user = new User | ||||
|                         { | ||||
|                             SiteId = PageState.Site.SiteId, | ||||
|                             Username = _username, | ||||
|                             Password = _password | ||||
|                         }; | ||||
|                         user = await UserService.ResetPasswordAsync(user, PageState.QueryString["token"]); | ||||
|  | ||||
|                     if (user != null) | ||||
|                     { | ||||
|                         await logger.LogInformation("User Password Reset {Username}", _username); | ||||
|                         NavigationManager.NavigateTo(NavigateUrl("login")); | ||||
|                         if (user != null) | ||||
|                         { | ||||
|                             await logger.LogInformation("User Password Reset {Username}", _username); | ||||
|                             NavigationManager.NavigateTo(NavigateUrl("login")); | ||||
|                         } | ||||
|                         else | ||||
|                         { | ||||
|                             await logger.LogError("Error Resetting User Password {Username}", _username); | ||||
|                             AddModuleMessage(Localizer["Error.Password.ResetInfo"], MessageType.Error); | ||||
|                         } | ||||
|                     } | ||||
|                     else | ||||
|                     { | ||||
|                         await logger.LogError("Error Resetting User Password {Username}", _username); | ||||
|                         AddModuleMessage(Localizer["Error.Password.ResetInfo"], MessageType.Error); | ||||
|                         AddModuleMessage(Localizer["Message.Password.NoMatch"], MessageType.Warning); | ||||
|                     } | ||||
|                 } | ||||
|                 else | ||||
|                 { | ||||
|                     AddModuleMessage(Localizer["Message.Password.NoMatch"], MessageType.Warning); | ||||
|                     AddModuleMessage(Localizer["Message.Required.UserInfo"], MessageType.Warning); | ||||
|                 } | ||||
|             } | ||||
|             else | ||||
|             catch (Exception ex) | ||||
|             { | ||||
|                 AddModuleMessage(Localizer["Message.Required.UserInfo"], MessageType.Warning); | ||||
|                 await logger.LogError(ex, "Error Resetting User Password {Username} {Error}", _username, ex.Message); | ||||
|                 AddModuleMessage(Localizer["Error.Password.Reset"], MessageType.Error); | ||||
|             } | ||||
|         } | ||||
|         catch (Exception ex) | ||||
|         else | ||||
|         { | ||||
|             await logger.LogError(ex, "Error Resetting User Password {Username} {Error}", _username, ex.Message); | ||||
|             AddModuleMessage(Localizer["Error.Password.Reset"], MessageType.Error); | ||||
|             AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|  | ||||
| @ -22,7 +22,7 @@ | ||||
|         <div class="row mb-1 align-items-center"> | ||||
|             <Label Class="col-sm-3" For="isautoassigned" HelpText="Indicates Whether Or Not New Users Are Automatically Assigned To This Role" ResourceKey="AutoAssigned">Auto Assigned?</Label> | ||||
|             <div class="col-sm-9"> | ||||
|                 <select id="isautoassigned" class="form-select" @bind="@_isautoassigned"> | ||||
|                 <select id="isautoassigned" class="form-select" @bind="@_isautoassigned" required> | ||||
|                     <option value="True">@SharedLocalizer["Yes"]</option> | ||||
|                     <option value="False">@SharedLocalizer["No"]</option> | ||||
|                 </select> | ||||
| @ -72,7 +72,7 @@ | ||||
|         } | ||||
|         else | ||||
|         { | ||||
|             AddModuleMessage(Localizer["Message.InfoRequired"], MessageType.Warning); | ||||
|             AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|  | ||||
| @ -22,7 +22,7 @@ | ||||
|         <div class="row mb-1 align-items-center"> | ||||
|             <Label Class="col-sm-3" For="isautoassigned" HelpText="Indicates Whether Or Not New Users Are Automatically Assigned To This Role" ResourceKey="AutoAssigned">Auto Assigned?</Label> | ||||
|             <div class="col-sm-9"> | ||||
|                 <select id="isautoassigned" class="form-select" @bind="@_isautoassigned"> | ||||
|                 <select id="isautoassigned" class="form-select" @bind="@_isautoassigned" required> | ||||
|                     <option value="True">@SharedLocalizer["Yes"]</option> | ||||
|                     <option value="False">@SharedLocalizer["No"]</option> | ||||
|                 </select> | ||||
| @ -101,7 +101,7 @@ | ||||
|         } | ||||
|         else | ||||
|         { | ||||
|             AddModuleMessage(Localizer["Message.InfoRequired"], MessageType.Warning); | ||||
|             AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning); | ||||
|         } | ||||
|     } | ||||
| } | ||||
|  | ||||
| @ -12,65 +12,70 @@ | ||||
| else | ||||
| { | ||||
|  | ||||
| <div class="container"> | ||||
|     <div class="row mb-1 align-items-center"> | ||||
|         <Label Class="col-sm-3" For="role" HelpText="The role you are assigning users to" ResourceKey="Role">Role: </Label> | ||||
|         <div class="col-sm-9"> | ||||
|             <input id="role" class="form-control" @bind="@name" disabled /> | ||||
|     <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate> | ||||
|         <div class="container"> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="role" HelpText="The role you are assigning users to" ResourceKey="Role">Role: </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <input id="role" class="form-control" @bind="@name" disabled /> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="user" HelpText="Select a user" ResourceKey="User">User: </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <select id="user" class="form-select" @bind="@userid" required> | ||||
|                         <option value="-1"><@Localizer["User.Select"]></option> | ||||
|                         @foreach (UserRole userrole in users) | ||||
|                         { | ||||
|                             <option value="@(userrole.UserId)">@userrole.User.DisplayName</option> | ||||
|                         } | ||||
|                     </select> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="effectiveDate" HelpText="The date that this role assignment is active" ResourceKey="EffectiveDate">Effective Date: </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <input type="date" id="effectiveDate" class="form-control" @bind="@effectivedate" required /> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="expiryDate" HelpText="The date that this role assignment expires" ResourceKey="ExpiryDate">Expiry Date: </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <input type="date" id="expiryDate" class="form-control" @bind="@expirydate" required /> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <br /><br /> | ||||
|             <button type="button" class="btn btn-success" @onclick="SaveUserRole">@SharedLocalizer["Save"]</button> | ||||
|             <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink> | ||||
|             <hr class="app-rule" /> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <p align="center"> | ||||
|                     <Pager Items="@userroles"> | ||||
|                         <Header> | ||||
|                             <th>@Localizer["Users"]</th> | ||||
|                             <th>@Localizer["Effective"]</th> | ||||
|                             <th>@Localizer["Expiry"]</th> | ||||
|                             <th> </th> | ||||
|                         </Header> | ||||
|                         <Row> | ||||
|                             <td>@context.User.DisplayName</td> | ||||
|                             <td>@context.EffectiveDate</td> | ||||
|                             <td>@context.ExpiryDate</td> | ||||
|                             <td> | ||||
|                                 <ActionDialog Header="Remove User" Message="@string.Format(Localizer["Confirm.User.DeleteRole"], context.User.DisplayName)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteUserRole(context.UserRoleId))" Disabled="@(context.Role.IsAutoAssigned || PageState.User.Username == UserNames.Host)" ResourceKey="DeleteUserRole" /> | ||||
|                             </td> | ||||
|                         </Row> | ||||
|                     </Pager> | ||||
|                 </p> | ||||
|             </div> | ||||
|         </div> | ||||
|     </div> | ||||
|     <div class="row mb-1 align-items-center"> | ||||
|         <Label Class="col-sm-3" For="user" HelpText="Select a user" ResourceKey="User">User: </Label> | ||||
|         <div class="col-sm-9"> | ||||
|             <select id="user" class="form-select" @bind="@userid"> | ||||
|                 <option value="-1"><@Localizer["User.Select"]></option> | ||||
|                 @foreach (UserRole userrole in users) | ||||
|                 { | ||||
|                     <option value="@(userrole.UserId)">@userrole.User.DisplayName</option> | ||||
|                 } | ||||
|             </select> | ||||
|         </div> | ||||
|     </div> | ||||
|     <div class="row mb-1 align-items-center"> | ||||
|         <Label Class="col-sm-3" For="effectiveDate" HelpText="The date that this role assignment is active" ResourceKey="EffectiveDate">Effective Date: </Label> | ||||
|         <div class="col-sm-9"> | ||||
|             <input type="date" id="effectiveDate" class="form-control" @bind="@effectivedate" /> | ||||
|         </div> | ||||
|     </div> | ||||
|     <div class="row mb-1 align-items-center"> | ||||
|         <Label Class="col-sm-3" For="expiryDate" HelpText="The date that this role assignment expires" ResourceKey="ExpiryDate">Expiry Date: </Label> | ||||
|         <div class="col-sm-9"> | ||||
|             <input type="date" id="expiryDate" class="form-control" @bind="@expirydate" /> | ||||
|         </div> | ||||
|     </div> | ||||
|     <br /><br /> | ||||
|     <button type="button" class="btn btn-success" @onclick="SaveUserRole">@SharedLocalizer["Save"]</button> | ||||
|     <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink> | ||||
|     <hr class="app-rule" /> | ||||
|     <div class="row mb-1 align-items-center"> | ||||
|         <p align="center"> | ||||
|             <Pager Items="@userroles"> | ||||
|                 <Header> | ||||
|                 <th>@Localizer["Users"]</th> | ||||
|                 <th>@Localizer["Effective"]</th> | ||||
|                 <th>@Localizer["Expiry"]</th> | ||||
|                 <th> </th> | ||||
|                 </Header> | ||||
|                 <Row> | ||||
|                     <td>@context.User.DisplayName</td> | ||||
|                     <td>@context.EffectiveDate</td> | ||||
|                     <td>@context.ExpiryDate</td> | ||||
|                     <td> | ||||
|                         <ActionDialog Header="Remove User" Message="@string.Format(Localizer["Confirm.User.DeleteRole"], context.User.DisplayName)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteUserRole(context.UserRoleId))" Disabled="@(context.Role.IsAutoAssigned || PageState.User.Username == UserNames.Host)" ResourceKey="DeleteUserRole" /> | ||||
|                     </td> | ||||
|                 </Row> | ||||
|             </Pager> | ||||
|         </p> | ||||
|     </div> | ||||
| </div> | ||||
|     </form> | ||||
| } | ||||
|  | ||||
| @code { | ||||
|     private ElementReference form; | ||||
|     private bool validated = false; | ||||
|  | ||||
|     private int roleid; | ||||
|     private string name = string.Empty; | ||||
|     private List<UserRole> users; | ||||
| @ -118,59 +123,78 @@ else | ||||
|  | ||||
|     private async Task SaveUserRole() | ||||
|     { | ||||
|         try | ||||
|         validated = true; | ||||
|         var interop = new Interop(JSRuntime); | ||||
|         if (await interop.FormValid(form)) | ||||
|         { | ||||
|             if (userid != -1) | ||||
|             try | ||||
|             { | ||||
|                 var userrole = userroles.Where(item => item.UserId == userid && item.RoleId == roleid).FirstOrDefault(); | ||||
|                 if (userrole != null) | ||||
|                 if (userid != -1) | ||||
|                 { | ||||
|                     userrole.EffectiveDate = effectivedate; | ||||
|                     userrole.ExpiryDate = expirydate; | ||||
|                     await UserRoleService.UpdateUserRoleAsync(userrole); | ||||
|                     var userrole = userroles.Where(item => item.UserId == userid && item.RoleId == roleid).FirstOrDefault(); | ||||
|                     if (userrole != null) | ||||
|                     { | ||||
|                         userrole.EffectiveDate = effectivedate; | ||||
|                         userrole.ExpiryDate = expirydate; | ||||
|                         await UserRoleService.UpdateUserRoleAsync(userrole); | ||||
|                     } | ||||
|                     else | ||||
|                     { | ||||
|                         userrole = new UserRole(); | ||||
|                         userrole.UserId = userid; | ||||
|                         userrole.RoleId = roleid; | ||||
|                         userrole.EffectiveDate = effectivedate; | ||||
|                         userrole.ExpiryDate = expirydate; | ||||
|  | ||||
|                         await UserRoleService.AddUserRoleAsync(userrole); | ||||
|                     } | ||||
|  | ||||
|                     await logger.LogInformation("User Assigned To Role {UserRole}", userrole); | ||||
|                     AddModuleMessage(Localizer["Success.User.AssignedRole"], MessageType.Success); | ||||
|                     await GetUserRoles(); | ||||
|                     StateHasChanged(); | ||||
|                 } | ||||
|                 else | ||||
|                 { | ||||
|                     userrole = new UserRole(); | ||||
|                     userrole.UserId = userid; | ||||
|                     userrole.RoleId = roleid; | ||||
|                     userrole.EffectiveDate = effectivedate; | ||||
|                     userrole.ExpiryDate = expirydate; | ||||
|  | ||||
|                     await UserRoleService.AddUserRoleAsync(userrole); | ||||
|                     AddModuleMessage(Localizer["Message.Required.UserSelect"], MessageType.Warning); | ||||
|                 } | ||||
|  | ||||
|                 await logger.LogInformation("User Assigned To Role {UserRole}", userrole); | ||||
|                 AddModuleMessage(Localizer["Success.User.AssignedRole"], MessageType.Success); | ||||
|                 await GetUserRoles(); | ||||
|                 StateHasChanged(); | ||||
|             } | ||||
|             else | ||||
|             catch (Exception ex) | ||||
|             { | ||||
|                 AddModuleMessage(Localizer["Message.Required.UserSelect"], MessageType.Warning); | ||||
|                 await logger.LogError(ex, "Error Saving User Roles {RoleId} {Error}", roleid, ex.Message); | ||||
|                 AddModuleMessage(Localizer["Error.User.SaveRole"], MessageType.Error); | ||||
|             } | ||||
|         } | ||||
|         catch (Exception ex) | ||||
|  | ||||
|         else | ||||
|         { | ||||
|             await logger.LogError(ex, "Error Saving User Roles {RoleId} {Error}", roleid, ex.Message); | ||||
|             AddModuleMessage(Localizer["Error.User.SaveRole"], MessageType.Error); | ||||
|             AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     private async Task DeleteUserRole(int UserRoleId) | ||||
|     { | ||||
|         try | ||||
|         validated = true; | ||||
|         var interop = new Interop(JSRuntime); | ||||
|         if (await interop.FormValid(form)) | ||||
|         { | ||||
|             await UserRoleService.DeleteUserRoleAsync(UserRoleId); | ||||
|             await logger.LogInformation("User Removed From Role {UserRoleId}", UserRoleId); | ||||
|             AddModuleMessage(Localizer["Confirm.User.RoleRemoved"], MessageType.Success); | ||||
|             await GetUserRoles(); | ||||
|             StateHasChanged(); | ||||
|             try | ||||
|             { | ||||
|                 await UserRoleService.DeleteUserRoleAsync(UserRoleId); | ||||
|                 await logger.LogInformation("User Removed From Role {UserRoleId}", UserRoleId); | ||||
|                 AddModuleMessage(Localizer["Confirm.User.RoleRemoved"], MessageType.Success); | ||||
|                 await GetUserRoles(); | ||||
|                 StateHasChanged(); | ||||
|             } | ||||
|             catch (Exception ex) | ||||
|             { | ||||
|                 await logger.LogError(ex, "Error Removing User From Role {UserRoleId} {Error}", UserRoleId, ex.Message); | ||||
|                 AddModuleMessage(Localizer["Error.User.RemoveRole"], MessageType.Error); | ||||
|             } | ||||
|         } | ||||
|         catch (Exception ex) | ||||
|         else | ||||
|         { | ||||
|             await logger.LogError(ex, "Error Removing User From Role {UserRoleId} {Error}", UserRoleId, ex.Message); | ||||
|             AddModuleMessage(Localizer["Error.User.RemoveRole"], MessageType.Error); | ||||
|             AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning); | ||||
|         } | ||||
|     } | ||||
| } | ||||
|  | ||||
| @ -13,213 +13,217 @@ | ||||
|  | ||||
| @if (_initialized) | ||||
| { | ||||
|     <div class="container"> | ||||
|         <div class="row mb-1 align-items-center"> | ||||
|             <Label Class="col-sm-3" For="name" HelpText="Enter the site name" ResourceKey="Name">Name: </Label> | ||||
|             <div class="col-sm-9"> | ||||
|                 <input id="name" class="form-control" @bind="@_name" /> | ||||
|             </div> | ||||
|         </div> | ||||
|         <div class="row mb-1 align-items-center"> | ||||
|             <Label Class="col-sm-3" For="alias" HelpText="The aliases for the site. An alias can be a domain name (www.site.com) or a virtual folder (ie. www.site.com/folder). If a site has multiple aliases they should be separated by commas." ResourceKey="Aliases">Aliases: </Label> | ||||
|             <div class="col-sm-9"> | ||||
|                 @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)) | ||||
|                 { | ||||
|                     <textarea id="alias" class="form-control" @bind="@_urls" rows="3"></textarea> | ||||
|                 } | ||||
|                 else | ||||
|                 { | ||||
|                     <textarea id="alias" class="form-control" @bind="@_urls" rows="3" readonly></textarea> | ||||
|                 } | ||||
|             </div> | ||||
|         </div> | ||||
|         <div class="row mb-1 align-items-center"> | ||||
|             <Label Class="col-sm-3" For="allowRegister" HelpText="Do you want the users to be able to register for an account on the site" ResourceKey="AllowRegistration">Allow User Registration? </Label> | ||||
|             <div class="col-sm-9"> | ||||
|                 <select id="allowRegister" class="form-select" @bind="@_allowregistration"> | ||||
|                     <option value="True">@SharedLocalizer["Yes"]</option> | ||||
|                     <option value="False">@SharedLocalizer["No"]</option> | ||||
|                 </select> | ||||
|             </div> | ||||
|         </div> | ||||
|         <div class="row mb-1 align-items-center"> | ||||
|             <Label Class="col-sm-3" For="isDeleted" HelpText="Is this site deleted?" ResourceKey="IsDeleted">Is Deleted? </Label> | ||||
|             <div class="col-sm-9"> | ||||
|                 <select id="isDeleted" class="form-select" @bind="@_isdeleted"> | ||||
|                     <option value="True">@SharedLocalizer["Yes"]</option> | ||||
|                     <option value="False">@SharedLocalizer["No"]</option> | ||||
|                 </select> | ||||
|             </div> | ||||
|         </div> | ||||
|     </div> | ||||
|     <Section Name="Appearance" Heading="Appearance" ResourceKey="Appearance"> | ||||
|     <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate> | ||||
|         <div class="container"> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="logo" HelpText="Specify a logo for the site" ResourceKey="Logo">Logo: </Label> | ||||
|                 <Label Class="col-sm-3" For="name" HelpText="Enter the site name" ResourceKey="Name">Name: </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <FileManager FileId="@_logofileid" Filter="@Constants.ImageFiles" @ref="_logofilemanager" /> | ||||
|                     <input id="name" class="form-control" @bind="@_name" maxlength="256" required /> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="favicon" HelpText="Specify a Favicon" ResourceKey="FavoriteIcon">Favicon: </Label> | ||||
|                 <Label Class="col-sm-3" For="alias" HelpText="The aliases for the site. An alias can be a domain name (www.site.com) or a virtual folder (ie. www.site.com/folder). If a site has multiple aliases they should be separated by commas." ResourceKey="Aliases">Aliases: </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <FileManager FileId="@_faviconfileid" Filter="ico" @ref="_faviconfilemanager" /> | ||||
|                     @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)) | ||||
|                     { | ||||
|                         <textarea id="alias" class="form-control" @bind="@_urls" rows="3" required></textarea> | ||||
|                     } | ||||
|                     else | ||||
|                     { | ||||
|                         <textarea id="alias" class="form-control" @bind="@_urls" rows="3" readonly></textarea> | ||||
|                     } | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="defaultTheme" HelpText="Select the sites default theme" ResourceKey="DefaultTheme">Default Theme: </Label> | ||||
|                 <Label Class="col-sm-3" For="allowRegister" HelpText="Do you want the users to be able to register for an account on the site" ResourceKey="AllowRegistration">Allow User Registration? </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <select id="defaultTheme" class="form-select" value="@_themetype" @onchange="(e => ThemeChanged(e))"> | ||||
|                         <option value="-"><@Localizer["Theme.Select"]></option> | ||||
|                         @foreach (var theme in _themes) | ||||
|                         { | ||||
|                             <option value="@theme.TypeName">@theme.Name</option> | ||||
|                         } | ||||
|                     </select> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="defaultContainer" HelpText="Select the default container for the site" ResourceKey="DefaultContainer">Default Container: </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <select id="defaultContainer" class="form-select" @bind="@_containertype"> | ||||
|                         <option value="-"><@Localizer["Container.Select"]></option> | ||||
|                         @foreach (var container in _containers) | ||||
|                         { | ||||
|                             <option value="@container.TypeName">@container.Name</option> | ||||
|                         } | ||||
|                     </select> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="defaultAdminContainer" HelpText="Select the default admin container for the site" ResourceKey="DefaultAdminContainer">Default Admin Container: </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <select id="defaultAdminContainer" class="form-select" @bind="@_admincontainertype"> | ||||
|                         <option value="-"><@Localizer["Container.Select"]></option> | ||||
|                         <option value="@Constants.DefaultAdminContainer"><@Localizer["DefaultAdminContainer"]></option> | ||||
|                         @foreach (var container in _containers) | ||||
|                         { | ||||
|                             <option value="@container.TypeName">@container.Name</option> | ||||
|                         } | ||||
|                     </select> | ||||
|                 </div> | ||||
|             </div> | ||||
|  | ||||
|         </div> | ||||
|     </Section> | ||||
|     <Section Name="SMTP" Heading="SMTP Settings" ResourceKey="SMTPSettings"> | ||||
|         <div class="container"> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <div class="col-sm-3"> | ||||
|                 </div> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <strong>@Localizer["Smtp.Required.EnableNotificationJob"]</strong><br /> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="host" HelpText="Enter the host name of the SMTP server" ResourceKey="Host">Host: </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <input id="host" class="form-control" @bind="@_smtphost" /> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="port" HelpText="Enter the port number for the SMTP server. Please note this field is required if you provide a host name." ResourceKey="Port">Port: </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <input id="port" class="form-control" @bind="@_smtpport" /> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="enabledSSl" HelpText="Specify if SSL is required for your SMTP server" ResourceKey="UseSsl">SSL Enabled: </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <select id="enabledSSl" class="form-select" @bind="@_smtpssl"> | ||||
|                     <select id="allowRegister" class="form-select" @bind="@_allowregistration" required> | ||||
|                         <option value="True">@SharedLocalizer["Yes"]</option> | ||||
|                         <option value="False">@SharedLocalizer["No"]</option> | ||||
|                     </select> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="username" HelpText="Enter the username for your SMTP account" ResourceKey="SmptUsername">Username: </Label> | ||||
|                 <Label Class="col-sm-3" For="isDeleted" HelpText="Is this site deleted?" ResourceKey="IsDeleted">Is Deleted? </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <input id="username" class="form-control" @bind="@_smtpusername" /> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="password" HelpText="Enter the password for your SMTP account" ResourceKey="SmtpPassword">Password: </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <input id="password" type="password" class="form-control" @bind="@_smtppassword" /> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="sender" HelpText="Enter the email which emails will be sent from. Please note that this email address may need to be authorized with the SMTP server." ResourceKey="SmptSender">Email Sender: </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <input id="sender" class="form-control" @bind="@_smtpsender" /> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <button type="button" class="btn btn-secondary" @onclick="SendEmail">@Localizer["Smtp.TestConfig"]</button> | ||||
|             <br /><br /> | ||||
|  | ||||
|         </div> | ||||
|  | ||||
|  | ||||
|     </Section> | ||||
|     <Section Name="PWA" Heading="Progressive Web Application Settings" ResourceKey="PWASettings"> | ||||
|         <div class="container"> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="isEnabled" HelpText="Select whether you would like this site to be available as a Progressive Web Application (PWA)" ResourceKey="EnablePWA">Is Enabled? </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <select id="isEnabled" class="form-select" @bind="@_pwaisenabled"> | ||||
|                     <select id="isDeleted" class="form-select" @bind="@_isdeleted" required> | ||||
|                         <option value="True">@SharedLocalizer["Yes"]</option> | ||||
|                         <option value="False">@SharedLocalizer["No"]</option> | ||||
|                     </select> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="appIcon" HelpText="Include an application icon for your PWA. It should be a PNG which is 192 X 192 pixels in dimension." ResourceKey="PwaApplicationIcon">App Icon: </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <FileManager FileId="@_pwaappiconfileid" Filter="png" @ref="_pwaappiconfilemanager" /> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="splashIcon" HelpText="Include a splash icon for your PWA. It should be a PNG which is 512 X 512 pixels in dimension." ResourceKey="PwaSplashIcon">Splash Icon: </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <FileManager FileId="@_pwasplashiconfileid" Filter="png" @ref="_pwasplashiconfilemanager" /> | ||||
|                 </div> | ||||
|             </div> | ||||
|         </div> | ||||
|     </Section> | ||||
|     @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)) | ||||
|     { | ||||
|         <Section Name="TenantInformation" Heading="Tenant Information" ResourceKey="TenantInformation"> | ||||
|         <Section Name="Appearance" Heading="Appearance" ResourceKey="Appearance"> | ||||
|             <div class="container"> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="tenant" HelpText="The tenant for the site" ResourceKey="Tenant">Tenant: </Label> | ||||
|                     <Label Class="col-sm-3" For="logo" HelpText="Specify a logo for the site" ResourceKey="Logo">Logo: </Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <input id="tenant" class="form-control" @bind="@_tenant" readonly /> | ||||
|                         <FileManager FileId="@_logofileid" Filter="@Constants.ImageFiles" @ref="_logofilemanager" /> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="database" HelpText="The database for the tenant" ResourceKey="Database">Database: </Label> | ||||
|                     <Label Class="col-sm-3" For="favicon" HelpText="Specify a Favicon" ResourceKey="FavoriteIcon">Favicon: </Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <input id="database" class="form-control" @bind="@_database" readonly /> | ||||
|                         <FileManager FileId="@_faviconfileid" Filter="ico" @ref="_faviconfilemanager" /> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="connectionstring" HelpText="The connection information for the database" ResourceKey="ConnectionString">Connection: </Label> | ||||
|                     <Label Class="col-sm-3" For="defaultTheme" HelpText="Select the sites default theme" ResourceKey="DefaultTheme">Default Theme: </Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <textarea id="connectionstring" class="form-control" @bind="@_connectionstring" rows="2" readonly></textarea> | ||||
|                         <select id="defaultTheme" class="form-select" value="@_themetype" @onchange="(e => ThemeChanged(e))" required> | ||||
|                             <option value="-"><@Localizer["Theme.Select"]></option> | ||||
|                             @foreach (var theme in _themes) | ||||
|                             { | ||||
|                                 <option value="@theme.TypeName">@theme.Name</option> | ||||
|                             } | ||||
|                         </select> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="defaultContainer" HelpText="Select the default container for the site" ResourceKey="DefaultContainer">Default Container: </Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <select id="defaultContainer" class="form-select" @bind="@_containertype" required> | ||||
|                             <option value="-"><@Localizer["Container.Select"]></option> | ||||
|                             @foreach (var container in _containers) | ||||
|                             { | ||||
|                                 <option value="@container.TypeName">@container.Name</option> | ||||
|                             } | ||||
|                         </select> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="defaultAdminContainer" HelpText="Select the default admin container for the site" ResourceKey="DefaultAdminContainer">Default Admin Container: </Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <select id="defaultAdminContainer" class="form-select" @bind="@_admincontainertype" required> | ||||
|                             <option value="-"><@Localizer["Container.Select"]></option> | ||||
|                             <option value="@Constants.DefaultAdminContainer"><@Localizer["DefaultAdminContainer"]></option> | ||||
|                             @foreach (var container in _containers) | ||||
|                             { | ||||
|                                 <option value="@container.TypeName">@container.Name</option> | ||||
|                             } | ||||
|                         </select> | ||||
|                     </div> | ||||
|                 </div> | ||||
|  | ||||
|             </div> | ||||
|         </Section> | ||||
|         <Section Name="SMTP" Heading="SMTP Settings" ResourceKey="SMTPSettings"> | ||||
|             <div class="container"> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <div class="col-sm-3"> | ||||
|                     </div> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <strong>@Localizer["Smtp.Required.EnableNotificationJob"]</strong><br /> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="host" HelpText="Enter the host name of the SMTP server" ResourceKey="Host">Host: </Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <input id="host" class="form-control" @bind="@_smtphost" /> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="port" HelpText="Enter the port number for the SMTP server. Please note this field is required if you provide a host name." ResourceKey="Port">Port: </Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <input id="port" class="form-control" @bind="@_smtpport" required /> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="enabledSSl" HelpText="Specify if SSL is required for your SMTP server" ResourceKey="UseSsl">SSL Enabled: </Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <select id="enabledSSl" class="form-select" @bind="@_smtpssl" required> | ||||
|                             <option value="True">@SharedLocalizer["Yes"]</option> | ||||
|                             <option value="False">@SharedLocalizer["No"]</option> | ||||
|                         </select> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="username" HelpText="Enter the username for your SMTP account" ResourceKey="SmptUsername">Username: </Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <input id="username" class="form-control" @bind="@_smtpusername" /> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="password" HelpText="Enter the password for your SMTP account" ResourceKey="SmtpPassword">Password: </Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <input id="password" type="password" class="form-control" @bind="@_smtppassword" /> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="sender" HelpText="Enter the email which emails will be sent from. Please note that this email address may need to be authorized with the SMTP server." ResourceKey="SmptSender">Email Sender: </Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <input id="sender" class="form-control" @bind="@_smtpsender" /> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <button type="button" class="btn btn-secondary" @onclick="SendEmail">@Localizer["Smtp.TestConfig"]</button> | ||||
|                 <br /><br /> | ||||
|  | ||||
|             </div> | ||||
|  | ||||
|  | ||||
|         </Section> | ||||
|         <Section Name="PWA" Heading="Progressive Web Application Settings" ResourceKey="PWASettings"> | ||||
|             <div class="container"> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="isEnabled" HelpText="Select whether you would like this site to be available as a Progressive Web Application (PWA)" ResourceKey="EnablePWA">Is Enabled? </Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <select id="isEnabled" class="form-select" @bind="@_pwaisenabled" required> | ||||
|                             <option value="True">@SharedLocalizer["Yes"]</option> | ||||
|                             <option value="False">@SharedLocalizer["No"]</option> | ||||
|                         </select> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="appIcon" HelpText="Include an application icon for your PWA. It should be a PNG which is 192 X 192 pixels in dimension." ResourceKey="PwaApplicationIcon">App Icon: </Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <FileManager FileId="@_pwaappiconfileid" Filter="png" @ref="_pwaappiconfilemanager" /> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="splashIcon" HelpText="Include a splash icon for your PWA. It should be a PNG which is 512 X 512 pixels in dimension." ResourceKey="PwaSplashIcon">Splash Icon: </Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <FileManager FileId="@_pwasplashiconfileid" Filter="png" @ref="_pwasplashiconfilemanager" /> | ||||
|                     </div> | ||||
|                 </div> | ||||
|             </div> | ||||
|         </Section> | ||||
|     } | ||||
|     <br /> | ||||
|     <button type="button" class="btn btn-success" @onclick="SaveSite">@SharedLocalizer["Save"]</button> | ||||
|     <ActionDialog Header="Delete Site" Message="@Localizer["Confirm.DeleteSite"]" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteSite())" ResourceKey="DeleteSite" /> | ||||
|     <br /> | ||||
|     <br /> | ||||
|     <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon" DeletedBy="@_deletedby" DeletedOn="@_deletedon"></AuditInfo> | ||||
|         @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)) | ||||
|         { | ||||
|             <Section Name="TenantInformation" Heading="Tenant Information" ResourceKey="TenantInformation"> | ||||
|                 <div class="container"> | ||||
|                     <div class="row mb-1 align-items-center"> | ||||
|                         <Label Class="col-sm-3" For="tenant" HelpText="The tenant for the site" ResourceKey="Tenant">Tenant: </Label> | ||||
|                         <div class="col-sm-9"> | ||||
|                             <input id="tenant" class="form-control" @bind="@_tenant" readonly /> | ||||
|                         </div> | ||||
|                     </div> | ||||
|                     <div class="row mb-1 align-items-center"> | ||||
|                         <Label Class="col-sm-3" For="database" HelpText="The database for the tenant" ResourceKey="Database">Database: </Label> | ||||
|                         <div class="col-sm-9"> | ||||
|                             <input id="database" class="form-control" @bind="@_database" readonly /> | ||||
|                         </div> | ||||
|                     </div> | ||||
|                     <div class="row mb-1 align-items-center"> | ||||
|                         <Label Class="col-sm-3" For="connectionstring" HelpText="The connection information for the database" ResourceKey="ConnectionString">Connection: </Label> | ||||
|                         <div class="col-sm-9"> | ||||
|                             <textarea id="connectionstring" class="form-control" @bind="@_connectionstring" rows="2" readonly></textarea> | ||||
|                         </div> | ||||
|                     </div> | ||||
|                 </div> | ||||
|             </Section> | ||||
|         } | ||||
|         <br /> | ||||
|         <button type="button" class="btn btn-success" @onclick="SaveSite">@SharedLocalizer["Save"]</button> | ||||
|         <ActionDialog Header="Delete Site" Message="@Localizer["Confirm.DeleteSite"]" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteSite())" ResourceKey="DeleteSite" /> | ||||
|         <br /> | ||||
|         <br /> | ||||
|         <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon" DeletedBy="@_deletedby" DeletedOn="@_deletedon"></AuditInfo> | ||||
|     </form> | ||||
| } | ||||
|  | ||||
| @code { | ||||
|     private ElementReference form; | ||||
|     private bool validated = false; | ||||
|     private bool _initialized = false; | ||||
|     private List<Theme> _themeList; | ||||
|     private List<ThemeControl> _themes = new List<ThemeControl>(); | ||||
| @ -384,121 +388,130 @@ | ||||
|  | ||||
|     private async Task SaveSite() | ||||
|     { | ||||
|         try | ||||
|         validated = true; | ||||
|         var interop = new Interop(JSRuntime); | ||||
|         if (await interop.FormValid(form)) | ||||
|         { | ||||
|             if (_name != string.Empty && _urls != string.Empty && _themetype != "-" && _containertype != "-") | ||||
|             try | ||||
|             { | ||||
|                 var unique = true; | ||||
|                 if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)) | ||||
|                 if (_name != string.Empty && _urls != string.Empty && _themetype != "-" && _containertype != "-") | ||||
|                 { | ||||
|                     foreach (string name in _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)) | ||||
|                     var unique = true; | ||||
|                     if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)) | ||||
|                     { | ||||
|                         if (_aliasList.Exists(item => item.Name == name && item.SiteId != PageState.Alias.SiteId && item.TenantId != PageState.Alias.TenantId)) | ||||
|                         foreach (string name in _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)) | ||||
|                         { | ||||
|                             unique = false; | ||||
|                             if (_aliasList.Exists(item => item.Name == name && item.SiteId != PageState.Alias.SiteId && item.TenantId != PageState.Alias.TenantId)) | ||||
|                             { | ||||
|                                 unique = false; | ||||
|                             } | ||||
|                         } | ||||
|                     } | ||||
|                 } | ||||
|  | ||||
|                 if (unique) | ||||
|                 { | ||||
|                     var site = await SiteService.GetSiteAsync(PageState.Site.SiteId); | ||||
|                     if (site != null) | ||||
|                     if (unique) | ||||
|                     { | ||||
|                         bool refresh = (site.DefaultThemeType != _themetype || site.DefaultContainerType != _containertype); | ||||
|  | ||||
|                         site.Name = _name; | ||||
|                         site.AllowRegistration = (_allowregistration == null ? true : Boolean.Parse(_allowregistration)); | ||||
|                         site.IsDeleted = (_isdeleted == null ? true : Boolean.Parse(_isdeleted)); | ||||
|  | ||||
|                         site.LogoFileId = null; | ||||
|                         var logofileid = _logofilemanager.GetFileId(); | ||||
|                         if (logofileid != -1) | ||||
|                         var site = await SiteService.GetSiteAsync(PageState.Site.SiteId); | ||||
|                         if (site != null) | ||||
|                         { | ||||
|                             site.LogoFileId = logofileid; | ||||
|                         } | ||||
|                         var faviconFieldId = _faviconfilemanager.GetFileId(); | ||||
|                         if (faviconFieldId != -1) | ||||
|                         { | ||||
|                             site.FaviconFileId = faviconFieldId; | ||||
|                         } | ||||
|                         site.DefaultThemeType = _themetype; | ||||
|                         site.DefaultContainerType = _containertype; | ||||
|                         site.AdminContainerType = _admincontainertype; | ||||
|                             bool refresh = (site.DefaultThemeType != _themetype || site.DefaultContainerType != _containertype); | ||||
|  | ||||
|                         site.PwaIsEnabled = (_pwaisenabled == null ? true : Boolean.Parse(_pwaisenabled)); | ||||
|                         var pwaappiconfileid = _pwaappiconfilemanager.GetFileId(); | ||||
|                         if (pwaappiconfileid != -1) | ||||
|                         { | ||||
|                             site.PwaAppIconFileId = pwaappiconfileid; | ||||
|                         } | ||||
|                         var pwasplashiconfileid = _pwasplashiconfilemanager.GetFileId(); | ||||
|                         if (pwasplashiconfileid != -1) | ||||
|                         { | ||||
|                             site.PwaSplashIconFileId = pwasplashiconfileid; | ||||
|                         } | ||||
|                             site.Name = _name; | ||||
|                             site.AllowRegistration = (_allowregistration == null ? true : Boolean.Parse(_allowregistration)); | ||||
|                             site.IsDeleted = (_isdeleted == null ? true : Boolean.Parse(_isdeleted)); | ||||
|  | ||||
|                         site = await SiteService.UpdateSiteAsync(site); | ||||
|  | ||||
|                         var settings = await SettingService.GetSiteSettingsAsync(site.SiteId); | ||||
|                         SettingService.SetSetting(settings, "SMTPHost", _smtphost); | ||||
|                         SettingService.SetSetting(settings, "SMTPPort", _smtpport); | ||||
|                         SettingService.SetSetting(settings, "SMTPSSL", _smtpssl); | ||||
|                         SettingService.SetSetting(settings, "SMTPUsername", _smtpusername); | ||||
|                         SettingService.SetSetting(settings, "SMTPPassword", _smtppassword); | ||||
|                         SettingService.SetSetting(settings, "SMTPSender", _smtpsender); | ||||
|                         await SettingService.UpdateSiteSettingsAsync(settings, site.SiteId); | ||||
|  | ||||
|                         if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)) | ||||
|                         { | ||||
|                             var names = _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries); | ||||
|                             foreach (Alias alias in _aliasList.Where(item => item.SiteId == site.SiteId && item.TenantId == site.TenantId).ToList()) | ||||
|                             site.LogoFileId = null; | ||||
|                             var logofileid = _logofilemanager.GetFileId(); | ||||
|                             if (logofileid != -1) | ||||
|                             { | ||||
|                                 if (!names.Contains(alias.Name)) | ||||
|                                 site.LogoFileId = logofileid; | ||||
|                             } | ||||
|                             var faviconFieldId = _faviconfilemanager.GetFileId(); | ||||
|                             if (faviconFieldId != -1) | ||||
|                             { | ||||
|                                 site.FaviconFileId = faviconFieldId; | ||||
|                             } | ||||
|                             site.DefaultThemeType = _themetype; | ||||
|                             site.DefaultContainerType = _containertype; | ||||
|                             site.AdminContainerType = _admincontainertype; | ||||
|  | ||||
|                             site.PwaIsEnabled = (_pwaisenabled == null ? true : Boolean.Parse(_pwaisenabled)); | ||||
|                             var pwaappiconfileid = _pwaappiconfilemanager.GetFileId(); | ||||
|                             if (pwaappiconfileid != -1) | ||||
|                             { | ||||
|                                 site.PwaAppIconFileId = pwaappiconfileid; | ||||
|                             } | ||||
|                             var pwasplashiconfileid = _pwasplashiconfilemanager.GetFileId(); | ||||
|                             if (pwasplashiconfileid != -1) | ||||
|                             { | ||||
|                                 site.PwaSplashIconFileId = pwasplashiconfileid; | ||||
|                             } | ||||
|  | ||||
|                             site = await SiteService.UpdateSiteAsync(site); | ||||
|  | ||||
|                             var settings = await SettingService.GetSiteSettingsAsync(site.SiteId); | ||||
|                             SettingService.SetSetting(settings, "SMTPHost", _smtphost); | ||||
|                             SettingService.SetSetting(settings, "SMTPPort", _smtpport); | ||||
|                             SettingService.SetSetting(settings, "SMTPSSL", _smtpssl); | ||||
|                             SettingService.SetSetting(settings, "SMTPUsername", _smtpusername); | ||||
|                             SettingService.SetSetting(settings, "SMTPPassword", _smtppassword); | ||||
|                             SettingService.SetSetting(settings, "SMTPSender", _smtpsender); | ||||
|                             await SettingService.UpdateSiteSettingsAsync(settings, site.SiteId); | ||||
|  | ||||
|                             if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)) | ||||
|                             { | ||||
|                                 var names = _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries); | ||||
|                                 foreach (Alias alias in _aliasList.Where(item => item.SiteId == site.SiteId && item.TenantId == site.TenantId).ToList()) | ||||
|                                 { | ||||
|                                     await AliasService.DeleteAliasAsync(alias.AliasId); | ||||
|                                     if (!names.Contains(alias.Name)) | ||||
|                                     { | ||||
|                                         await AliasService.DeleteAliasAsync(alias.AliasId); | ||||
|                                     } | ||||
|                                 } | ||||
|  | ||||
|                                 foreach (string name in names) | ||||
|                                 { | ||||
|                                     if (!_aliasList.Exists(item => item.Name == name)) | ||||
|                                     { | ||||
|                                         Alias alias = new Alias(); | ||||
|                                         alias.Name = name; | ||||
|                                         alias.TenantId = site.TenantId; | ||||
|                                         alias.SiteId = site.SiteId; | ||||
|                                         await AliasService.AddAliasAsync(alias); | ||||
|                                     } | ||||
|                                 } | ||||
|                             } | ||||
|  | ||||
|                             foreach (string name in names) | ||||
|                             await logger.LogInformation("Site Settings Saved {Site}", site); | ||||
|  | ||||
|                             if (refresh) | ||||
|                             { | ||||
|                                 if (!_aliasList.Exists(item => item.Name == name)) | ||||
|                                 { | ||||
|                                     Alias alias = new Alias(); | ||||
|                                     alias.Name = name; | ||||
|                                     alias.TenantId = site.TenantId; | ||||
|                                     alias.SiteId = site.SiteId; | ||||
|                                     await AliasService.AddAliasAsync(alias); | ||||
|                                 } | ||||
|                                 NavigationManager.NavigateTo(NavigateUrl()); // refresh to show new theme or container | ||||
|                             } | ||||
|                             else | ||||
|                             { | ||||
|                                 AddModuleMessage(Localizer["Success.Settings.SaveSite"], MessageType.Success); | ||||
|                             } | ||||
|                         } | ||||
|  | ||||
|                         await logger.LogInformation("Site Settings Saved {Site}", site); | ||||
|  | ||||
|                         if (refresh) | ||||
|                         { | ||||
|                             NavigationManager.NavigateTo(NavigateUrl()); // refresh to show new theme or container | ||||
|                         } | ||||
|                         else | ||||
|                         { | ||||
|                             AddModuleMessage(Localizer["Success.Settings.SaveSite"], MessageType.Success); | ||||
|                         } | ||||
|                     } | ||||
|                     else | ||||
|                     { | ||||
|                         AddModuleMessage(Localizer["Message.Aliases.Taken"], MessageType.Warning); | ||||
|                     } | ||||
|                 } | ||||
|                 else | ||||
|                 { | ||||
|                     AddModuleMessage(Localizer["Message.Aliases.Taken"], MessageType.Warning); | ||||
|                     AddModuleMessage(Localizer["Message.Required.SiteName"], MessageType.Warning); | ||||
|                 } | ||||
|             } | ||||
|             else | ||||
|             catch (Exception ex) | ||||
|             { | ||||
|                 AddModuleMessage(Localizer["Message.Required.SiteName"], MessageType.Warning); | ||||
|                 await logger.LogError(ex, "Error Saving Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message); | ||||
|                 AddModuleMessage(Localizer["Error.SaveSite"], MessageType.Error); | ||||
|             } | ||||
|         } | ||||
|         catch (Exception ex) | ||||
|         else | ||||
|         { | ||||
|             await logger.LogError(ex, "Error Saving Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message); | ||||
|             AddModuleMessage(Localizer["Error.SaveSite"], MessageType.Error); | ||||
|             AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|  | ||||
| @ -19,136 +19,140 @@ | ||||
| } | ||||
| else | ||||
| { | ||||
|     <div class="container"> | ||||
|         <div class="row mb-1 align-items-center"> | ||||
|             <Label Class="col-sm-3" For="name" HelpText="Enter the name of the site" ResourceKey="Name">Site Name: </Label> | ||||
|             <div class="col-sm-9"> | ||||
|                 <input id="name" class="form-control" @bind="@_name" /> | ||||
|             </div> | ||||
|         </div> | ||||
|         <div class="row mb-1 align-items-center"> | ||||
|             <Label Class="col-sm-3" For="alias" HelpText="Enter the aliases for the site. An alias can be a domain name (www.site.com) or a virtual folder (ie. www.site.com/folder). If a site has multiple aliases they can be separated by commas." ResourceKey="Aliases">Aliases: </Label> | ||||
|             <div class="col-sm-9"> | ||||
|                 <textarea id="alias" class="form-control" @bind="@_urls" rows="3"></textarea> | ||||
|             </div> | ||||
|         </div> | ||||
|         <div class="row mb-1 align-items-center"> | ||||
|             <Label Class="col-sm-3" For="defaultTheme" HelpText="Select the default theme for the website" ResourceKey="DefaultTheme">Default Theme: </Label> | ||||
|             <div class="col-sm-9"> | ||||
|                 <select id="defaultTheme" class="form-select" @onchange="(e => ThemeChanged(e))"> | ||||
|                     <option value="-"><@Localizer["Theme.Select"]></option> | ||||
|                     @foreach (var theme in _themes) | ||||
|                     { | ||||
|                         <option value="@theme.TypeName">@theme.Name</option> | ||||
|                     } | ||||
|                 </select> | ||||
|             </div> | ||||
|         </div> | ||||
|         <div class="row mb-1 align-items-center"> | ||||
|             <Label Class="col-sm-3" For="defaultContainer" HelpText="Select the default container for the site" ResourceKey="DefaultContainer">Default Container: </Label> | ||||
|             <div class="col-sm-9"> | ||||
|                 <select id="defaultContainer" class="form-select" @bind="@_containertype"> | ||||
|                     <option value="-"><@Localizer["Container.Select"]></option> | ||||
|                     @foreach (var container in _containers) | ||||
|                     { | ||||
|                         <option value="@container.TypeName">@container.Name</option> | ||||
|                     } | ||||
|                 </select> | ||||
|             </div> | ||||
|         </div> | ||||
|         <div class="row mb-1 align-items-center"> | ||||
|             <Label Class="col-sm-3" For="adminContainer" HelpText="Select the admin container for the site" ResourceKey="AdminContainer">Admin Container: </Label> | ||||
|             <div class="col-sm-9"> | ||||
|                 <select id="adminContainer" class="form-select" @bind="@_admincontainertype"> | ||||
|                     <option value="-"><@Localizer["Container.Select"]></option> | ||||
|                     <option value=""><@Localizer["DefaultContainer.Admin"]></option> | ||||
|                     @foreach (var container in _containers) | ||||
|                     { | ||||
|                         <option value="@container.TypeName">@container.Name</option> | ||||
|                     } | ||||
|                 </select> | ||||
|             </div> | ||||
|         </div> | ||||
|         <div class="row mb-1 align-items-center"> | ||||
|             <Label Class="col-sm-3" For="siteTemplate" HelpText="Select the site template" ResourceKey="SiteTemplate">Site Template: </Label> | ||||
|             <div class="col-sm-9"> | ||||
|                 <select id="siteTemplate" class="form-select" @bind="@_sitetemplatetype"> | ||||
|                     <option value="-"><@Localizer["SiteTemplate.Select"]></option> | ||||
|                     @foreach (SiteTemplate siteTemplate in _siteTemplates) | ||||
|                     { | ||||
|                         <option value="@siteTemplate.TypeName">@siteTemplate.Name</option> | ||||
|                     } | ||||
|                 </select> | ||||
|             </div> | ||||
|         </div> | ||||
|         <div class="row mb-1 align-items-center"> | ||||
|             <Label Class="col-sm-3" For="tenant" HelpText="Select the tenant for the site" ResourceKey="Tenant">Tenant: </Label> | ||||
|             <div class="col-sm-9"> | ||||
|                 <select id="tenant" class="form-select" @onchange="(e => TenantChanged(e))"> | ||||
|                     <option value="-"><@Localizer["Tenant.Select"]></option> | ||||
|                     <option value="+"><@Localizer["Tenant.Add"]></option> | ||||
|                     @foreach (Tenant tenant in _tenants) | ||||
|                     { | ||||
|                         <option value="@tenant.TenantId">@tenant.Name</option> | ||||
|                     } | ||||
|                 </select> | ||||
|             </div> | ||||
|         </div> | ||||
|         @if (_tenantid == "+") | ||||
|         { | ||||
|     <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate> | ||||
|         <div class="container"> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <hr class="app-rule" /> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="name" HelpText="Enter the name for the tenant" ResourceKey="TenantName">Tenant Name: </Label> | ||||
|                 <Label Class="col-sm-3" For="name" HelpText="Enter the name of the site" ResourceKey="Name">Site Name: </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <input id="name" class="form-control" @bind="@_tenantName" /> | ||||
|                     <input id="name" class="form-control" @bind="@_name" maxlength="256" required /> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="databaseType" HelpText="Select the database type for the tenant" ResourceKey="DatabaseType">Database Type: </Label> | ||||
|                 <Label Class="col-sm-3" For="alias" HelpText="Enter the aliases for the site. An alias can be a domain name (www.site.com) or a virtual folder (ie. www.site.com/folder). If a site has multiple aliases they can be separated by commas." ResourceKey="Aliases">Aliases: </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <select id="databaseType" class="form-select" value="@_databaseName" @onchange="(e => DatabaseChanged(e))"> | ||||
|                         @foreach (var database in _databases) | ||||
|                     <textarea id="alias" class="form-control" @bind="@_urls" rows="3" required></textarea> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="defaultTheme" HelpText="Select the default theme for the website" ResourceKey="DefaultTheme">Default Theme: </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <select id="defaultTheme" class="form-select" @onchange="(e => ThemeChanged(e))" required> | ||||
|                         <option value="-"><@Localizer["Theme.Select"]></option> | ||||
|                         @foreach (var theme in _themes) | ||||
|                         { | ||||
|                             if (database.IsDefault) | ||||
|                             { | ||||
|                                 <option value="@database.Name" selected>@Localizer[@database.Name]</option> | ||||
|                             } | ||||
|                             else | ||||
|                             { | ||||
|                                 <option value="@database.Name">@Localizer[@database.Name]</option> | ||||
|                             } | ||||
|                             <option value="@theme.TypeName">@theme.Name</option> | ||||
|                         } | ||||
|                     </select> | ||||
|                 </div> | ||||
|             </div> | ||||
|             if (_databaseConfigType != null) | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="defaultContainer" HelpText="Select the default container for the site" ResourceKey="DefaultContainer">Default Container: </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <select id="defaultContainer" class="form-select" @bind="@_containertype" required> | ||||
|                         <option value="-"><@Localizer["Container.Select"]></option> | ||||
|                         @foreach (var container in _containers) | ||||
|                         { | ||||
|                             <option value="@container.TypeName">@container.Name</option> | ||||
|                         } | ||||
|                     </select> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="adminContainer" HelpText="Select the admin container for the site" ResourceKey="AdminContainer">Admin Container: </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <select id="adminContainer" class="form-select" @bind="@_admincontainertype" required> | ||||
|                         <option value="-"><@Localizer["Container.Select"]></option> | ||||
|                         <option value=""><@Localizer["DefaultContainer.Admin"]></option> | ||||
|                         @foreach (var container in _containers) | ||||
|                         { | ||||
|                             <option value="@container.TypeName">@container.Name</option> | ||||
|                         } | ||||
|                     </select> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="siteTemplate" HelpText="Select the site template" ResourceKey="SiteTemplate">Site Template: </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <select id="siteTemplate" class="form-select" @bind="@_sitetemplatetype" required> | ||||
|                         <option value="-"><@Localizer["SiteTemplate.Select"]></option> | ||||
|                         @foreach (SiteTemplate siteTemplate in _siteTemplates) | ||||
|                         { | ||||
|                             <option value="@siteTemplate.TypeName">@siteTemplate.Name</option> | ||||
|                         } | ||||
|                     </select> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="tenant" HelpText="Select the tenant for the site" ResourceKey="Tenant">Tenant: </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <select id="tenant" class="form-select" @onchange="(e => TenantChanged(e))" required> | ||||
|                         <option value="-"><@Localizer["Tenant.Select"]></option> | ||||
|                         <option value="+"><@Localizer["Tenant.Add"]></option> | ||||
|                         @foreach (Tenant tenant in _tenants) | ||||
|                         { | ||||
|                             <option value="@tenant.TenantId">@tenant.Name</option> | ||||
|                         } | ||||
|                     </select> | ||||
|                 </div> | ||||
|             </div> | ||||
|             @if (_tenantid == "+") | ||||
|             { | ||||
|                 @DatabaseConfigComponent; | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <hr class="app-rule" /> | ||||
|                 </div> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="name" HelpText="Enter the name for the tenant" ResourceKey="TenantName">Tenant Name: </Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <input id="name" class="form-control" @bind="@_tenantName" maxlength="256" required /> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="databaseType" HelpText="Select the database type for the tenant" ResourceKey="DatabaseType">Database Type: </Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <select id="databaseType" class="form-select" value="@_databaseName" @onchange="(e => DatabaseChanged(e))" required> | ||||
|                             @foreach (var database in _databases) | ||||
|                             { | ||||
|                                 if (database.IsDefault) | ||||
|                                 { | ||||
|                                     <option value="@database.Name" selected>@Localizer[@database.Name]</option> | ||||
|                                 } | ||||
|                                 else | ||||
|                                 { | ||||
|                                     <option value="@database.Name">@Localizer[@database.Name]</option> | ||||
|                                 } | ||||
|                             } | ||||
|                         </select> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 if (_databaseConfigType != null) | ||||
|                 { | ||||
|                     @DatabaseConfigComponent; | ||||
|                 } | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="hostUsername" HelpText="Enter the username of the host for this site" ResourceKey="HostUsername">Host Username:</Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <input id="hostUsername" class="form-control" @bind="@_hostUserName" readonly /> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="hostPassword" HelpText="Enter the password for the host of this site" ResourceKey="HostPassword">Host Password:</Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <input id="hostPassword" type="password" class="form-control" @bind="@_hostpassword" maxlength="256" required /> | ||||
|                     </div> | ||||
|                 </div> | ||||
|             } | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="hostUsername" HelpText="Enter the username of the host for this site" ResourceKey="HostUsername">Host Username:</Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <input id="hostUsername" class="form-control" @bind="@_hostUserName" readonly /> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="hostPassword" HelpText="Enter the password for the host of this site" ResourceKey="HostPassword">Host Password:</Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <input id="hostPassword" type="password" class="form-control" @bind="@_hostpassword" /> | ||||
|                 </div> | ||||
|             </div> | ||||
|         } | ||||
|     </div> | ||||
|     <br /> | ||||
|     <br /> | ||||
|     <button type="button" class="btn btn-success" @onclick="SaveSite">@SharedLocalizer["Save"]</button> | ||||
|     <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink> | ||||
|         </div> | ||||
|         <br /> | ||||
|         <br /> | ||||
|         <button type="button" class="btn btn-success" @onclick="SaveSite">@SharedLocalizer["Save"]</button> | ||||
|         <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink> | ||||
|     </form> | ||||
| } | ||||
|  | ||||
| @code { | ||||
|     private List<Database> _databases; | ||||
|     private ElementReference form; | ||||
|     private bool validated = false; | ||||
|     private string _databaseName = "LocalDB"; | ||||
|     private Type _databaseConfigType; | ||||
|     private object _databaseConfig; | ||||
| @ -252,111 +256,120 @@ else | ||||
|  | ||||
|     private async Task SaveSite() | ||||
|     { | ||||
|         if (_tenantid != "-" && _name != string.Empty && _urls != string.Empty && _themetype != "-" && _containertype != "-" && _sitetemplatetype != "-") | ||||
|         validated = true; | ||||
|         var interop = new Interop(JSRuntime); | ||||
|         if (await interop.FormValid(form)) | ||||
|         { | ||||
|             var duplicates = new List<string>(); | ||||
|             var aliases = await AliasService.GetAliasesAsync(); | ||||
|             foreach (string name in _urls.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)) | ||||
|             if (_tenantid != "-" && _name != string.Empty && _urls != string.Empty && _themetype != "-" && _containertype != "-" && _sitetemplatetype != "-") | ||||
|             { | ||||
|                 if (aliases.Exists(item => item.Name == name)) | ||||
|                 var duplicates = new List<string>(); | ||||
|                 var aliases = await AliasService.GetAliasesAsync(); | ||||
|                 foreach (string name in _urls.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)) | ||||
|                 { | ||||
|                     duplicates.Add(name); | ||||
|                 } | ||||
|             } | ||||
|  | ||||
|             if (duplicates.Count == 0) | ||||
|             { | ||||
|                 InstallConfig config = new InstallConfig(); | ||||
|  | ||||
|                 if (_tenantid == "+") | ||||
|                 { | ||||
|                     if (!string.IsNullOrEmpty(_tenantName) && _tenants.FirstOrDefault(item => item.Name == _tenantName) == null) | ||||
|                     if (aliases.Exists(item => item.Name == name)) | ||||
|                     { | ||||
|                         // validate host credentials | ||||
|                         var user = new User(); | ||||
|                         user.SiteId = PageState.Site.SiteId; | ||||
|                         user.Username = UserNames.Host; | ||||
|                         user.Password = _hostpassword; | ||||
|                         user = await UserService.LoginUserAsync(user, false, false); | ||||
|                         if (user.IsAuthenticated) | ||||
|                         { | ||||
|                             var connectionString = String.Empty; | ||||
|                             if (_databaseConfig is IDatabaseConfigControl databaseConfigControl) | ||||
|                             { | ||||
|                                 connectionString = databaseConfigControl.GetConnectionString(); | ||||
|                             } | ||||
|                             var database = _databases.SingleOrDefault(d => d.Name == _databaseName); | ||||
|                         duplicates.Add(name); | ||||
|                     } | ||||
|                 } | ||||
|  | ||||
|                             if (connectionString != "") | ||||
|                 if (duplicates.Count == 0) | ||||
|                 { | ||||
|                     InstallConfig config = new InstallConfig(); | ||||
|  | ||||
|                     if (_tenantid == "+") | ||||
|                     { | ||||
|                         if (!string.IsNullOrEmpty(_tenantName) && _tenants.FirstOrDefault(item => item.Name == _tenantName) == null) | ||||
|                         { | ||||
|                             // validate host credentials | ||||
|                             var user = new User(); | ||||
|                             user.SiteId = PageState.Site.SiteId; | ||||
|                             user.Username = UserNames.Host; | ||||
|                             user.Password = _hostpassword; | ||||
|                             user = await UserService.LoginUserAsync(user, false, false); | ||||
|                             if (user.IsAuthenticated) | ||||
|                             { | ||||
|                                 config.TenantName = _tenantName; | ||||
|                                 config.DatabaseType = database.DBType; | ||||
|                                 config.ConnectionString = connectionString; | ||||
|                                 config.HostEmail = user.Email; | ||||
|                                 config.HostPassword = _hostpassword; | ||||
|                                 config.HostName = user.DisplayName; | ||||
|                                 config.IsNewTenant = true; | ||||
|                                 var connectionString = String.Empty; | ||||
|                                 if (_databaseConfig is IDatabaseConfigControl databaseConfigControl) | ||||
|                                 { | ||||
|                                     connectionString = databaseConfigControl.GetConnectionString(); | ||||
|                                 } | ||||
|                                 var database = _databases.SingleOrDefault(d => d.Name == _databaseName); | ||||
|  | ||||
|                                 if (connectionString != "") | ||||
|                                 { | ||||
|                                     config.TenantName = _tenantName; | ||||
|                                     config.DatabaseType = database.DBType; | ||||
|                                     config.ConnectionString = connectionString; | ||||
|                                     config.HostEmail = user.Email; | ||||
|                                     config.HostPassword = _hostpassword; | ||||
|                                     config.HostName = user.DisplayName; | ||||
|                                     config.IsNewTenant = true; | ||||
|                                 } | ||||
|                                 else | ||||
|                                 { | ||||
|                                     AddModuleMessage(Localizer["Error.Required.ServerDatabase"], MessageType.Error); | ||||
|                                 } | ||||
|                             } | ||||
|                             else | ||||
|                             { | ||||
|                                 AddModuleMessage(Localizer["Error.Required.ServerDatabase"], MessageType.Error); | ||||
|                                 AddModuleMessage(Localizer["Error.InvalidPassword"], MessageType.Error); | ||||
|                             } | ||||
|                         } | ||||
|                         else | ||||
|                         { | ||||
|                             AddModuleMessage(Localizer["Error.InvalidPassword"], MessageType.Error); | ||||
|                             AddModuleMessage(Localizer["Error.TenantName.Exists"], MessageType.Error); | ||||
|                         } | ||||
|                     } | ||||
|                     else | ||||
|                     { | ||||
|                         AddModuleMessage(Localizer["Error.TenantName.Exists"], MessageType.Error); | ||||
|                         var tenant = _tenants.FirstOrDefault(item => item.TenantId == int.Parse(_tenantid)); | ||||
|                         if (tenant != null) | ||||
|                         { | ||||
|                             config.TenantName = tenant.Name; | ||||
|                             config.DatabaseType = tenant.DBType; | ||||
|                             config.ConnectionString = tenant.DBConnectionString; | ||||
|                             config.IsNewTenant = false; | ||||
|                         } | ||||
|                     } | ||||
|  | ||||
|                     if (!string.IsNullOrEmpty(config.TenantName)) | ||||
|                     { | ||||
|                         config.SiteName = _name; | ||||
|                         config.Aliases = _urls; | ||||
|                         config.DefaultTheme = _themetype; | ||||
|                         config.DefaultContainer = _containertype; | ||||
|                         config.DefaultAdminContainer = _admincontainertype; | ||||
|                         config.SiteTemplate = _sitetemplatetype; | ||||
|  | ||||
|                         ShowProgressIndicator(); | ||||
|  | ||||
|                         var installation = await InstallationService.Install(config); | ||||
|                         if (installation.Success) | ||||
|                         { | ||||
|                             var aliasname = config.Aliases.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)[0]; | ||||
|                             var uri = new Uri(NavigationManager.Uri); | ||||
|                             NavigationManager.NavigateTo(uri.Scheme + "://" + aliasname, true); | ||||
|                         } | ||||
|                         else | ||||
|                         { | ||||
|                             await logger.LogError("Error Creating Site {Error}", installation.Message); | ||||
|                             AddModuleMessage(installation.Message, MessageType.Error); | ||||
|                         } | ||||
|                     } | ||||
|                 } | ||||
|                 else | ||||
|                 { | ||||
|                     var tenant = _tenants.FirstOrDefault(item => item.TenantId == int.Parse(_tenantid)); | ||||
|                     if (tenant != null) | ||||
|                     { | ||||
|                         config.TenantName = tenant.Name; | ||||
|                         config.DatabaseType = tenant.DBType; | ||||
|                         config.ConnectionString = tenant.DBConnectionString; | ||||
|                         config.IsNewTenant = false; | ||||
|                     } | ||||
|                 } | ||||
|  | ||||
|                 if (!string.IsNullOrEmpty(config.TenantName)) | ||||
|                 { | ||||
|                     config.SiteName = _name; | ||||
|                     config.Aliases = _urls; | ||||
|                     config.DefaultTheme = _themetype; | ||||
|                     config.DefaultContainer = _containertype; | ||||
|                     config.DefaultAdminContainer = _admincontainertype; | ||||
|                     config.SiteTemplate = _sitetemplatetype; | ||||
|  | ||||
|                     ShowProgressIndicator(); | ||||
|  | ||||
|                     var installation = await InstallationService.Install(config); | ||||
|                     if (installation.Success) | ||||
|                     { | ||||
|                         var aliasname = config.Aliases.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)[0]; | ||||
|                         var uri = new Uri(NavigationManager.Uri); | ||||
|                         NavigationManager.NavigateTo(uri.Scheme + "://" + aliasname, true); | ||||
|                     } | ||||
|                     else | ||||
|                     { | ||||
|                         await logger.LogError("Error Creating Site {Error}", installation.Message); | ||||
|                         AddModuleMessage(installation.Message, MessageType.Error); | ||||
|                     } | ||||
|                     AddModuleMessage(string.Format(Localizer["Message.SiteName.InUse"], string.Join(", ", duplicates.ToArray())), MessageType.Warning); | ||||
|                 } | ||||
|             } | ||||
|             else | ||||
|             { | ||||
|                 AddModuleMessage(string.Format(Localizer["Message.SiteName.InUse"], string.Join(", ", duplicates.ToArray())), MessageType.Warning); | ||||
|                 AddModuleMessage(Localizer["Message.Required.Tenant"], MessageType.Warning); | ||||
|             } | ||||
|         } | ||||
|         else | ||||
|         { | ||||
|             AddModuleMessage(Localizer["Message.Required.Tenant"], MessageType.Warning); | ||||
|             AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning); | ||||
|         } | ||||
|     } | ||||
| } | ||||
|  | ||||
| @ -5,126 +5,130 @@ | ||||
| @inject IStringLocalizer<Index> Localizer | ||||
| @inject IStringLocalizer<SharedResources> SharedLocalizer | ||||
|  | ||||
| <TabStrip> | ||||
|     <TabPanel Name="Info" Heading="Info" ResourceKey="Info"> | ||||
|         <div class="container"> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="version" HelpText="Framework Version" ResourceKey="FrameworkVersion">Framework Version: </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <input id="version" class="form-control" @bind="@_version" readonly /> | ||||
| <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate> | ||||
|     <TabStrip> | ||||
|         <TabPanel Name="Info" Heading="Info" ResourceKey="Info"> | ||||
|             <div class="container"> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="version" HelpText="Framework Version" ResourceKey="FrameworkVersion">Framework Version: </Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <input id="version" class="form-control" @bind="@_version" readonly /> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="clrversion" HelpText="Common Language Runtime Version" ResourceKey="CLRVersion">CLR Version: </Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <input id="clrversion" class="form-control" @bind="@_clrversion" readonly /> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="osversion" HelpText="Operating System Version" ResourceKey="OSVersion">OS Version: </Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <input id="osversion" class="form-control" @bind="@_osversion" readonly /> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="serverpath" HelpText="Server Path" ResourceKey="ServerPath">Server Path: </Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <input id="serverpath" class="form-control" @bind="@_serverpath" readonly /> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="servertime" HelpText="Server Time" ResourceKey="ServerTime">Server Time: </Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <input id="servertime" class="form-control" @bind="@_servertime" readonly /> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="installationid" HelpText="The Unique Identifier For Your Installation" ResourceKey="InstallationId">Installation ID: </Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <input id="installationid" class="form-control" @bind="@_installationid" readonly /> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <div class="col-sm-3"></div> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <br /><input type="checkbox" @onchange="(e => RegisterChecked(e))" /> @Localizer["Register"] | ||||
|                     </div> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="clrversion" HelpText="Common Language Runtime Version" ResourceKey="CLRVersion">CLR Version: </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <input id="clrversion" class="form-control" @bind="@_clrversion" readonly /> | ||||
|             <br /><br /> | ||||
|             <ActionDialog Header="Restart Application" Message="Are You Sure You Wish To Restart The Application?" Action="Restart Application" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await RestartApplication())" ResourceKey="RestartApplication" /> | ||||
|         </TabPanel> | ||||
|         <TabPanel Name="Options" Heading="Options" ResourceKey="Options"> | ||||
|             <div class="container"> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="runtime" HelpText="Blazor Runtime (Server or WebAssembly)" ResourceKey="BlazorRuntime">Blazor Runtime: </Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <select id="runtime" class="form-select" @bind="@_runtime" required> | ||||
|                             <option value="Server">@Localizer["Server"]</option> | ||||
|                             <option value="WebAssembly">@Localizer["WebAssembly"]</option> | ||||
|                         </select> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="rendermode" HelpText="Blazor Server Render Mode" ResourceKey="RenderMode">Render Mode: </Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <select id="rendermode" class="form-select" @bind="@_rendermode" required> | ||||
|                             <option value="Server">@Localizer["Server"]</option> | ||||
|                             <option value="ServerPrerendered">@Localizer["ServerPrerendered"]</option> | ||||
|                         </select> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="detailederrors" HelpText="Specify If Detailed Errors Are Enabled For Blazor. This Option Should Not Not Be Enabled In Production." ResourceKey="DetailedErrors">Detailed Errors? </Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <select id="detailederrors" class="form-select" @bind="@_detailederrors" required> | ||||
|                             <option value="true">@SharedLocalizer["True"]</option> | ||||
|                             <option value="false">@SharedLocalizer["False"]</option> | ||||
|                         </select> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="logginglevel" HelpText="The Minimum Logging Level For The Event Log. This Option Can Be Used To Control The Volume Of Items Stored In Your Event Log." ResourceKey="LoggingLevel">Logging Level: </Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <select id="logginglevel" class="form-select" @bind="@_logginglevel" required> | ||||
|                             <option value="Trace">@Localizer["Trace"]</option> | ||||
|                             <option value="Debug">@Localizer["Debug"]</option> | ||||
|                             <option value="Information">@Localizer["Information"]</option> | ||||
|                             <option value="Warning">@Localizer["Warning"]</option> | ||||
|                             <option value="Error">@Localizer["Error"]</option> | ||||
|                             <option value="Critical">@Localizer["Critical"]</option> | ||||
|                         </select> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="swagger" HelpText="Specify If Swagger Is Enabled For Your Server API" ResourceKey="Swagger">Swagger Enabled? </Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <select id="swagger" class="form-select" @bind="@_swagger" required> | ||||
|                             <option value="true">@SharedLocalizer["True"]</option> | ||||
|                             <option value="false">@SharedLocalizer["False"]</option> | ||||
|                         </select> | ||||
|                     </div> | ||||
|                 </div> | ||||
|                 <div class="row mb-1 align-items-center"> | ||||
|                     <Label Class="col-sm-3" For="packageservice" HelpText="Specify If The Package Service Is Enabled For Installing Modules, Themes, And Translations" ResourceKey="PackageService">Enable Package Service? </Label> | ||||
|                     <div class="col-sm-9"> | ||||
|                         <select id="packageservice" class="form-select" @bind="@_packageservice" required> | ||||
|                             <option value="true">@SharedLocalizer["True"]</option> | ||||
|                             <option value="false">@SharedLocalizer["False"]</option> | ||||
|                         </select> | ||||
|                     </div> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="osversion" HelpText="Operating System Version" ResourceKey="OSVersion">OS Version: </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <input id="osversion" class="form-control" @bind="@_osversion" readonly /> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="serverpath" HelpText="Server Path" ResourceKey="ServerPath">Server Path: </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <input id="serverpath" class="form-control" @bind="@_serverpath" readonly /> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="servertime" HelpText="Server Time" ResourceKey="ServerTime">Server Time: </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <input id="servertime" class="form-control" @bind="@_servertime" readonly /> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="installationid" HelpText="The Unique Identifier For Your Installation" ResourceKey="InstallationId">Installation ID: </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <input id="installationid" class="form-control" @bind="@_installationid" readonly /> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <div class="col-sm-3"></div> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <br /><input type="checkbox" @onchange="(e => RegisterChecked(e))" /> @Localizer["Register"] | ||||
|                 </div> | ||||
|             </div> | ||||
|         </div> | ||||
|         <br /><br /> | ||||
|         <ActionDialog Header="Restart Application" Message="Are You Sure You Wish To Restart The Application?" Action="Restart Application" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await RestartApplication())" ResourceKey="RestartApplication" /> | ||||
|     </TabPanel> | ||||
|     <TabPanel Name="Options" Heading="Options" ResourceKey="Options"> | ||||
|         <div class="container"> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="runtime" HelpText="Blazor Runtime (Server or WebAssembly)" ResourceKey="BlazorRuntime">Blazor Runtime: </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <select id="runtime" class="form-select" @bind="@_runtime"> | ||||
|                         <option value="Server">@Localizer["Server"]</option> | ||||
|                         <option value="WebAssembly">@Localizer["WebAssembly"]</option> | ||||
|                     </select> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="rendermode" HelpText="Blazor Server Render Mode" ResourceKey="RenderMode">Render Mode: </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <select id="rendermode" class="form-select" @bind="@_rendermode"> | ||||
|                         <option value="Server">@Localizer["Server"]</option> | ||||
|                         <option value="ServerPrerendered">@Localizer["ServerPrerendered"]</option> | ||||
|                     </select> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="detailederrors" HelpText="Specify If Detailed Errors Are Enabled For Blazor. This Option Should Not Not Be Enabled In Production." ResourceKey="DetailedErrors">Detailed Errors? </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <select id="detailederrors" class="form-select" @bind="@_detailederrors"> | ||||
|                         <option value="true">@SharedLocalizer["True"]</option> | ||||
|                         <option value="false">@SharedLocalizer["False"]</option> | ||||
|                     </select> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="logginglevel" HelpText="The Minimum Logging Level For The Event Log. This Option Can Be Used To Control The Volume Of Items Stored In Your Event Log." ResourceKey="LoggingLevel">Logging Level: </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <select id="logginglevel" class="form-select" @bind="@_logginglevel"> | ||||
|                         <option value="Trace">@Localizer["Trace"]</option> | ||||
|                         <option value="Debug">@Localizer["Debug"]</option> | ||||
|                         <option value="Information">@Localizer["Information"]</option> | ||||
|                         <option value="Warning">@Localizer["Warning"]</option> | ||||
|                         <option value="Error">@Localizer["Error"]</option> | ||||
|                         <option value="Critical">@Localizer["Critical"]</option> | ||||
|                     </select> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="swagger" HelpText="Specify If Swagger Is Enabled For Your Server API" ResourceKey="Swagger">Swagger Enabled? </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <select id="swagger" class="form-select" @bind="@_swagger"> | ||||
|                         <option value="true">@SharedLocalizer["True"]</option> | ||||
|                         <option value="false">@SharedLocalizer["False"]</option> | ||||
|                     </select> | ||||
|                 </div> | ||||
|             </div> | ||||
|             <div class="row mb-1 align-items-center"> | ||||
|                 <Label Class="col-sm-3" For="packageservice" HelpText="Specify If The Package Service Is Enabled For Installing Modules, Themes, And Translations" ResourceKey="PackageService">Enable Package Service? </Label> | ||||
|                 <div class="col-sm-9"> | ||||
|                     <select id="packageservice" class="form-select" @bind="@_packageservice"> | ||||
|                         <option value="true">@SharedLocalizer["True"]</option> | ||||
|                         <option value="false">@SharedLocalizer["False"]</option> | ||||
|                     </select> | ||||
|                 </div> | ||||
|             </div> | ||||
|         </div> | ||||
|         <br /><br /> | ||||
|         <button type="button" class="btn btn-success" @onclick="SaveConfig">@SharedLocalizer["Save"]</button>  | ||||
|         <a class="btn btn-primary" href="swagger/index.html" target="_new">@Localizer["Access.ApiFramework"]</a>  | ||||
|         <ActionDialog Header="Restart Application" Message="Are You Sure You Wish To Restart The Application?" Action="Restart Application" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await RestartApplication())" ResourceKey="RestartApplication" /> | ||||
|     </TabPanel> | ||||
| </TabStrip> | ||||
|             <br /><br /> | ||||
|             <button type="button" class="btn btn-success" @onclick="SaveConfig">@SharedLocalizer["Save"]</button>  | ||||
|             <a class="btn btn-primary" href="swagger/index.html" target="_new">@Localizer["Access.ApiFramework"]</a>  | ||||
|             <ActionDialog Header="Restart Application" Message="Are You Sure You Wish To Restart The Application?" Action="Restart Application" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await RestartApplication())" ResourceKey="RestartApplication" /> | ||||
|         </TabPanel> | ||||
|     </TabStrip> | ||||
| </form> | ||||
|  | ||||
| @code { | ||||
|     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; | ||||
|  | ||||
|     private ElementReference form; | ||||
|     private bool validated = false; | ||||
|     private string _version = string.Empty; | ||||
|     private string _clrversion = string.Empty; | ||||
|     private string _osversion = string.Empty; | ||||
| @ -163,22 +167,31 @@ | ||||
|  | ||||
|     private async Task SaveConfig() | ||||
|     { | ||||
|         try | ||||
|         validated = true; | ||||
|         var interop = new Interop(JSRuntime); | ||||
|         if (await interop.FormValid(form)) | ||||
|         { | ||||
|             var settings = new Dictionary<string, string>(); | ||||
|             settings.Add("runtime", _runtime); | ||||
|             settings.Add("rendermode", _rendermode); | ||||
|             settings.Add("detailederrors", _detailederrors); | ||||
|             settings.Add("logginglevel", _logginglevel); | ||||
|             settings.Add("swagger", _swagger); | ||||
|             settings.Add("packageservice", _packageservice); | ||||
|             await SystemService.UpdateSystemInfoAsync(settings); | ||||
|             AddModuleMessage(Localizer["Success.UpdateConfig.Restart"], MessageType.Success); | ||||
|             try | ||||
|             { | ||||
|                 var settings = new Dictionary<string, string>(); | ||||
|                 settings.Add("runtime", _runtime); | ||||
|                 settings.Add("rendermode", _rendermode); | ||||
|                 settings.Add("detailederrors", _detailederrors); | ||||
|                 settings.Add("logginglevel", _logginglevel); | ||||
|                 settings.Add("swagger", _swagger); | ||||
|                 settings.Add("packageservice", _packageservice); | ||||
|                 await SystemService.UpdateSystemInfoAsync(settings); | ||||
|                 AddModuleMessage(Localizer["Success.UpdateConfig.Restart"], MessageType.Success); | ||||
|             } | ||||
|             catch (Exception ex) | ||||
|             { | ||||
|                 await logger.LogError(ex, "Error Saving Configuration"); | ||||
|                 AddModuleMessage(Localizer["Error.UpdateConfig"], MessageType.Error); | ||||
|             } | ||||
|         } | ||||
|         catch (Exception ex) | ||||
|         else | ||||
|         { | ||||
|             await logger.LogError(ex, "Error Saving Configuration"); | ||||
|             AddModuleMessage(Localizer["Error.UpdateConfig"], MessageType.Error); | ||||
|             AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning); | ||||
|         } | ||||
|     } | ||||
|  | ||||
| @ -212,4 +225,4 @@ | ||||
|             await logger.LogError(ex, "Error On Register"); | ||||
|         } | ||||
|     } | ||||
| } | ||||
| } | ||||
|  | ||||
		Reference in New Issue
	
	Block a user
	 Grayson Walker
					Grayson Walker