Merge branch 'dev' of github.com:finbourne/RestSharp into finbourne-dev

restsharp · Dec 17, 2024 · ba2ebac · ba2ebac
2 parents 25922ce + 3cbd7ad
commit ba2ebac
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/src/RestSharp/Parameters/UrlSegmentParameter.cs b/src/RestSharp/Parameters/UrlSegmentParameter.cs
@@ -26,10 +26,11 @@ public partial record UrlSegmentParameter : NamedParameter {
     /// <param name="name">Parameter name</param>
     /// <param name="value">Parameter value</param>
     /// <param name="encode">Optional: encode the value, default is true</param>
-    public UrlSegmentParameter(string name, string value, bool encode = true)
+    /// <param name="replaceEncodedSlash">Optional: whether to replace all %2f and %2F in the parameter value with '/', default is true</param>
+    public UrlSegmentParameter(string name, string value, bool encode = true, bool replaceEncodedSlash = true)
         : base(
             name,
-            RegexPattern.Replace(Ensure.NotEmptyString(value, nameof(value)), "/"),
+            replaceEncodedSlash ? RegexPattern.Replace(Ensure.NotEmptyString(value, nameof(value)), "/") : value,
             ParameterType.UrlSegment,
             encode
         ) { }

diff --git a/test/RestSharp.Tests/ParametersTests.cs b/test/RestSharp.Tests/ParametersTests.cs
@@ -63,4 +63,28 @@ public void AddUrlSegmentModifiesUrlSegmentWithString() {
 
         expected.Should().BeEquivalentTo(actual);
     }
+
+    [Theory]
+    [InlineData("bar%2fBAR")]
+    [InlineData("bar%2FBAR")]
+    public void UrlSegmentParameter_WithValueWithEncodedSlash_WillReplaceEncodedSlashByDefault(string inputValue) {
+        var urlSegmentParameter = new UrlSegmentParameter("foo", inputValue);
+        urlSegmentParameter.Value.Should().BeEquivalentTo("bar/BAR");
+    }
+
+    [Theory]
+    [InlineData("bar%2fBAR")]
+    [InlineData("bar%2FBAR")]
+    public void UrlSegmentParameter_WithValueWithEncodedSlash_CanReplaceEncodedSlash(string inputValue) {
+        var urlSegmentParameter = new UrlSegmentParameter("foo", inputValue, replaceEncodedSlash: true);
+        urlSegmentParameter.Value.Should().BeEquivalentTo("bar/BAR");
+    }
+
+    [Theory]
+    [InlineData("bar%2fBAR")]
+    [InlineData("bar%2FBAR")]
+    public void UrlSegmentParameter_WithValueWithEncodedSlash_CanLeaveEncodedSlash(string inputValue) {
+        var urlSegmentParameter = new UrlSegmentParameter("foo", inputValue, replaceEncodedSlash: false);
+        urlSegmentParameter.Value.Should().BeEquivalentTo(inputValue);
+    }
 }