Uri escape, file proxy tests

gencebay · gencebay · commit ae0923bf2e9e · 2018-07-05T18:36:53.000+03:00
diff --git a/src/NetCoreStack.Proxy/Binders/ContentModelBinder.cs b/src/NetCoreStack.Proxy/Binders/ContentModelBinder.cs
@@ -29,7 +29,7 @@ protected virtual EnsureTemplateResult EnsureTemplate(ContentModelBindingContext
                     }
 
                     var value = bindingContext.ModelContentResolver.ResolveParameter(keyModelMetadata, bindingContext.Args[i], false);
-                    bindingContext.UriBuilder.Path += ($"/{WebUtility.UrlEncode(value)}");
+                    bindingContext.UriBuilder.Path += ($"/{Uri.EscapeUriString(value)}");
                     parameterOffset++;
                 }
             }
diff --git a/src/NetCoreStack.Proxy/NetCoreStack.Proxy.csproj b/src/NetCoreStack.Proxy/NetCoreStack.Proxy.csproj
@@ -7,10 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
     <PackageReference Include="NetCoreStack.Contracts" Version="2.0.7" />
     <PackageReference Include="NetCoreStack.DispatchProxyAsync" Version="2.0.2" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
diff --git a/test/NetCoreStack.Proxy.Mvc.Hosting/NetCoreStack.Proxy.Mvc.Hosting.csproj b/test/NetCoreStack.Proxy.Mvc.Hosting/NetCoreStack.Proxy.Mvc.Hosting.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" />
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="2.5.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/NetCoreStack.Proxy.Test.Contracts/IFileProxyApi.cs b/test/NetCoreStack.Proxy.Test.Contracts/IFileProxyApi.cs
@@ -3,7 +3,7 @@
 
 namespace NetCoreStack.Proxy.Test.Contracts
 {
-    [ApiRoute("/", regionKey: "Main")]
+    [ApiRoute("/", regionKey: "FS")]
     public interface IFileProxyApi : IApiContract
     {
         [HttpGetMarker(Template = "proxy-fs/{id}/{filename}")]
diff --git a/test/NetCoreStack.Proxy.Test.Contracts/ISmsApi.cs b/test/NetCoreStack.Proxy.Test.Contracts/ISmsApi.cs
@@ -0,0 +1,18 @@
+﻿using NetCoreStack.Contracts;
+using NetCoreStack.Mvc;
+using System.Threading.Tasks;
+
+namespace NetCoreStack.Proxy.Test.Contracts
+{
+    [ApiRoute("api/[controller]", "Integrations")]
+    public interface ISmsApi : IApiContract
+    {
+        Task<ApiResult<SmsResult>> Send(string telephone, string content, bool isOtp = false, int? minutesTimeout = null);
+    }
+
+    public class SmsResult
+    {
+        public bool Successfull { get; set; }
+        public string MessageId { get; set; }
+    }
+}
diff --git a/test/NetCoreStack.Proxy.Test.Contracts/NetCoreStack.Proxy.Test.Contracts.csproj b/test/NetCoreStack.Proxy.Test.Contracts/NetCoreStack.Proxy.Test.Contracts.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.1" />
     <PackageReference Include="NetCoreStack.Contracts" Version="2.0.7" />
-    <PackageReference Include="NetCoreStack.Mvc" Version="2.1.4" />
+    <PackageReference Include="NetCoreStack.Mvc" Version="2.1.5" />
   </ItemGroup>
 
 </Project>
diff --git a/test/NetCoreStack.Proxy.Tests/NetCoreStack.Proxy.Tests.csproj b/test/NetCoreStack.Proxy.Tests/NetCoreStack.Proxy.Tests.csproj
@@ -7,12 +7,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
-    <PackageReference Include="Moq" Version="4.8.2" />
+    <PackageReference Include="Moq" Version="4.8.3" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
   </ItemGroup>
diff --git a/test/NetCoreStack.Proxy.Tests/ProxyCreationTests.cs b/test/NetCoreStack.Proxy.Tests/ProxyCreationTests.cs
@@ -159,6 +159,14 @@ public async Task GetSingleFileWithKeyTemplate()
             Assert.True(true);
         }
 
+        [Fact]
+        public async Task GetFileWithSpaceTest()
+        {
+            var guidelineApi = Resolver.GetService<IFileProxyApi>();
+            byte[] bytes = await guidelineApi.GetFileAsync("5a6ee0791653ff2348f1cd32", Uri.EscapeUriString("Open Source.png"));
+            Assert.True(true);
+        }
+
         [Fact]
         public async Task GetSingleFileWithKeyTemplateAndUtf8()
         {
@@ -370,5 +378,13 @@ await api.PutSubtitleAttachmentList(new SubtitleAttachmentDto {
             });
             Assert.True(true);
         }
+
+        [Fact]
+        public async Task TaskSmsSendTests()
+        {
+            var api = Resolver.GetService<ISmsApi>();
+            var result = await api.Send("000 111 22 33", "Proxy test content", true, 120);
+            Assert.True(true);
+        }
     }
 }
