From 0b52197a23b5a9a5d93249f714f827447d2c5882 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Wed, 11 Aug 2021 10:05:22 -0400
Subject: [PATCH] update private field access

---
 .../Services/AwsKmsRsaKeyService.cs           |  3 +--
 .../Services/AzureKeyVaultRsaKeyService.cs    | 20 +++++--------------
 .../Services/GoogleCloudKmsRsaKeyService.cs   |  2 +-
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/CryptoAgent/Services/AwsKmsRsaKeyService.cs b/src/CryptoAgent/Services/AwsKmsRsaKeyService.cs
index 1a73df6..0009f17 100644
--- a/src/CryptoAgent/Services/AwsKmsRsaKeyService.cs
+++ b/src/CryptoAgent/Services/AwsKmsRsaKeyService.cs
@@ -10,8 +10,7 @@ namespace Bit.CryptoAgent.Services
     public class AwsKmsRsaKeyService : IRsaKeyService
     {
         private readonly CryptoAgentSettings _settings;
-
-        private AmazonKeyManagementServiceClient _kmsClient;
+        private readonly AmazonKeyManagementServiceClient _kmsClient;
 
         public AwsKmsRsaKeyService(
             CryptoAgentSettings settings)
diff --git a/src/CryptoAgent/Services/AzureKeyVaultRsaKeyService.cs b/src/CryptoAgent/Services/AzureKeyVaultRsaKeyService.cs
index c84a4af..6edc13a 100644
--- a/src/CryptoAgent/Services/AzureKeyVaultRsaKeyService.cs
+++ b/src/CryptoAgent/Services/AzureKeyVaultRsaKeyService.cs
@@ -9,15 +9,17 @@ namespace Bit.CryptoAgent.Services
     public class AzureKeyVaultRsaKeyService : IRsaKeyService
     {
         private readonly CryptoAgentSettings _settings;
+        private readonly ClientSecretCredential _credential;
 
         private KeyVaultKey _key;
         private CryptographyClient _cryptographyClient;
-        private ClientSecretCredential _credential;
 
         public AzureKeyVaultRsaKeyService(
             CryptoAgentSettings settings)
         {
             _settings = settings;
+            _credential = new ClientSecretCredential(_settings.RsaKey.AzureKeyvaultAdTenantId,
+                _settings.RsaKey.AzureKeyvaultAdAppId, _settings.RsaKey.AzureKeyvaultAdSecret);
         }
 
         public async Task<byte[]> EncryptAsync(byte[] data)
@@ -59,8 +61,7 @@ namespace Bit.CryptoAgent.Services
             if (_cryptographyClient == null)
             {
                 var key = await GetKeyAsync();
-                var credential = GetCredential();
-                _cryptographyClient = new CryptographyClient(key.Id, credential);
+                _cryptographyClient = new CryptographyClient(key.Id, _credential);
             }
             return _cryptographyClient;
         }
@@ -69,22 +70,11 @@ namespace Bit.CryptoAgent.Services
         {
             if (_key == null)
             {
-                var credential = GetCredential();
                 var keyVaultUri = new Uri(_settings.RsaKey.AzureKeyvaultUri);
-                var keyClient = new KeyClient(keyVaultUri, credential);
+                var keyClient = new KeyClient(keyVaultUri, _credential);
                 _key = await keyClient.GetKeyAsync(_settings.RsaKey.AzureKeyvaultKeyName);
             }
             return _key;
         }
-
-        private ClientSecretCredential GetCredential()
-        {
-            if (_credential == null)
-            {
-                _credential = new ClientSecretCredential(_settings.RsaKey.AzureKeyvaultAdTenantId,
-                    _settings.RsaKey.AzureKeyvaultAdAppId, _settings.RsaKey.AzureKeyvaultAdSecret);
-            }
-            return _credential;
-        }
     }
 }
diff --git a/src/CryptoAgent/Services/GoogleCloudKmsRsaKeyService.cs b/src/CryptoAgent/Services/GoogleCloudKmsRsaKeyService.cs
index e5b47b9..3d8d167 100644
--- a/src/CryptoAgent/Services/GoogleCloudKmsRsaKeyService.cs
+++ b/src/CryptoAgent/Services/GoogleCloudKmsRsaKeyService.cs
@@ -64,7 +64,7 @@ namespace Bit.CryptoAgent.Services
             return rsa.ExportRSAPublicKey();
         }
 
-        public async Task<RSA> GetRsaPublicKeyAsync()
+        private async Task<RSA> GetRsaPublicKeyAsync()
         {
             var publicKey = await _keyManagementServiceClient.GetPublicKeyAsync(_cryptoKeyVersionName);
             var blocks = publicKey.Pem.Split("-", StringSplitOptions.RemoveEmptyEntries);