LEGLINK-857: Improvements to avoid Redis timeouts

DotNet/Account/Application/Commands/Role/UpdateRole/UpdateRole.cs

@@ -124,7 +124,7 @@ public async Task<bool> Execute(ClaimsPrincipal? requestor, LinkRoleModel model,
                         foreach (var user in users)
                         {
                             var userKey = $"user:{user.Email}";
-                            _cache.Remove(userKey);
+                            await _cache.RemoveAsync(userKey, cancellationToken);
                         }
                     }
                 }

DotNet/Account/Application/Commands/Role/UpdateRoleClaims/UpdateRoleClaims.cs

@@ -117,7 +117,7 @@ public async Task<bool> Execute(ClaimsPrincipal? requestor, Guid roleId, List<st
                         foreach (var user in users)
                         {
                             var userKey = $"user:{user.Email}";
-                            _cache.Remove(userKey);
+                            await _cache.RemoveAsync(userKey, cancellationToken);
                         }
                     }
                 }

DotNet/Account/Application/Commands/User/DeleteUser/DeleteUser.cs

@@ -92,7 +92,7 @@ public async Task<bool> Execute(ClaimsPrincipal? requestor, Guid userId, Cancell
 
                 try
                 {
-                    _cache.Remove(userKey);
+                    await _cache.RemoveAsync(userKey, cancellationToken);
                 }
                 catch (Exception ex)
                 {

DotNet/Account/Application/Commands/User/UpdateUser/UpdateUser.cs

@@ -186,7 +186,7 @@ public async Task<bool> Execute(ClaimsPrincipal? requestor, LinkUserModel model,
                 try
                 {
 
-                    _cache.Remove(userKey);
+                    await _cache.RemoveAsync(userKey, cancellationToken);
                 }
                 catch (Exception ex)
                 {

DotNet/Account/Application/Commands/User/UpdateUserClaims/UpdateUserClaims.cs

@@ -104,7 +104,7 @@ public async Task<bool> Execute(ClaimsPrincipal? requestor, Guid userId, List<st
                 var userKey = $"user:{user.Email}";
                 try
                 {
-                    _cache.Remove(userKey);
+                    await _cache.RemoveAsync(userKey, cancellationToken);
                 }
                 catch (Exception ex)
                 {

DotNet/Account/appsettings.Docker.json

@@ -13,7 +13,7 @@
   "DatabaseProvider": "SqlServer",
   "AutoMigrate": true,
   "ConnectionStrings": {
-    "Redis": "redis_cache:6379"
+    "Redis": "redis_cache:6379,abortConnect=false,resolveDns=true,allowAdmin=true"
   },
   "Cache": {
     "Enabled": true

DotNet/Account/packages.lock.json

@@ -793,10 +793,10 @@
       },
       "Pipelines.Sockets.Unofficial": {
         "type": "Transitive",
-        "resolved": "2.2.16",
-        "contentHash": "nonu9l0YrZH6krVYbskBjE7uG0VMAnvOQ9PU+RmzUsy+++vHkqzzCkHRoP877OiA3iRTxJyNDLfpcU8hrJ3/YQ==",
+        "resolved": "2.2.8",
+        "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==",
         "dependencies": {
-          "System.IO.Pipelines": "8.0.0"
+          "System.IO.Pipelines": "5.0.1"
         }
       },
       "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
@@ -1979,7 +1979,9 @@
           "Quartz.Plugins.TimeZoneConverter": "[3.18.1, )",
           "Quartz.Serialization.Json": "[3.18.1, )",
           "Quartz.Serialization.SystemTextJson": "[3.18.1, )",
-          "StackExchange.Redis": "[2.13.17, )",
+          "StackExchange.Redis.Extensions.AspNetCore": "[11.0.0, )",
+          "StackExchange.Redis.Extensions.Core": "[11.0.0, )",
+          "StackExchange.Redis.Extensions.System.Text.Json": "[11.0.0, )",
           "Swashbuckle.AspNetCore.SwaggerGen": "[9.0.6, )",
           "Swashbuckle.AspNetCore.SwaggerUI": "[6.9.0, )",
           "System.Text.Encodings.Web": "[10.0.3, )",
@@ -2570,12 +2572,38 @@
       "StackExchange.Redis": {
         "type": "CentralTransitive",
         "requested": "[2.13.17, )",
-        "resolved": "2.13.17",
-        "contentHash": "P7o7ZDBAmBrOLQEw8Pt44iIA08ioj48smRxn4Jp6yzCu6P3DOSU6lj7f+IOtN3pPvSgC9YufvM92ycukEEBCYQ==",
+        "resolved": "2.8.24",
+        "contentHash": "GWllmsFAtLyhm4C47cOCipGxyEi1NQWTFUHXnJ8hiHOsK/bH3T5eLkWPVW+LRL6jDiB3g3izW3YEHgLuPoJSyA==",
         "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "8.0.0",
-          "Pipelines.Sockets.Unofficial": "2.2.16",
-          "System.IO.Hashing": "10.0.2"
+          "Microsoft.Extensions.Logging.Abstractions": "6.0.0",
+          "Pipelines.Sockets.Unofficial": "2.2.8"
+        }
+      },
+      "StackExchange.Redis.Extensions.AspNetCore": {
+        "type": "CentralTransitive",
+        "requested": "[11.0.0, )",
+        "resolved": "11.0.0",
+        "contentHash": "00WEH+3KvyHh6RT0/E+BYLaoy7UY0GsTzWZnls1UrsfKusj/s7W/95sskXe4Y6g79mvvH1exX7adRiHyEMUG8w==",
+        "dependencies": {
+          "StackExchange.Redis.Extensions.Core": "11.0.0"
+        }
+      },
+      "StackExchange.Redis.Extensions.Core": {
+        "type": "CentralTransitive",
+        "requested": "[11.0.0, )",
+        "resolved": "11.0.0",
+        "contentHash": "KGH7IDglQyyIU135xq9K9Ng193VDoSSRsLVE4AsbscyGEsRAbs8xU6cJLuelenfPpjea7oQPMNSg7peXDwPdBw==",
+        "dependencies": {
+          "StackExchange.Redis": "[2.8.24, 3.0.0)"
+        }
+      },
+      "StackExchange.Redis.Extensions.System.Text.Json": {
+        "type": "CentralTransitive",
+        "requested": "[11.0.0, )",
+        "resolved": "11.0.0",
+        "contentHash": "YNrspMI8AUOjuYTstse/kN0SqAiOd9KmPA6Z36jidCf8uSVgRap/OfOiaXGoDr+5cXy/UTCtnFOVcBfw74cOkA==",
+        "dependencies": {
+          "StackExchange.Redis.Extensions.Core": "11.0.0"
         }
       },
       "Swashbuckle.AspNetCore.SwaggerGen": {

DotNet/Admin.BFF/Application/Clients/AccountService.cs

@@ -69,7 +69,7 @@ public async Task<HttpResponseMessage> GetAccountByEmail(string email, Cancellat
                 var createLinkBearerToken = _scopeFactory.CreateScope().ServiceProvider.GetRequiredService<ICreateLinkBearerToken>();
 
                 //create a bearer token for the system account
-                var bearerToken = await createLinkBearerToken.ExecuteAsync(_systemPrincipal, 2);
+                var bearerToken = await createLinkBearerToken.ExecuteAsync(_systemPrincipal, 2, cancellationToken);
                 if (string.IsNullOrEmpty(bearerToken))
                 {
                     _logger.LogLinkAdminTokenGenerationException("Failed to create bearer token for user account retrieval");

DotNet/Admin.BFF/Application/Clients/CensusService.cs

@@ -59,23 +59,23 @@ public async Task<LinkServiceHealthReport> LinkServiceHealthCheck(CancellationTo
         public async Task<HttpResponseMessage> DeleteCensusJobsAsync(ClaimsPrincipal user, string facilityId, CancellationToken cancellationToken)
         {
             var request = new HttpRequestMessage(HttpMethod.Delete, $"api/census/config/{Uri.EscapeDataString(facilityId)}/jobs");
-            await SetAuthHeaderAsync(user, request);
+            await SetAuthHeaderAsync(user, request, cancellationToken);
             return await _client.SendAsync(request, cancellationToken);
         }
 
         public async Task<HttpResponseMessage> RestoreCensusJobsAsync(ClaimsPrincipal user, string facilityId, CancellationToken cancellationToken)
         {
             var request = new HttpRequestMessage(HttpMethod.Patch, $"api/census/config/{Uri.EscapeDataString(facilityId)}/jobs/restore");
-            await SetAuthHeaderAsync(user, request);
+            await SetAuthHeaderAsync(user, request, cancellationToken);
             return await _client.SendAsync(request, cancellationToken);
         }
 
-        private async Task SetAuthHeaderAsync(ClaimsPrincipal user, HttpRequestMessage request)
+        private async Task SetAuthHeaderAsync(ClaimsPrincipal user, HttpRequestMessage request, CancellationToken cancellationToken)
         {
             if (_authenticationSchemaConfig.Value.EnableAnonymousAccess) return;
             using var scope = _scopeFactory.CreateScope();
             var createLinkBearerToken = scope.ServiceProvider.GetRequiredService<ICreateLinkBearerToken>();
-            var token = await createLinkBearerToken.ExecuteAsync(user, 2);
+            var token = await createLinkBearerToken.ExecuteAsync(user, 2, cancellationToken);
             request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token);
         }
 

DotNet/Admin.BFF/Application/Clients/DataAcquisitionService.cs

@@ -58,37 +58,37 @@ public async Task<LinkServiceHealthReport> LinkServiceHealthCheck(CancellationTo
         public async Task<HttpResponseMessage> RestoreLogsAsync(ClaimsPrincipal user, string facilityId, CancellationToken cancellationToken)
         {
             var request = new HttpRequestMessage(HttpMethod.Patch, $"api/data/acquisition-logs/facility/{Uri.EscapeDataString(facilityId)}/restore");
-            await SetAuthHeaderAsync(user, request);
+                await SetAuthHeaderAsync(user, request, cancellationToken);
             return await _client.SendAsync(request, cancellationToken);
         }
 
         public async Task<HttpResponseMessage> RestoreLogsByReportTrackingIdAsync(ClaimsPrincipal user, string reportTrackingId, CancellationToken cancellationToken)
         {
             var request = new HttpRequestMessage(HttpMethod.Patch, $"api/data/acquisition-logs/report/{Uri.EscapeDataString(reportTrackingId)}/restore");
-            await SetAuthHeaderAsync(user, request);
+            await SetAuthHeaderAsync(user, request, cancellationToken);
             return await _client.SendAsync(request, cancellationToken);
         }
 
         public async Task<HttpResponseMessage> SoftDeleteLogsByReportTrackingIdAsync(ClaimsPrincipal user, string reportTrackingId, CancellationToken cancellationToken)
         {
             var request = new HttpRequestMessage(HttpMethod.Delete, $"api/data/acquisition-logs/report/{Uri.EscapeDataString(reportTrackingId)}");
-            await SetAuthHeaderAsync(user, request);
+            await SetAuthHeaderAsync(user, request, cancellationToken);
             return await _client.SendAsync(request, cancellationToken);
         }
 
         public async Task<HttpResponseMessage> SoftDeleteLogsAsync(ClaimsPrincipal user, string facilityId, CancellationToken cancellationToken)
         {
             var request = new HttpRequestMessage(HttpMethod.Delete, $"api/data/acquisition-logs/facility/{Uri.EscapeDataString(facilityId)}");
-            await SetAuthHeaderAsync(user, request);
+            await SetAuthHeaderAsync(user, request, cancellationToken);
             return await _client.SendAsync(request, cancellationToken);
         }
 
-        private async Task SetAuthHeaderAsync(ClaimsPrincipal user, HttpRequestMessage request)
+        private async Task SetAuthHeaderAsync(ClaimsPrincipal user, HttpRequestMessage request, CancellationToken cancellationToken)
         {
             if (_authenticationSchemaConfig.Value.EnableAnonymousAccess) return;
             using var scope = _scopeFactory.CreateScope();
             var createLinkBearerToken = scope.ServiceProvider.GetRequiredService<ICreateLinkBearerToken>();
-            var token = await createLinkBearerToken.ExecuteAsync(user, 2);
+            var token = await createLinkBearerToken.ExecuteAsync(user, 2, cancellationToken);
             request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token);
         }
 

DotNet/Admin.BFF/Application/Clients/ReportService.cs

@@ -87,7 +87,7 @@ public async Task<HttpResponseMessage> ReportSummaryList(
                 var createLinkBearerToken = _scopeFactory.CreateScope().ServiceProvider.GetRequiredService<ICreateLinkBearerToken>();
 
                 //create a bearer token for the system account
-                var token = await createLinkBearerToken.ExecuteAsync(user, 2);
+                var token = await createLinkBearerToken.ExecuteAsync(user, 2, cancellationToken);
                 _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
             }
 
@@ -181,7 +181,7 @@ public async Task<HttpResponseMessage> GetPatientInCensusCount(
                 var createLinkBearerToken = _scopeFactory.CreateScope().ServiceProvider.GetRequiredService<ICreateLinkBearerToken>();
 
                 //create a bearer token for the system account
-                var token = await createLinkBearerToken.ExecuteAsync(user, 2);
+                var token = await createLinkBearerToken.ExecuteAsync(user, 2, cancellationToken);
                 _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
             }
 
@@ -203,7 +203,7 @@ public async Task<HttpResponseMessage> GetReportPopulationsByReportScheduleId(
                 var createLinkBearerToken = _scopeFactory.CreateScope().ServiceProvider.GetRequiredService<ICreateLinkBearerToken>();
 
                 //create a bearer token for the system account
-                var token = await createLinkBearerToken.ExecuteAsync(user, 2);
+                var token = await createLinkBearerToken.ExecuteAsync(user, 2, cancellationToken);
                 _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
             }
 
@@ -225,7 +225,7 @@ public async Task<HttpResponseMessage> GetReportScheduleById(
                 var createLinkBearerToken = _scopeFactory.CreateScope().ServiceProvider.GetRequiredService<ICreateLinkBearerToken>();
 
                 //create a bearer token for the system account
-                var token = await createLinkBearerToken.ExecuteAsync(user, 2);
+                var token = await createLinkBearerToken.ExecuteAsync(user, 2, cancellationToken);
                 _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
             }
 
@@ -241,7 +241,7 @@ public async Task<HttpResponseMessage> RestoreReportSchedulesAsync(ClaimsPrincip
             if (!_authenticationSchemaConfig.Value.EnableAnonymousAccess)
             {
                 var createLinkBearerToken = _scopeFactory.CreateScope().ServiceProvider.GetRequiredService<ICreateLinkBearerToken>();
-                var token = await createLinkBearerToken.ExecuteAsync(user, 2);
+                var token = await createLinkBearerToken.ExecuteAsync(user, 2, cancellationToken);
                 _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
             }
 
@@ -253,7 +253,7 @@ public async Task<HttpResponseMessage> GetActiveReportSchedulesAsync(ClaimsPrinc
             if (!_authenticationSchemaConfig.Value.EnableAnonymousAccess)
             {
                 var createLinkBearerToken = _scopeFactory.CreateScope().ServiceProvider.GetRequiredService<ICreateLinkBearerToken>();
-                var token = await createLinkBearerToken.ExecuteAsync(user, 2);
+                var token = await createLinkBearerToken.ExecuteAsync(user, 2, cancellationToken);
                 _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
             }
 
@@ -265,7 +265,7 @@ public async Task<HttpResponseMessage> SoftDeleteReportScheduleAsync(ClaimsPrinc
             if (!_authenticationSchemaConfig.Value.EnableAnonymousAccess)
             {
                 var createLinkBearerToken = _scopeFactory.CreateScope().ServiceProvider.GetRequiredService<ICreateLinkBearerToken>();
-                var token = await createLinkBearerToken.ExecuteAsync(user, 2);
+                var token = await createLinkBearerToken.ExecuteAsync(user, 2, cancellationToken);
                 _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
             }
 
@@ -277,7 +277,7 @@ public async Task<HttpResponseMessage> RestoreReportScheduleAsync(ClaimsPrincipa
             if (!_authenticationSchemaConfig.Value.EnableAnonymousAccess)
             {
                 var createLinkBearerToken = _scopeFactory.CreateScope().ServiceProvider.GetRequiredService<ICreateLinkBearerToken>();
-                var token = await createLinkBearerToken.ExecuteAsync(user, 2);
+                var token = await createLinkBearerToken.ExecuteAsync(user, 2, cancellationToken);
                 _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
             }
 
@@ -290,7 +290,7 @@ public async Task<HttpResponseMessage> SoftDeleteReportSchedulesAsync(ClaimsPrin
             if (!_authenticationSchemaConfig.Value.EnableAnonymousAccess)
             {
                 var createLinkBearerToken = _scopeFactory.CreateScope().ServiceProvider.GetRequiredService<ICreateLinkBearerToken>();
-                var token = await createLinkBearerToken.ExecuteAsync(user, 2);
+                var token = await createLinkBearerToken.ExecuteAsync(user, 2, cancellationToken);
                 _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
             }
 

DotNet/Admin.BFF/Application/Clients/TenantService.cs

@@ -58,23 +58,23 @@ public async Task<LinkServiceHealthReport> LinkServiceHealthCheck(CancellationTo
         public async Task<HttpResponseMessage> RestoreFacilityAsync(ClaimsPrincipal user, string facilityId, CancellationToken cancellationToken)
         {
             var request = new HttpRequestMessage(HttpMethod.Patch, $"api/facility/restore/{Uri.EscapeDataString(facilityId)}");
-            await SetAuthHeaderAsync(user, request);
+            await SetAuthHeaderAsync(user, request, cancellationToken);
             return await _client.SendAsync(request, cancellationToken);
         }
 
         public async Task<HttpResponseMessage> SoftDeleteFacilityAsync(ClaimsPrincipal user, string facilityId, CancellationToken cancellationToken)
         {
             var request = new HttpRequestMessage(HttpMethod.Delete, $"api/facility/softDelete/{Uri.EscapeDataString(facilityId)}");
-            await SetAuthHeaderAsync(user, request);
+            await SetAuthHeaderAsync(user, request, cancellationToken);
             return await _client.SendAsync(request, cancellationToken);
         }
 
-        private async Task SetAuthHeaderAsync(ClaimsPrincipal user, HttpRequestMessage request)
+        private async Task SetAuthHeaderAsync(ClaimsPrincipal user, HttpRequestMessage request, CancellationToken cancellationToken)
         {
             if (_authenticationSchemaConfig.Value.EnableAnonymousAccess) return;
             using var scope = _scopeFactory.CreateScope();
             var createLinkBearerToken = scope.ServiceProvider.GetRequiredService<ICreateLinkBearerToken>();
-            var token = await createLinkBearerToken.ExecuteAsync(user, 2);
+            var token = await createLinkBearerToken.ExecuteAsync(user, 2, cancellationToken);
             request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token);
         }