Blazor9 hybridcache (#46)

fdonnet · web-flow · commit 15f6058b1d35 · 2024-12-07T15:41:54.000+01:00
* Update packages

* Proxy with hybrid cache

* Seems to work with hybrid cache Webapp

* Readme update for hybrid cache
diff --git a/README.md b/README.md
@@ -7,6 +7,7 @@ LAST PR implemented:
 
 Next steps or in progress:
 
+~~- Hybrid cache for users and tokens (done)~~
 - Vat-sales tax module implementation
 - .Net 9 (Blazor adaptations)
 - SingalR hub to trace tx status
diff --git a/src/Ubik.Accounting.SalesOrVatTax.Api/Ubik.Accounting.SalesOrVatTax.Api.csproj b/src/Ubik.Accounting.SalesOrVatTax.Api/Ubik.Accounting.SalesOrVatTax.Api.csproj
@@ -21,8 +21,8 @@
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="7.1.0" />
-    <PackageReference Include="MassTransit.EntityFrameworkCore" Version="8.3.2" />
-    <PackageReference Include="MassTransit.RabbitMQ" Version="8.3.2" />
+    <PackageReference Include="MassTransit.EntityFrameworkCore" Version="8.3.3" />
+    <PackageReference Include="MassTransit.RabbitMQ" Version="8.3.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Ubik.Accounting.Structure.Api/Ubik.Accounting.Structure.Api.csproj b/src/Ubik.Accounting.Structure.Api/Ubik.Accounting.Structure.Api.csproj
@@ -24,8 +24,8 @@
     <PackageReference Include="Dapper" Version="2.1.35" />
     <PackageReference Include="EFCore.NamingConventions" Version="9.0.0" />
     <PackageReference Include="LanguageExt.Core" Version="4.4.9" />
-    <PackageReference Include="MassTransit.EntityFrameworkCore" Version="8.3.2" />
-    <PackageReference Include="MassTransit.RabbitMQ" Version="8.3.2" />
+    <PackageReference Include="MassTransit.EntityFrameworkCore" Version="8.3.3" />
+    <PackageReference Include="MassTransit.RabbitMQ" Version="8.3.3" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
diff --git a/src/Ubik.Accounting.WebApp/Program.cs b/src/Ubik.Accounting.WebApp/Program.cs
@@ -42,6 +42,9 @@
 {
     options.Configuration = redisOptions.ConnectionString;
 });
+#pragma warning disable EXTEXP0018 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+builder.Services.AddHybridCache();
+#pragma warning restore EXTEXP0018 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
 
 //TODO: put that in a lib project Auth
 //TODO: this is very dependant to distributed cache (if no cache => no site, see if it's bad)
