reactiveui · clairernovotny · Feb 17, 2019 · Feb 17, 2019 · Feb 17, 2019 · Feb 17, 2019
diff --git a/Refit.Tests/InterfaceStubGenerator.cs b/Refit.Tests/InterfaceStubGenerator.cs
@@ -123,7 +123,7 @@ public void GenerateTemplateInfoForInterfaceListSmokeTest()
                 .ToList();
 
             var result = fixture.GenerateTemplateInfoForInterfaceList(input);
-            Assert.Equal(10, result.ClassList.Count);
+            Assert.Equal(12, result.ClassList.Count);
         }
 
         [Fact]

diff --git a/Refit.Tests/RefitStubs.Net46.cs b/Refit.Tests/RefitStubs.Net46.cs
@@ -1083,6 +1083,38 @@ public virtual Task<ApiResponse<Stream>> GetRemoteFileWithMetadata(string filena
     }
 }
 
+namespace Refit.Tests
+{
+    using Refit.Tests.RefitInternalGenerated;
+
+    /// <inheritdoc />
+    [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
+    [global::System.Diagnostics.DebuggerNonUserCode]
+    [Preserve]
+    [global::System.Reflection.Obfuscation(Exclude=true)]
+    partial class AutoGeneratedITrimTrailingForwardSlashApi : ITrimTrailingForwardSlashApi
+    {
+        /// <inheritdoc />
+        public HttpClient Client { get; protected set; }
+        readonly IRequestBuilder requestBuilder;
+
+        /// <inheritdoc />
+        public AutoGeneratedITrimTrailingForwardSlashApi(HttpClient client, IRequestBuilder requestBuilder)
+        {
+            Client = client;
+            this.requestBuilder = requestBuilder;
+        }
+
+        /// <inheritdoc />
+        public virtual Task Get()
+        {
+            var arguments = new object[] {  };
+            var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] {  });
+            return (Task)func(Client, arguments);
+        }
+    }
+}
+
 namespace Refit.Tests
 {
     using Refit.Tests.RefitInternalGenerated;
@@ -1209,3 +1241,35 @@ public virtual Task<HttpResponseMessage> Get(int httpstatuscode)
         }
     }
 }
+
+namespace Refit.Tests
+{
+    using Refit.Tests.RefitInternalGenerated;
+
+    /// <inheritdoc />
+    [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
+    [global::System.Diagnostics.DebuggerNonUserCode]
+    [Preserve]
+    [global::System.Reflection.Obfuscation(Exclude=true)]
+    partial class AutoGeneratedIValidApi : IValidApi
+    {
+        /// <inheritdoc />
+        public HttpClient Client { get; protected set; }
+        readonly IRequestBuilder requestBuilder;
+
+        /// <inheritdoc />
+        public AutoGeneratedIValidApi(HttpClient client, IRequestBuilder requestBuilder)
+        {
+            Client = client;
+            this.requestBuilder = requestBuilder;
+        }
+
+        /// <inheritdoc />
+        public virtual Task Get()
+        {
+            var arguments = new object[] {  };
+            var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] {  });
+            return (Task)func(Client, arguments);
+        }
+    }
+}
diff --git a/Refit.Tests/RefitStubs.NetCore2.cs b/Refit.Tests/RefitStubs.NetCore2.cs
@@ -1083,6 +1083,38 @@ public virtual Task<ApiResponse<Stream>> GetRemoteFileWithMetadata(string filena
     }
 }
 
+namespace Refit.Tests
+{
+    using Refit.Tests.RefitInternalGenerated;
+
+    /// <inheritdoc />
+    [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
+    [global::System.Diagnostics.DebuggerNonUserCode]
+    [Preserve]
+    [global::System.Reflection.Obfuscation(Exclude=true)]
+    partial class AutoGeneratedITrimTrailingForwardSlashApi : ITrimTrailingForwardSlashApi
+    {
+        /// <inheritdoc />
+        public HttpClient Client { get; protected set; }
+        readonly IRequestBuilder requestBuilder;
+
+        /// <inheritdoc />
+        public AutoGeneratedITrimTrailingForwardSlashApi(HttpClient client, IRequestBuilder requestBuilder)
+        {
+            Client = client;
+            this.requestBuilder = requestBuilder;
+        }
+
+        /// <inheritdoc />
+        public virtual Task Get()
+        {
+            var arguments = new object[] {  };
+            var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] {  });
+            return (Task)func(Client, arguments);
+        }
+    }
+}
+
 namespace Refit.Tests
 {
     using Refit.Tests.RefitInternalGenerated;
@@ -1209,3 +1241,35 @@ public virtual Task<HttpResponseMessage> Get(int httpstatuscode)
         }
     }
 }
