LM-3196 fixed ClientSettingsCashoutBlockUpdated handling

LykkeCity · Mar 23, 2024 · bc495b4 · bc495b4
1 parent 69f549f
commit bc495b4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/src/HftApi/HftApi.csproj b/src/HftApi/HftApi.csproj
@@ -21,7 +21,7 @@
     <PackageReference Include="Lykke.Messaging.RabbitMq" Version="2.2.2" />
     <PackageReference Include="Lykke.Service.Balances.Client" Version="2.3.2" />
     <PackageReference Include="Lykke.Service.ClientDialogs.Client" Version="1.0.1" />
-    <PackageReference Include="Lykke.Service.HftInternalService.Client" Version="2.5.0" />
+    <PackageReference Include="Lykke.Service.HftInternalService.Client" Version="2.6.1" />
     <PackageReference Include="Lykke.Service.Kyc.Client" Version="1.5.0" />
     <PackageReference Include="Lykke.Service.Operations.Client" Version="3.1.0" />
     <PackageReference Include="Lykke.Service.Operations.Contracts" Version="3.1.1" />

diff --git a/src/HftApi/RabbitSubscribers/ClientSettingsUpdatesSubscriber.cs b/src/HftApi/RabbitSubscribers/ClientSettingsUpdatesSubscriber.cs
@@ -54,35 +54,31 @@ public async Task HandleMessage(ClientSettingsCashoutBlockUpdated evt)
                 ClientId = evt.ClientId
             });           
 
-            var enabledClientApiKeys = await _hftInternalClient.Keys.GetKeys(evt.ClientId);
+            var enabledClientApiKeys = await _hftInternalClient.Keys.GetKeysSensitive(evt.ClientId);
 
             if (evt.TradesBlocked)
             {
                 foreach (var key in enabledClientApiKeys)
                 {
                     _tokenService.Remove(key.Id);
 
-                    var apiKeyStart = key.ApiKey.Substring(0, 4);
-
                     _log.Info($"API key has been cached", context: new
                     {
                         ClientId = evt.ClientId,
-                        ApiKeyStart = apiKeyStart
+                        ApiKeyId = key.Id
                     });
                 }
             }
             else
             {
                 foreach (var key in enabledClientApiKeys)
                 {
-                    _tokenService.Add(key.ApiKey);
-
-                    var apiKeyStart = key.ApiKey.Substring(0, 4);
+                    _tokenService.Add(key.Id);
 
                     _log.Info($"API key has been evicted from the cache", context: new
                     {
                         ClientId = evt.ClientId,
-                        ApiKeyStart = apiKeyStart
+                        ApiKeyId = key.Id
                     });
                 }                
             }

diff --git a/src/HftApi/RabbitSubscribers/KeyUpdateSubscriber.cs b/src/HftApi/RabbitSubscribers/KeyUpdateSubscriber.cs
@@ -59,13 +59,12 @@ private async Task ProcessMessageAsync(KeyUpdatedEvent message)
             // that it's acceptable since these events are not very frequent
 
             var isClientBlocked = await _blockedClients.IsClientBlocked(message.ClientId);
-            var apiKeyStart = message.Id.Substring(0, 4);
 
             _log.Info($"API key deleted: {message.IsDeleted}. Client blocked: {isClientBlocked}", context: new
             {
                 ClientId = message.ClientId,
                 WalletId = message.WalletId,
-                ApiKeyStart = apiKeyStart
+                ApiKeyId = message.Id
             });
 
             if (!message.IsDeleted && !isClientBlocked)
@@ -76,7 +75,7 @@ private async Task ProcessMessageAsync(KeyUpdatedEvent message)
                 {
                     ClientId = message.ClientId,
                     WalletId = message.WalletId,
-                    ApiKeyStart = apiKeyStart
+                    ApiKeyId = message.Id
                 });
             }
             else
@@ -87,7 +86,7 @@ private async Task ProcessMessageAsync(KeyUpdatedEvent message)
                 {
                     ClientId = message.ClientId,
                     WalletId = message.WalletId,
-                    ApiKeyStart = apiKeyStart
+                    ApiKeyId = message.Id
                 });
             }
         }

diff --git a/src/Lykke.HftApi.Services/Lykke.HftApi.Services.csproj b/src/Lykke.HftApi.Services/Lykke.HftApi.Services.csproj
@@ -20,7 +20,7 @@
       <PackageReference Include="Lykke.Cqrs" Version="9.0.1" />
       <PackageReference Include="Lykke.MatchingEngineConnector" Version="8.6.0" />
       <PackageReference Include="Lykke.Service.ClientDialogs.Client" Version="1.0.1" />
-      <PackageReference Include="Lykke.Service.HftInternalService.Client" Version="2.5.0" />
+      <PackageReference Include="Lykke.Service.HftInternalService.Client" Version="2.6.1" />
       <PackageReference Include="Lykke.Service.Operations.Client" Version="3.1.0" />
       <PackageReference Include="Lykke.Service.Operations.Contracts" Version="3.1.1" />
       <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0" />