Merge pull request #29 from granstel/fix-user-state

Fix user state

Author: granstel

src/FillInTheTextBot.Api/FillInTheTextBot.Api.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>1.17.0</Version>
+    <Version>1.17.1</Version>
     <PackageReleaseNotes>net6.0</PackageReleaseNotes>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>

src/FillInTheTextBot.Messengers.Marusia/MarusiaService.cs

@@ -67,7 +67,7 @@ protected override Task<OutputModel> AfterAsync(InputModel input, Models.Respons
 
             output.AddToSessionState(Models.Response.ScopeStorageKey, response.ScopeKey);
 
-            _cache.AddAsync($"marusia:{response.UserHash}", string.Empty, TimeSpan.FromDays(14)).Forget();
+            _cache.AddAsync($"marusia:{input.Session?.UserId}", string.Empty, TimeSpan.FromDays(14)).Forget();
 
             return Task.FromResult(output);
         }

src/FillInTheTextBot.Messengers.Sber/SberService.cs

@@ -53,7 +53,7 @@ protected override async Task<Response> AfterAsync(Request input, Models.Respons
                 NextTextIndex = response.NextTextIndex
             };
 
-            var userStateCacheKey = GetCacheKey(response.UserHash);
+            var userStateCacheKey = GetCacheKey(input.Uuid?.Sub ?? input.Uuid?.UserId);
 
             await _cache.TryAddAsync(userStateCacheKey, userState, TimeSpan.FromDays(14));