Merge pull request #376 from QuantozTechnology/support-serveruri-paths

Support ServerUri with a path included
elucidsoft · Oct 31, 2022 · 373b68f · 373b68f
2 parents fb6fc02 + 259bfaf
commit 373b68f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/stellar-dotnet-sdk-test/requests/AccountsRequestBuilderTest.cs b/stellar-dotnet-sdk-test/requests/AccountsRequestBuilderTest.cs
@@ -25,6 +25,21 @@ public void TestAccountsBuildUri()
             }
         }
 
+        [TestMethod]
+        public void TestAccountsBuildUriPathPrefix()
+        {
+            using (var server = new Server("https://nodeapi.com/xlm/authkey/"))
+            {
+                var uri = server.Accounts
+                    .Cursor("13537736921089")
+                    .Limit(200)
+                    .Order(OrderDirection.ASC)
+                    .BuildUri();
+
+                Assert.AreEqual("https://nodeapi.com/xlm/authkey/accounts?cursor=13537736921089&limit=200&order=asc", uri.ToString());
+            }
+        }
+
         [TestMethod]
         public async Task TestAccountsAccount()
         {

diff --git a/stellar-dotnet-sdk/requests/RequestBuilder.cs b/stellar-dotnet-sdk/requests/RequestBuilder.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading.Tasks;
-using stellar_dotnet_sdk.responses.operations;
 
 namespace stellar_dotnet_sdk.requests
 {
@@ -20,6 +19,7 @@ public class RequestBuilder<T> where T : class
         private readonly List<string> _segments;
         private bool _segmentsAdded;
         protected UriBuilder UriBuilder;
+        private readonly string _serverPathPrefix;
 
         public static HttpClient HttpClient { get; set; }
 
@@ -41,6 +41,9 @@ public RequestBuilder(Uri serverUri, string defaultSegment, HttpClient httpClien
             UriBuilder = new UriBuilder(serverUri);
             _segments = new List<string>();
 
+            // Store the required path part of the serverUri
+            _serverPathPrefix = UriBuilder.Path;
+
             if (!string.IsNullOrEmpty(defaultSegment))
                 SetSegments(defaultSegment);
 
@@ -120,10 +123,10 @@ public Uri BuildUri()
         {
             if (_segments.Count > 0)
             {
-                var path = "";
+                var path = _serverPathPrefix;
 
                 foreach (var segment in _segments)
-                    path += "/" + segment;
+                    path += (path.EndsWith("/") ? string.Empty : "/") + segment;
 
                 UriBuilder.Path = path;