IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/rtl-interface-direction

Browse Source
This commit is contained in:
Aleksandr Lushkin 2023-07-12 10:12:27 +02:00
commit f630cf0593
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/ASC.Api.Core/Model/EmployeeFullDto.cs
View File

@ -47,6 +47,7 @@ public class EmployeeFullDto : EmployeeDto
public string AvatarMedium { get; set; }
public string Avatar { get; set; }
public bool IsAdmin { get; set; }
public bool IsRoomAdmin { get; set; }
public bool IsLDAP { get; set; }
public List<string> ListAdminModules { get; set; }
public bool IsOwner { get; set; }
@ -182,6 +183,8 @@ public class EmployeeFullDtoHelper : EmployeeDtoHelper
public async Task<EmployeeFullDto> GetFullAsync(UserInfo userInfo)
{
var currentType = await _userManager.GetUserTypeAsync(userInfo.Id);
var result = new EmployeeFullDto
{
UserName = userInfo.UserName,
@ -194,9 +197,10 @@ public class EmployeeFullDtoHelper : EmployeeDtoHelper
WorkFrom = _apiDateTimeHelper.Get(userInfo.WorkFromDate),
Email = userInfo.Email,
IsVisitor = await _userManager.IsUserAsync(userInfo),
IsAdmin = await _userManager.IsDocSpaceAdminAsync(userInfo),
IsAdmin = currentType is EmployeeType.DocSpaceAdmin,
IsRoomAdmin = currentType is EmployeeType.RoomAdmin,
IsOwner = userInfo.IsOwner(_context.Tenant),
IsCollaborator = await _userManager.IsCollaboratorAsync(userInfo),
IsCollaborator = currentType is EmployeeType.Collaborator,
IsLDAP = userInfo.IsLDAP(),
IsSSO = userInfo.IsSSO()
};