mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2025-01-19 05:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix remove and enable issues with non-last-admin

Browse Source 
"Remove" issue likely due to multiple context instances. "Enable" issue due to conditional check.

Discovered bug with users when first disabling, then marking as admin, which remains an issue.
This commit is contained in:
rustywave 2022-06-03 22:10:08 -07:00 committed by Andrew Camilleri
parent f2aa4d4484
commit a443426d83
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BTCPayServer/Services/UserService.cs
View File

@ -109,6 +109,7 @@ namespace BTCPayServer.Services
await Task.WhenAll(files.Select(file => _fileService.RemoveFile(file.Id, userId))); await Task.WhenAll(files.Select(file => _fileService.RemoveFile(file.Id, userId)));
user = await _userManager.FindByIdAsync(userId);
await _userManager.DeleteAsync(user); await _userManager.DeleteAsync(user);
await _storeRepository.CleanUnreachableStores(); await _storeRepository.CleanUnreachableStores();
} }
@ -127,7 +128,12 @@ namespace BTCPayServer.Services
return false; return false;
} }
return (await _userManager.GetUsersInRoleAsync(Roles.ServerAdmin)).Count(applicationUser => !IsDisabled(applicationUser)) == 1; var adminUsers = await _userManager.GetUsersInRoleAsync(Roles.ServerAdmin);
var enabledAdminUsers = adminUsers
.Where(applicationUser => !IsDisabled(applicationUser))
.Select(applicationUser => applicationUser.Id).ToList();
return enabledAdminUsers.Count == 1 && enabledAdminUsers.Contains(user.Id);
} }
} }
} }