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

fix

Browse Source
This commit is contained in:
pavelbannov 2023-05-24 17:39:00 +03:00
parent 15b2384f05
commit 76db809e3b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/ASC.Core.Common/Context/Impl/UserManager.cs
View File

@ -175,7 +175,7 @@ public class UserManager
users = users.WhereAwait(async u => await this.IsUserAsync(u));
break;
}
return await users.ToArrayAsync();
}
@ -196,7 +196,7 @@ public class UserManager
return _userService.GetUsers(Tenant.Id, isDocSpaceAdmin, employeeStatus, includeGroups, excludeGroups, activationStatus, text, sortBy, sortOrderAsc, limit, offset, out total, out count);
}
public async Task<string[]> GetUserNamesAsyncAsync(EmployeeStatus status)
public async Task<string[]> GetUserNamesAsync(EmployeeStatus status)
{
return (await GetUsersAsync(status))
.Select(u => u.UserName)
@ -224,7 +224,7 @@ public class UserManager
}
public async Task<bool> IsUserNameExistsAsync(string username)
{
return (await GetUserNamesAsyncAsync(EmployeeStatus.All))
return (await GetUserNamesAsync(EmployeeStatus.All))
.Contains(username, StringComparer.CurrentCultureIgnoreCase);
}
@ -278,7 +278,7 @@ public class UserManager
public bool UserExists(Guid id)
{
return UserExists (GetUsers(id));
return UserExists(GetUsers(id));
}
public bool UserExists(UserInfo user)
@ -392,7 +392,7 @@ public class UserManager
var oldUserData = await _userService.GetUserByUserName(await _tenantManager.GetCurrentTenantIdAsync(), u.UserName);
var newUser = await UpdateUserInfoAsync(u);
if (_coreBaseSettings.DisableDocSpace)
{
await SyncCardDavAsync(u, oldUserData, newUser);

2
web/ASC.Web.Api/Api/PortalController.cs
View File

@ -204,7 +204,7 @@ public class PortalController : ControllerBase
[HttpGet("userscount")]
public async Task<long> GetUsersCountAsync()
{
return _coreBaseSettings.Personal ? 1 : (await _userManager.GetUserNamesAsyncAsync(EmployeeStatus.Active)).Length;
return _coreBaseSettings.Personal ? 1 : (await _userManager.GetUserNamesAsync(EmployeeStatus.Active)).Length;
}
[AllowNotPayment]