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

Merge pull request #1747 from ONLYOFFICE/bugfix/bug-64157

Browse Source 
fix Bug 64157
This commit is contained in:
Alexey Bannov 2023-09-15 15:49:20 +03:00 committed by GitHub
commit c221dd6a63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -331,14 +331,22 @@ public class UserManager
return findUsers.ToArray(); return findUsers.ToArray();
} }
public async Task<UserInfo> UpdateUserInfo(UserInfo u) public async Task<UserInfo> UpdateUserInfo(UserInfo u, bool afterInvite = false)
{ {
if (IsSystemUser(u.Id)) if (IsSystemUser(u.Id))
{ {
return SystemUsers[u.Id]; return SystemUsers[u.Id];
} }
_permissionContext.DemandPermissions(new UserSecurityProvider(u.Id), Constants.Action_EditUser); if (afterInvite)
{
_permissionContext.DemandPermissions(new UserSecurityProvider(u.Id, this.GetUserType(u.Id)), Constants.Action_AddRemoveUser);
}
else
{
_permissionContext.DemandPermissions(new UserSecurityProvider(u.Id), Constants.Action_EditUser);
}
if (u.Status == EmployeeStatus.Terminated && u.Id == _tenantManager.GetCurrentTenant().OwnerId) if (u.Status == EmployeeStatus.Terminated && u.Id == _tenantManager.GetCurrentTenant().OwnerId)
{ {

2
web/ASC.Web.Core/Users/UserManagerWrapper.cs
View File

@ -193,7 +193,7 @@ public sealed class UserManagerWrapper
UserInfo newUserInfo; UserInfo newUserInfo;
if (updateExising) if (updateExising)
{ {
newUserInfo = await _userManager.UpdateUserInfo(userInfo); newUserInfo = await _userManager.UpdateUserInfo(userInfo, true);
} }
else else
{ {