diff --git a/src/Ubik.Accounting.WebApp/Security/TokenCacheService.cs b/src/Ubik.Accounting.WebApp/Security/TokenCacheService.cs
@@ -1,56 +1,47 @@
 ﻿using IdentityModel.Client;
 using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Caching.Hybrid;
 using Microsoft.Extensions.Options;
 using System.IdentityModel.Tokens.Jwt;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using Ubik.Accounting.WebApp.Shared.Security;
 using Ubik.ApiService.Common.Configure.Options;
 using Ubik.Security.Contracts.Users.Results;
 
 namespace Ubik.Accounting.WebApp.Security
 {
-    public class TokenCacheService(IDistributedCache cache, IOptions<AuthServerOptions> authOptions, IHttpClientFactory factory)
+    public class TokenCacheService(HybridCache cache, IOptions<AuthServerOptions> authOptions, IHttpClientFactory factory)
     {
-        private readonly IDistributedCache _cache = cache;
         private readonly AuthServerOptions _authOptions = authOptions.Value;
         private readonly HttpClient _httpClient = factory.CreateClient("TokenClient");
 
-        private static readonly JsonSerializerOptions _serializerOptions = new()
-        {
-            PropertyNamingPolicy = null,
-            WriteIndented = true,
-            AllowTrailingCommas = true,
-            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
-        };
-
         public async Task RemoveUserTokenAsync(string key)
         {
-            await _cache.RemoveAsync($"webapp_{key}");
+            await cache.RemoveAsync($"webapp_{key}");
         }
 
         public async Task SetUserTokenAsync(TokenCacheEntry token)
         {
-            var toCache = JsonSerializer.SerializeToUtf8Bytes(token, options: _serializerOptions);
-
-            await _cache.SetAsync($"webapp_{token.UserId}", toCache,
-                new DistributedCacheEntryOptions { SlidingExpiration = TimeSpan.FromMinutes(120) });
+            await cache.SetAsync($"webapp_{token.UserId}", token, new HybridCacheEntryOptions()
+            {
+                Expiration = TimeSpan.FromMinutes(120),
+                LocalCacheExpiration = TimeSpan.FromSeconds(10)
+            });
         }
 
         public async Task<TokenCacheEntry?> GetUserTokenAsync(string? userId)
         {
             if (userId == null) return null;
 
-            var token = await _cache.GetAsync($"webapp_{userId}");
+            var token = await cache.GetOrCreateAsync<TokenCacheEntry?>($"webapp_{userId}", factory: null!,
+                    new HybridCacheEntryOptions() { Flags = HybridCacheEntryFlags.DisableUnderlyingData });
 
             if (token == null) return null;
 
-            var cachedResult = JsonSerializer.Deserialize<TokenCacheEntry>(token, _serializerOptions);
-
-            if (cachedResult == null) return null;
+            token = await RefreshTokenAsync(token, userId);
 
-            cachedResult = await RefreshTokenAsync(cachedResult, userId);
-
-            return cachedResult;
+            return token;
         }
 
         private async Task<TokenCacheEntry?> RefreshTokenAsync(TokenCacheEntry actualToken, string userId)
@@ -109,22 +100,22 @@ private Dictionary<string, string> ValuesForRefresh(string token)
         }
         public async Task SetUserInfoAsync(UserAdminOrMeResult userInfo)
         {
-            var toCache = JsonSerializer.SerializeToUtf8Bytes(userInfo, options: _serializerOptions);
+            await cache.SetAsync($"webapp_{userInfo.Email}_auth", userInfo, new HybridCacheEntryOptions()
+            {
+                Expiration = TimeSpan.FromMinutes(_authOptions.CookieRefreshTimeInMinutes + 120),
+                LocalCacheExpiration = TimeSpan.FromSeconds(15)
+            });
 
-            await _cache.SetAsync($"webapp_{userInfo.Email}_auth", toCache, new DistributedCacheEntryOptions { SlidingExpiration = TimeSpan.FromMinutes(_authOptions.CookieRefreshTimeInMinutes + 120) });
         }
 
         public async Task<UserAdminOrMeResult?> GetUserInfoAsync(string? userEmail)
         {
             if (userEmail == null) return null;
 
-            var user = await _cache.GetAsync($"webapp_{userEmail}_auth");
-
-            if (user == null) return null;
-
-            var cachedResult = JsonSerializer.Deserialize<UserAdminOrMeResult>(user, _serializerOptions);
+            var user = await cache.GetOrCreateAsync<UserAdminOrMeResult?>($"webapp_{userEmail}_auth", factory: null!,
+                new HybridCacheEntryOptions() { Flags = HybridCacheEntryFlags.DisableUnderlyingData });
 
-            return cachedResult;
+            return user ?? null;
         }
     }
 
