kshkulev/hcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant roles check

Browse Source
This commit is contained in:
HOME-LAPTOP\kshkulev
2025-11-05 09:05:25 +09:00
parent a063ef40a5
commit 35c4bb37ce
2 changed files with 86 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
Hcs.WebApp/Components/Dialogs/AddUser.razor
View File

@ -1,63 +1,56 @@
@using Hcs.WebApp.Services @using Hcs.WebApp.Services
@using Microsoft.AspNetCore.Authorization
@using Microsoft.AspNetCore.Identity @using Microsoft.AspNetCore.Identity
@using Microsoft.EntityFrameworkCore @using Microsoft.EntityFrameworkCore
@attribute [Authorize]
@inject RoleManager<AppRole> RoleManager @inject RoleManager<AppRole> RoleManager
@inject UsersService UsersService @inject UsersService UsersService
@inject DialogService DialogService @inject DialogService DialogService
<AuthorizedContent Roles="@AppRole.ADMINISTRATOR_TYPE"> <RadzenTemplateForm TItem="InputModel" Data=@Input Submit="@DoAddUserAsync">
<Content> <RadzenAlert Visible="@hasError" AlertStyle="AlertStyle.Danger" Variant="Variant.Flat" Shade="Shade.Lighter" AllowClose="false">
<RadzenTemplateForm TItem="InputModel" Data=@Input Submit="@DoAddUserAsync"> @errorMessage
<RadzenAlert Visible="@hasError" AlertStyle="AlertStyle.Danger" Variant="Variant.Flat" Shade="Shade.Lighter" AllowClose="false"> </RadzenAlert>
@errorMessage <RadzenStack Gap="1rem" class="rz-p-sm-4">
</RadzenAlert> <RadzenFormField Text="Логин" Variant="Variant.Outlined">
<RadzenStack Gap="1rem" class="rz-p-sm-4"> <ChildContent>
<RadzenFormField Text="Логин" Variant="Variant.Outlined"> <RadzenTextBox Name="UserName" @bind-Value=@Input.UserName AutoCompleteType="AutoCompleteType.Username" />
<ChildContent> </ChildContent>
<RadzenTextBox Name="UserName" @bind-Value=@Input.UserName AutoCompleteType="AutoCompleteType.Username" /> <Helper>
</ChildContent> <RadzenRequiredValidator Component="UserName" Text="Поле 'Логин' обязательно к заполнению" />
<Helper> <RadzenLengthValidator Component="UserName" Min="5" Text="Длина поля 'Логин' должна быть не меньше 5" />
<RadzenRequiredValidator Component="UserName" Text="Поле 'Логин' обязательно к заполнению" /> <RadzenLengthValidator Component="UserName" Max="30" Text="Длина поля 'Логин' должна быть не больше 30" />
<RadzenLengthValidator Component="UserName" Min="5" Text="Длина поля 'Логин' должна быть не меньше 5" /> </Helper>
<RadzenLengthValidator Component="UserName" Max="30" Text="Длина поля 'Логин' должна быть не больше 30" /> </RadzenFormField>
</Helper> <RadzenFormField Text="Роль" Variant="Variant.Outlined">
</RadzenFormField> <ChildContent>
<RadzenFormField Text="Роль" Variant="Variant.Outlined"> <RadzenDropDown Data="@roles" TextProperty="Name" @bind-Value="@Input.Role" Name="Role" style="width: 100%" />
<ChildContent> </ChildContent>
<RadzenDropDown Data="@roles" TextProperty="Name" @bind-Value="@Input.Role" Name="Role" style="width: 100%" /> </RadzenFormField>
</ChildContent> <RadzenFormField Text="Пароль" Variant="Variant.Outlined">
</RadzenFormField> <ChildContent>
<RadzenFormField Text="Пароль" Variant="Variant.Outlined"> <RadzenPassword Name="Password" @bind-Value=@Input.Password AutoCompleteType="AutoCompleteType.NewPassword" />
<ChildContent> </ChildContent>
<RadzenPassword Name="Password" @bind-Value=@Input.Password AutoCompleteType="AutoCompleteType.NewPassword" /> <Helper>
</ChildContent> <RadzenRequiredValidator Component="Password" Text="Поле 'Пароль' обязательно к заполнению" />
<Helper> <RadzenLengthValidator Component="Password" Min="6" Text="Длина поля 'Пароль' должна быть не меньше 6" />
<RadzenRequiredValidator Component="Password" Text="Поле 'Пароль' обязательно к заполнению" /> <RadzenLengthValidator Component="Password" Max="100" Text="Длина поля 'Пароль' должна быть не больше 100" />
<RadzenLengthValidator Component="Password" Min="6" Text="Длина поля 'Пароль' должна быть не меньше 6" /> </Helper>
<RadzenLengthValidator Component="Password" Max="100" Text="Длина поля 'Пароль' должна быть не больше 100" /> </RadzenFormField>
</Helper> <RadzenFormField Text="Повторите пароль" Variant="Variant.Outlined">
</RadzenFormField> <ChildContent>
<RadzenFormField Text="Повторите пароль" Variant="Variant.Outlined"> <RadzenPassword Name="ConfirmPassword" @bind-Value=@Input.ConfirmPassword AutoCompleteType="AutoCompleteType.NewPassword" />
<ChildContent> </ChildContent>
<RadzenPassword Name="ConfirmPassword" @bind-Value=@Input.ConfirmPassword AutoCompleteType="AutoCompleteType.NewPassword" /> <Helper>
</ChildContent> <RadzenRequiredValidator Component="ConfirmPassword" Text="Поле 'Повторите пароль' обязательно к заполнению" />
<Helper> <RadzenCompareValidator Value=@Input.Password Component="ConfirmPassword" Text="Пароли должны совпадать" />
<RadzenRequiredValidator Component="ConfirmPassword" Text="Поле 'Повторите пароль' обязательно к заполнению" /> </Helper>
<RadzenCompareValidator Value=@Input.Password Component="ConfirmPassword" Text="Пароли должны совпадать" /> </RadzenFormField>
</Helper> <RadzenStack Orientation="Orientation.Horizontal" AlignItems="AlignItems.Center" JustifyContent="JustifyContent.End" Gap="0.5rem">
</RadzenFormField> <RadzenButton ButtonType="ButtonType.Submit" Disabled="@inProgress" Text="Создать"></RadzenButton>
<RadzenStack Orientation="Orientation.Horizontal" AlignItems="AlignItems.Center" JustifyContent="JustifyContent.End" Gap="0.5rem"> <RadzenButton Click="@DoClose" ButtonStyle="ButtonStyle.Light" Disabled="@inProgress" Text="Отмена"></RadzenButton>
<RadzenButton ButtonType="ButtonType.Submit" Disabled="@inProgress" Text="Создать"></RadzenButton> </RadzenStack>
<RadzenButton Click="@DoClose" ButtonStyle="ButtonStyle.Light" Disabled="@inProgress" Text="Отмена"></RadzenButton> </RadzenStack>
</RadzenStack> </RadzenTemplateForm>
</RadzenStack>
</RadzenTemplateForm>
</Content>
</AuthorizedContent>
@code { @code {
sealed class InputModel sealed class InputModel

89
Hcs.WebApp/Components/Dialogs/EditUser.razor
View File

@ -1,60 +1,53 @@
@using Hcs.WebApp.Services @using Hcs.WebApp.Services
@using Microsoft.AspNetCore.Authorization
@using Microsoft.AspNetCore.Identity @using Microsoft.AspNetCore.Identity
@using Microsoft.EntityFrameworkCore @using Microsoft.EntityFrameworkCore
@attribute [Authorize]
@inject UserManager<AppUser> UserManager; @inject UserManager<AppUser> UserManager;
@inject RoleManager<AppRole> RoleManager @inject RoleManager<AppRole> RoleManager
@inject UsersService UsersService @inject UsersService UsersService
@inject DialogService DialogService @inject DialogService DialogService
<AuthorizedContent Roles="@AppRole.ADMINISTRATOR_TYPE"> <RadzenTemplateForm TItem="InputModel" Data=@Input Submit="@DoEditUserAsync">
<Content> <RadzenAlert Visible="@hasError" AlertStyle="AlertStyle.Danger" Variant="Variant.Flat" Shade="Shade.Lighter" AllowClose="false">
<RadzenTemplateForm TItem="InputModel" Data=@Input Submit="@DoEditUserAsync"> @errorMessage
<RadzenAlert Visible="@hasError" AlertStyle="AlertStyle.Danger" Variant="Variant.Flat" Shade="Shade.Lighter" AllowClose="false"> </RadzenAlert>
@errorMessage <RadzenStack Gap="1rem" class="rz-p-sm-4">
</RadzenAlert> <RadzenFormField Text="Логин" Variant="Variant.Outlined">
<RadzenStack Gap="1rem" class="rz-p-sm-4"> <ChildContent>
<RadzenFormField Text="Логин" Variant="Variant.Outlined"> <RadzenTextBox Name="UserName" @bind-Value=@Input.UserName Disabled="true" />
<ChildContent> </ChildContent>
<RadzenTextBox Name="UserName" @bind-Value=@Input.UserName Disabled="true" /> </RadzenFormField>
</ChildContent> <RadzenFormField Text="Роль" Variant="Variant.Outlined">
</RadzenFormField> <ChildContent>
<RadzenFormField Text="Роль" Variant="Variant.Outlined"> <RadzenDropDown Data="@roles" TextProperty="Name" ValueProperty="Id" @bind-Value="@Input.RoleId" Disabled="@Input.RoleDisabled" Name="Role" style="width: 100%" />
<ChildContent> </ChildContent>
<RadzenDropDown Data="@roles" TextProperty="Name" ValueProperty="Id" @bind-Value="@Input.RoleId" Disabled="@Input.RoleDisabled" Name="Role" style="width: 100%" /> </RadzenFormField>
</ChildContent> <RadzenFormField Text="Новый пароль" Variant="Variant.Outlined">
</RadzenFormField> <ChildContent>
<RadzenFormField Text="Новый пароль" Variant="Variant.Outlined"> <RadzenPassword Name="Password" @bind-Value=@Input.Password AutoCompleteType="AutoCompleteType.NewPassword" />
<ChildContent> </ChildContent>
<RadzenPassword Name="Password" @bind-Value=@Input.Password AutoCompleteType="AutoCompleteType.NewPassword" /> <Helper>
</ChildContent> @if (!string.IsNullOrEmpty(Input.Password))
<Helper> {
@if (!string.IsNullOrEmpty(Input.Password)) <RadzenLengthValidator Component="Password" Min="6" Text="Длина поля 'Новый пароль' должна быть не меньше 6" />
{ <RadzenLengthValidator Component="Password" Max="100" Text="Длина поля 'Новый пароль' должна быть не больше 100" />
<RadzenLengthValidator Component="Password" Min="6" Text="Длина поля 'Новый пароль' должна быть не меньше 6" /> }
<RadzenLengthValidator Component="Password" Max="100" Text="Длина поля 'Новый пароль' должна быть не больше 100" /> </Helper>
} </RadzenFormField>
</Helper> <RadzenFormField Text="Повторите новый пароль" Variant="Variant.Outlined">
</RadzenFormField> <ChildContent>
<RadzenFormField Text="Повторите новый пароль" Variant="Variant.Outlined"> <RadzenPassword Name="ConfirmPassword" @bind-Value=@Input.ConfirmPassword AutoCompleteType="AutoCompleteType.NewPassword" />
<ChildContent> </ChildContent>
<RadzenPassword Name="ConfirmPassword" @bind-Value=@Input.ConfirmPassword AutoCompleteType="AutoCompleteType.NewPassword" /> <Helper>
</ChildContent> <RadzenCompareValidator Value=@Input.Password Component="ConfirmPassword" Text="Пароли должны совпадать" />
<Helper> </Helper>
<RadzenCompareValidator Value=@Input.Password Component="ConfirmPassword" Text="Пароли должны совпадать" /> </RadzenFormField>
</Helper> <RadzenStack Orientation="Orientation.Horizontal" AlignItems="AlignItems.Center" JustifyContent="JustifyContent.End" Gap="0.5rem">
</RadzenFormField> <RadzenButton ButtonType="ButtonType.Submit" Disabled="@inProgress" Text="Сохранить"></RadzenButton>
<RadzenStack Orientation="Orientation.Horizontal" AlignItems="AlignItems.Center" JustifyContent="JustifyContent.End" Gap="0.5rem"> <RadzenButton Click="@DoClose" ButtonStyle="ButtonStyle.Light" Disabled="@inProgress" Text="Отмена"></RadzenButton>
<RadzenButton ButtonType="ButtonType.Submit" Disabled="@inProgress" Text="Сохранить"></RadzenButton> </RadzenStack>
<RadzenButton Click="@DoClose" ButtonStyle="ButtonStyle.Light" Disabled="@inProgress" Text="Отмена"></RadzenButton> </RadzenStack>
</RadzenStack> </RadzenTemplateForm>
</RadzenStack>
</RadzenTemplateForm>
</Content>
</AuthorizedContent>
@code { @code {
sealed class InputModel sealed class InputModel