diff --git a/RoleManagement/Program.cs b/RoleManagement/Program.cs index a46f4a6..3c9e9c3 100644 --- a/RoleManagement/Program.cs +++ b/RoleManagement/Program.cs @@ -13,11 +13,12 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Cli; +using Cli.Async; using KeeperSecurity.Authentication; using KeeperSecurity.Authentication.Async; using KeeperSecurity.Configuration; using KeeperSecurity.Enterprise; -using KeeperSecurity.Utils; namespace Sample { diff --git a/RoleManagement/RoleDataManagement.cs b/RoleManagement/RoleDataManagement.cs index 69dc527..40f4593 100644 --- a/RoleManagement/RoleDataManagement.cs +++ b/RoleManagement/RoleDataManagement.cs @@ -32,7 +32,7 @@ public class RoleDataManagement : RoleData, IRoleDataManagement { private Dictionary _adminRoleKeys = new Dictionary(); - private async Task GetRoleKey(long roleId) + private new async Task GetRoleKey(long roleId) { lock (_adminRoleKeys) { @@ -81,7 +81,7 @@ private async Task GetRoleKey(long roleId) roleKey = CryptoUtils.DecryptAesV1(rKey.EncryptedKey.Base64UrlDecode(), Enterprise.Auth.AuthContext.DataKey); break; case EncryptedKeyType.KtEncryptedByPublicKey: - roleKey = CryptoUtils.DecryptRsa(rKey.EncryptedKey.Base64UrlDecode(), Enterprise.Auth.AuthContext.PrivateKey); + roleKey = CryptoUtils.DecryptRsa(rKey.EncryptedKey.Base64UrlDecode(), Enterprise.Auth.AuthContext.PrivateRsaKey); break; } } diff --git a/RoleManagement/RoleManagement.csproj b/RoleManagement/RoleManagement.csproj index f1861f3..18bcf5e 100644 --- a/RoleManagement/RoleManagement.csproj +++ b/RoleManagement/RoleManagement.csproj @@ -2,12 +2,13 @@ Exe - net5.0 + net6.0 - - + + +