diff --git a/src/Ubik.Accounting.WebApp/Styles/app.output.css b/src/Ubik.Accounting.WebApp/Styles/app.output.css
@@ -107,7 +107,7 @@
 }
 
 /*
-! tailwindcss v3.4.15 | MIT License | https://tailwindcss.com
+! tailwindcss v3.4.16 | MIT License | https://tailwindcss.com
 */
 
 /*
diff --git a/src/Ubik.Accounting.WebApp/Ubik.Accounting.WebApp.csproj b/src/Ubik.Accounting.WebApp/Ubik.Accounting.WebApp.csproj
@@ -29,6 +29,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Caching.Hybrid" Version="9.0.0-preview.9.24556.5" />
     <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
diff --git a/src/Ubik.Accounting.WebApp/package-lock.json b/src/Ubik.Accounting.WebApp/package-lock.json
diff --git a/src/Ubik.Accounting.WebApp/package.json b/src/Ubik.Accounting.WebApp/package.json
@@ -5,7 +5,7 @@
   "dependencies": {
     "autoprefixer": "^10.4.16",
     "postcss": "^8.4.31",
-    "tailwindcss": "^3.4.15"
+    "tailwindcss": "^3.4.16"
   },
   "devDependencies": {
     "@tailwindcss/forms": "^0.5.7",
diff --git a/src/Ubik.ApiService.Common/Ubik.ApiService.Common.csproj b/src/Ubik.ApiService.Common/Ubik.ApiService.Common.csproj
@@ -9,8 +9,8 @@
   <ItemGroup>
 	<PackageReference Include="Asp.Versioning.Mvc" Version="8.1.0" />
 	<PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
-	<PackageReference Include="MassTransit.EntityFrameworkCore" Version="8.3.2" />
-	<PackageReference Include="MassTransit.RabbitMQ" Version="8.3.2" />
+	<PackageReference Include="MassTransit.EntityFrameworkCore" Version="8.3.3" />
+	<PackageReference Include="MassTransit.RabbitMQ" Version="8.3.3" />
 	<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.0" />
 	<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.0" />
 	<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
diff --git a/src/Ubik.Security.Api/Ubik.Security.Api.csproj b/src/Ubik.Security.Api/Ubik.Security.Api.csproj
@@ -38,6 +38,7 @@
     <PackageReference Include="Dapper" Version="2.1.35" />
     <PackageReference Include="EFCore.NamingConventions" Version="9.0.0" />
     <PackageReference Include="LanguageExt.Core" Version="4.4.9" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Hybrid" Version="9.0.0-preview.9.24556.5" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="7.1.0" />
diff --git a/src/Ubik.ServiceDefaults/Ubik.ServiceDefaults.csproj b/src/Ubik.ServiceDefaults/Ubik.ServiceDefaults.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.10.0" />
     <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.10.0" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.10.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Ubik.YarpProxy/Program.cs b/src/Ubik.YarpProxy/Program.cs
@@ -41,6 +41,9 @@
             });
 
 //Cache, for routes authorizations
+#pragma warning disable EXTEXP0018 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+builder.Services.AddHybridCache();
+#pragma warning restore EXTEXP0018 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
 var redisOptions = new RedisOptions();
 builder.Configuration.GetSection(RedisOptions.Position).Bind(redisOptions);
 builder.Services.AddStackExchangeRedisCache(options =>
diff --git a/src/Ubik.YarpProxy/Services/UserService.cs b/src/Ubik.YarpProxy/Services/UserService.cs
@@ -1,27 +1,19 @@
 ﻿using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Caching.Hybrid;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using Ubik.Security.Contracts.Users.Results;
 
 namespace Ubik.YarpProxy.Services
 {
-    //Todo: replace with hybrid cache
-    public class UserService(HttpClient httpClient, IDistributedCache cache)
+    public class UserService(HttpClient httpClient, HybridCache cache)
     {
-        private static readonly JsonSerializerOptions _serializerOptions = new()
-        {
-            PropertyNamingPolicy = null,
-            WriteIndented = true,
-            AllowTrailingCommas = true,
-            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
-        };
-
         public async Task<UserAdminOrMeResult?> GetUserInfoAsync(string? email)
         {
             if (email == null) return null;
 
-            //Try cache
-            var user = await cache.GetAsync($"proxy_{email}");
+            var user = await cache.GetOrCreateAsync<UserAdminOrMeResult?>($"proxy_{email}", factory: null!,
+            new HybridCacheEntryOptions() { Flags = HybridCacheEntryFlags.DisableUnderlyingData });
 
             if (user == null)
             {
@@ -56,15 +48,17 @@ public class UserService(HttpClient httpClient, IDistributedCache cache)
             else
             {
                 //Cache
-                return JsonSerializer.Deserialize<UserAdminOrMeResult>(user, _serializerOptions);
+                return user;
             }
         }
 
         private async Task SetUserInfoInCacheAsync(UserAdminOrMeResult userInfo)
         {
-            var toCache = JsonSerializer.SerializeToUtf8Bytes(userInfo, options: _serializerOptions);
-
-            await cache.SetAsync($"proxy_{userInfo.Email}", toCache, new DistributedCacheEntryOptions { SlidingExpiration = TimeSpan.FromMinutes(60) });
+            await cache.SetAsync($"proxy_{userInfo.Email}", userInfo, new HybridCacheEntryOptions()
+                {
+                    Expiration = TimeSpan.FromMinutes(5),
+                    LocalCacheExpiration = TimeSpan.FromSeconds(15)
+                });
         }
     }
 }
diff --git a/src/Ubik.YarpProxy/Ubik.YarpProxy.csproj b/src/Ubik.YarpProxy/Ubik.YarpProxy.csproj
@@ -13,6 +13,7 @@
     <PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Hybrid" Version="9.0.0-preview.9.24556.5" />
     <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
     <PackageReference Include="Treyt.Yarp.ReverseProxy.Swagger" Version="3.8.1" />

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,9 @@`
`42`	`42`	`{`
`43`	`43`	`options.Configuration = redisOptions.ConnectionString;`
`44`	`44`	`});`
	`45`	`+#pragma warning disable EXTEXP0018 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.`
	`46`	`+builder.Services.AddHybridCache();`
	`47`	`+#pragma warning restore EXTEXP0018 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.`
`45`	`48`
`46`	`49`	`//TODO: put that in a lib project Auth`
`47`	`50`	`//TODO: this is very dependant to distributed cache (if no cache => no site, see if it's bad)`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`/*`
`110`		`-! tailwindcss v3.4.15 \| MIT License \| https://tailwindcss.com`
	`110`	`+! tailwindcss v3.4.16 \| MIT License \| https://tailwindcss.com`
`111`	`111`	`*/`
`112`	`112`
`113`	`113`	`/*`