Fixed async response interceptors don't get invoked

carl-berg · Dec 2, 2020 · 65e58d0 · 65e58d0
1 parent d09abae
commit 65e58d0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/src/Appeaser.Tests/PipelineTests.cs b/src/Appeaser.Tests/PipelineTests.cs
@@ -72,6 +72,20 @@ public void TestInterception()
             Assert.True(interceptor.ResponseWasIntercepted);
         }
 
+        [Fact]
+        public void TestInterceptionAsync()
+        {
+            var interceptor = new Interceptor();
+            var settings = new MediatorSettings().AddInterceptor<Interceptor>();
+            A.CallTo(() => _handler.GetHandler(A<Type>.That.IsEqualTo(typeof(Interceptor)))).Returns(interceptor);
+            var mediator = new Mediator(_handler, settings);
+
+            mediator.Send(new CommandFeature.AsyncCommand());
+
+            Assert.True(interceptor.RequestWasIntercepted);
+            Assert.True(interceptor.ResponseWasIntercepted);
+        }
+
         [Fact]
         public void TestReponseExceptionInterception()
         {

diff --git a/src/Appeaser/Appeaser.csproj b/src/Appeaser/Appeaser.csproj
@@ -3,7 +3,7 @@
         <TargetFrameworks>netstandard2.0;netstandard1.0;net45</TargetFrameworks>
         <Authors>Carl Berg</Authors>
         <Copyright>Copyright (c) $([System.DateTime]::Now.Year) Carl Berg</Copyright>
-        <VersionPrefix>2.3.3</VersionPrefix>
+        <VersionPrefix>2.3.4</VersionPrefix>
         <DisableImplicitFrameworkReferences Condition=" '$(TargetFramework)' == 'net45' ">true</DisableImplicitFrameworkReferences>
         <Description>Appeaser, the appeasing mediator</Description>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/src/Appeaser/Interception/MediatorInterceptor.cs b/src/Appeaser/Interception/MediatorInterceptor.cs
@@ -60,7 +60,7 @@ public async Task<TResponse> InvokeHandlerAsync<TResponse>(object handler, objec
 
                 var result = await invocation(scope);
 
-                foreach (var interceptor in ResolveInterceptors<IRequestInterceptor>(x => x.ResponseInterceptors).Reverse())
+                foreach (var interceptor in ResolveInterceptors<IResponseInterceptor>(x => x.ResponseInterceptors).Reverse())
                 {
                     await interceptor.InterceptAsync(scope.CreateResponseInterceptionContext<TResponse>(result));
                 }
@@ -70,7 +70,7 @@ public async Task<TResponse> InvokeHandlerAsync<TResponse>(object handler, objec
             catch (Exception ex)
             {
                 var exception = ex is TargetInvocationException ? ex.InnerException : ex;
-                foreach (var interceptor in ResolveInterceptors<IRequestInterceptor>(x => x.ResponseInterceptors).Reverse())
+                foreach (var interceptor in ResolveInterceptors<IResponseInterceptor>(x => x.ResponseInterceptors).Reverse())
                 {
                     await interceptor.InterceptAsync(scope.CreateExceptionInterceptionContext<TResponse>(exception));
                 }