+
+namespace Refit.Tests
+{
+    using Refit.Tests.RefitInternalGenerated;
+
+    /// <inheritdoc />
+    [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
+    [global::System.Diagnostics.DebuggerNonUserCode]
+    [Preserve]
+    [global::System.Reflection.Obfuscation(Exclude=true)]
+    partial class AutoGeneratedIValidApi : IValidApi
+    {
+        /// <inheritdoc />
+        public HttpClient Client { get; protected set; }
+        readonly IRequestBuilder requestBuilder;
+
+        /// <inheritdoc />
+        public AutoGeneratedIValidApi(HttpClient client, IRequestBuilder requestBuilder)
+        {
+            Client = client;
+            this.requestBuilder = requestBuilder;
+        }
+
+        /// <inheritdoc />
+        public virtual Task Get()
+        {
+            var arguments = new object[] {  };
+            var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] {  });
+            return (Task)func(Client, arguments);
+        }
+    }
+}
diff --git a/Refit.Tests/RestService.cs b/Refit.Tests/RestService.cs
@@ -131,6 +131,20 @@ public interface IBodylessApi
         Task Head();
     }
 
+    public interface ITrimTrailingForwardSlashApi
+    {
+        HttpClient Client { get; }
+
+        [Get("/someendpoint")]
+        Task Get();
+    }
+
+    public interface IValidApi
+    {
+        [Get("/someendpoint")]
+        Task Get();
+    }
+
     public class HttpBinGet
     {
         public Dictionary<string, object> Args { get; set; }
@@ -1187,5 +1201,64 @@ public async Task CanSerializeContentAsXml()
 
             mockHttp.VerifyNoOutstandingExpectation();
         }
+
+        [Fact]
+        public void ShouldTrimTrailingForwardSlashFromBaseUrl()
+        {
+            var expectedBaseAddress = "http://example.com/api";
+            var inputBaseAddress = "http://example.com/api/";
+
+            var fixture = RestService.For<ITrimTrailingForwardSlashApi>(inputBaseAddress);
+
+            Assert.Equal(fixture.Client.BaseAddress.AbsoluteUri, expectedBaseAddress);
+        }
+
+        [Fact]
+        public void ShouldThrowArgumentExceptionIfHostUrlIsNull()
+        {
+            try
+            {
+                RestService.For<IValidApi>(hostUrl: null);
+            }
+            catch (ArgumentException ex)
+            {
+                Assert.Equal("hostUrl", ex.ParamName);
+                return;
+            }
+
+            Assert.False(true, "Exception not thrown.");
+        }
+
+        [Fact]
+        public void ShouldThrowArgumentExceptionIfHostUrlIsEmpty()
+        {
+            try
+            {
+                RestService.For<IValidApi>(hostUrl: "");
+            }
+            catch (ArgumentException ex)
+            {
+                Assert.Equal("hostUrl", ex.ParamName);
+                return;
+            }
+
+            Assert.False(true, "Exception not thrown.");
+        }
+
+        [Fact]
+        public void ShouldThrowArgumentExceptionIfHostUrlIsWhitespace()
+        {
+            try
+            {
+                RestService.For<IValidApi>(hostUrl: " ");
+            }
+            catch (ArgumentException ex)
+            {
+                Assert.Equal("hostUrl", ex.ParamName);
+                return;
+            }
+
+            Assert.False(true, "Exception not thrown.");
+        }
     }
 }
diff --git a/Refit/RestService.cs b/Refit/RestService.cs
@@ -34,6 +34,13 @@ public static T For<T>(HttpClient client, RefitSettings settings)
 
         public static T For<T>(string hostUrl, RefitSettings settings)
         {
+            if (string.IsNullOrWhiteSpace(hostUrl))
+            {
+                throw new ArgumentException(
+                    $"`{nameof(hostUrl)}` must not be null or whitespace.",
+                    nameof(hostUrl));
+            }
+
             // check to see if user provided custom auth token
             HttpMessageHandler innerHandler = null;
             if (settings != null)
@@ -49,7 +56,7 @@ public static T For<T>(string hostUrl, RefitSettings settings)
                 }
             }
 
-            var client = new HttpClient(innerHandler ?? new HttpClientHandler()) { BaseAddress = new Uri(hostUrl) };
+            var client = new HttpClient(innerHandler ?? new HttpClientHandler()) { BaseAddress = new Uri(hostUrl.TrimEnd('/')) };
             return For<T>(client, settings);
         }