byte array result content stream, template key check

Author: gencebay

src/NetCoreStack.Proxy/Binders/ContentModelBinder.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 
@@ -22,6 +23,11 @@ protected virtual EnsureTemplateResult EnsureTemplate(ContentModelBindingContext
                 {
                     var keyParameter = bindingContext.TemplateParameterKeys[i];
                     var keyModelMetadata = bindingContext.Parameters.FirstOrDefault(x => x.PropertyName == keyParameter);
+                    if (keyModelMetadata == null)
+                    {
+                        throw new ArgumentOutOfRangeException("Key parameter name does not match the template key. Please check template key(s) of the method.");
+                    }
+
                     var value = bindingContext.ModelContentResolver.ResolveParameter(keyModelMetadata, bindingContext.Args[i], false);
                     bindingContext.UriBuilder.Path += ($"/{WebUtility.UrlEncode(value)}");
                     parameterOffset++;

src/NetCoreStack.Proxy/Internal/ProxyResultExecutor.cs

@@ -33,6 +33,12 @@ public static async Task<ResponseContext> ExecuteAsync(HttpResponseMessage respo
                 throw new ProxyException(message, null);
             }
 
+            if (methodDescriptor.IsByteArrayReturn)
+            {
+                context.Value = await response.Content.ReadAsByteArrayAsync();
+                return context;
+            }
+
             if (methodDescriptor.IsVoidReturn)
                 return context;
 

src/NetCoreStack.Proxy/Types/ProxyMethodDescriptor.cs

@@ -44,6 +44,7 @@ public class ProxyMethodDescriptor
         public bool HasAnyTemplateParameterKey => TemplateParameterKeys.Any();
 
         public Dictionary<string, string> Headers { get; }
+        public bool IsByteArrayReturn { get; }
 
         public ProxyMethodDescriptor(MethodInfo methodInfo)
         {
@@ -61,6 +62,17 @@ public ProxyMethodDescriptor(MethodInfo methodInfo)
             if (IsGenericTaskReturn)
             {
                 UnderlyingReturnType = ReturnType.GetGenericArguments()[0];
+                if (typeof(byte[]).IsAssignableFrom(UnderlyingReturnType))
+                {
+                    IsByteArrayReturn = true;
+                }
+            }
+            else
+            {
+                if (typeof(byte[]).IsAssignableFrom(ReturnType))
+                {
+                    IsByteArrayReturn = true;
+                }
             }
         }
     }

test/NetCoreStack.Proxy.Mvc.Hosting/Controllers/GuidelineController.cs

@@ -158,5 +158,10 @@ public Task UploadAsync(FileProxyUploadContext context)
         {
             throw new NotImplementedException();
         }
+
+        public Task<byte[]> GetFileAsync(string id, string fileName)
+        {
+            throw new NotImplementedException();
+        }
     }
 }

test/NetCoreStack.Proxy.Test.Contracts/IFileProxyApi.cs

@@ -6,7 +6,8 @@ namespace NetCoreStack.Proxy.Test.Contracts
     [ApiRoute("/", regionKey: "Main")]
     public interface IFileProxyApi : IApiContract
     {
-        Task GetFilesAsync(params string[] fileNames);
+        [HttpGetMarker(Template = "proxy-fs/{id}/{filename}")]
+        Task<byte[]> GetFileAsync(string id, string filename);
 
         [HttpPostMarker(Template = "upload")]
         Task UploadAsync(FileProxyUploadContext context);

test/NetCoreStack.Proxy.Tests/ProxyCreationTests.cs

@@ -144,6 +144,14 @@ public async Task GetCollectionStreamTest()
             Assert.True(collection.Data.Count() == 5);
         }
 
+        [Fact]
+        public async Task GetSingleFileWithKeyTemplate()
+        {
+            var guidelineApi = Resolver.GetService<IFileProxyApi>();
+            byte[] bytes = await guidelineApi.GetFileAsync("5a6ee0791653ff2348f1cd32", "pdf-sample.pdf");
+            Assert.True(true);
+        }
+
         [Fact]
         public async Task TaskSingleFileModel()
         {