diff --git a/test/NetCoreStack.Proxy.Tests/TestHelper.cs b/test/NetCoreStack.Proxy.Tests/TestHelper.cs
@@ -83,6 +83,7 @@ static TestHelper()
                 options.Register<IConsulApi>();
                 options.Register<ISelfApi>();
                 options.Register<IAttachmentApi>();
+                options.Register<ISmsApi>();
 
                 options.CultureFactory = () =>
                 {
diff --git a/test/NetCoreStack.Proxy.Tests/appsettings.json b/test/NetCoreStack.Proxy.Tests/appsettings.json
@@ -2,7 +2,9 @@
   "ProxySettings": {
     "RegionKeys": {
       "Main": "http://localhost:5003/,http://localhost:5004/",
-      "Consul": "http://localhost:8500/"
+      "Consul": "http://localhost:8500/",
+      "Integrations": "http://localhost:5003/",
+      "FS": "http://localhost:8585/"
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ protected virtual EnsureTemplateResult EnsureTemplate(ContentModelBindingContext`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`var value = bindingContext.ModelContentResolver.ResolveParameter(keyModelMetadata, bindingContext.Args[i], false);`
`32`		`- bindingContext.UriBuilder.Path += ($"/{WebUtility.UrlEncode(value)}");`
	`32`	`+ bindingContext.UriBuilder.Path += ($"/{Uri.EscapeUriString(value)}");`
`33`	`33`	`parameterOffset++;`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace NetCoreStack.Proxy.Test.Contracts`
`5`	`5`	`{`
`6`		`- [ApiRoute("/", regionKey: "Main")]`
	`6`	`+ [ApiRoute("/", regionKey: "FS")]`
`7`	`7`	`public interface IFileProxyApi : IApiContract`
`8`	`8`	`{`
`9`	`9`	`[HttpGetMarker(Template = "proxy-fs/{id}/{filename}")]`
Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,14 @@ public async Task GetSingleFileWithKeyTemplate()`
`159`	`159`	`Assert.True(true);`
`160`	`160`	`}`
`161`	`161`
	`162`	`+ [Fact]`
	`163`	`+ public async Task GetFileWithSpaceTest()`
	`164`	`+ {`
	`165`	`+ var guidelineApi = Resolver.GetService<IFileProxyApi>();`
	`166`	`+ byte[] bytes = await guidelineApi.GetFileAsync("5a6ee0791653ff2348f1cd32", Uri.EscapeUriString("Open Source.png"));`
	`167`	`+ Assert.True(true);`
	`168`	`+ }`
	`169`	`+`
`162`	`170`	`[Fact]`
`163`	`171`	`public async Task GetSingleFileWithKeyTemplateAndUtf8()`
`164`	`172`	`{`
`@@ -370,5 +378,13 @@ await api.PutSubtitleAttachmentList(new SubtitleAttachmentDto {`
`370`	`378`	`});`
`371`	`379`	`Assert.True(true);`
`372`	`380`	`}`
	`381`	`+`
	`382`	`+ [Fact]`
	`383`	`+ public async Task TaskSmsSendTests()`
	`384`	`+ {`
	`385`	`+ var api = Resolver.GetService<ISmsApi>();`
	`386`	`+ var result = await api.Send("000 111 22 33", "Proxy test content", true, 120);`
	`387`	`+ Assert.True(true);`
	`388`	`+ }`
`373`	`389`	`}`
`374`	`390`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ static TestHelper()`
`83`	`83`	`options.Register<IConsulApi>();`
`84`	`84`	`options.Register<ISelfApi>();`
`85`	`85`	`options.Register<IAttachmentApi>();`
	`86`	`+ options.Register<ISmsApi>();`
`86`	`87`
`87`	`88`	`options.CultureFactory = () =>`
`88`	`89`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,9 @@`
`2`	`2`	`"ProxySettings": {`
`3`	`3`	`"RegionKeys": {`
`4`	`4`	`"Main": "http://localhost:5003/,http://localhost:5004/",`
`5`		`- "Consul": "http://localhost:8500/"`
	`5`	`+ "Consul": "http://localhost:8500/",`
	`6`	`+ "Integrations": "http://localhost:5003/",`
	`7`	`+ "FS": "http://localhost:8585/"`
`6`	`8`	`}`
`7`	`9`	`}`
`8`	`10`	`}`