Merge branch 'main' of https://github.com/Dative-GPI/bones into feat/backport-dat-acquisition

Author: Quentin SCHROTER

src/Bones.Grpc/Interceptors/NotFoundInterceptor.cs

@@ -1,34 +1,37 @@
 using System;
 using Grpc.Core;
 using Grpc.Core.Interceptors;
+using System.Threading.Tasks;
 
 namespace Bones.Grpc
 {
     public class NotFoundInterceptor : Interceptor
     {
-        public override AsyncUnaryCall<TResponse> AsyncUnaryCall<TRequest, TResponse>(TRequest request, ClientInterceptorContext<TRequest, TResponse> context, AsyncUnaryCallContinuation<TRequest, TResponse> continuation)
+        public override AsyncUnaryCall<TResponse> AsyncUnaryCall<TRequest, TResponse>(
+            TRequest request,
+            ClientInterceptorContext<TRequest, TResponse> context,
+            AsyncUnaryCallContinuation<TRequest, TResponse> continuation)
         {
-            var response = base.AsyncUnaryCall(request, context, continuation);
+            var call = continuation(request, context);
 
-            var responseWithErrorhandling = response.ResponseAsync.ContinueWith(
-                r => {
-                    try
-                    {
-                        var response = r.Result;
-                        return response;
-                    }
-                    catch (AggregateException ex)
-                    {
-                        if(ex.InnerException is RpcException rpcException
-                            && rpcException.StatusCode == StatusCode.NotFound){
-                            return null;
-                        }
-                        throw;
-                    }
-                }
-            );
+            return new AsyncUnaryCall<TResponse>(
+                HandleResponse(call.ResponseAsync),
+                call.ResponseHeadersAsync,
+                call.GetStatus,
+                call.GetTrailers,
+                call.Dispose);
+        }
 
-            return new AsyncUnaryCall<TResponse>(responseWithErrorhandling, response.ResponseHeadersAsync, response.GetStatus, response.GetTrailers, response.Dispose);
+        private async Task<TResponse> HandleResponse<TResponse>(Task<TResponse> task)
+        {
+            try
+            {
+                return await task;
+            }
+            catch (RpcException ex) when (ex.StatusCode == StatusCode.NotFound)
+            {
+                return default;
+            }
         }
     }
 }