Skip to content

Commit d6c4fce

Browse files
aminamin
amin
authored and
amin
committed
changes in the AddAbsoluteUrl method for handeling uri
1 parent 9a6a092 commit d6c4fce

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

src/HttpClientToCurl/Builder.cs

+9-5
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,23 @@ internal static StringBuilder Initialize(HttpMethod httpMethod)
2424

2525
internal static StringBuilder AddAbsoluteUrl(this StringBuilder stringBuilder, string inputBaseAddress, Uri inputRequestUri)
2626
{
27-
Uri requestUri = null;
27+
string requestUri;
2828
Uri baseAddressUri = Helpers.CreateUri(inputBaseAddress);
2929
bool baseAddressIsAbsoluteUri = Helpers.CheckAddressIsAbsoluteUri(baseAddressUri);
3030
bool requestUriIsAbsoluteUri = Helpers.CheckAddressIsAbsoluteUri(inputRequestUri);
3131

3232
if (inputRequestUri is null && baseAddressUri is not null && baseAddressIsAbsoluteUri)
33-
requestUri = baseAddressUri;
33+
requestUri = baseAddressUri.ToString();
3434
else if (baseAddressUri is null && inputRequestUri is not null && requestUriIsAbsoluteUri)
35-
requestUri = inputRequestUri;
35+
requestUri = inputRequestUri.ToString();
3636
else if (baseAddressUri is not null && inputRequestUri is not null && baseAddressIsAbsoluteUri && !requestUriIsAbsoluteUri)
37-
requestUri = new Uri(baseAddressUri, inputRequestUri);
37+
requestUri = new Uri(baseAddressUri, inputRequestUri).ToString();
3838
else if (baseAddressUri is not null && inputRequestUri is not null && baseAddressIsAbsoluteUri)
39-
requestUri = inputRequestUri;
39+
requestUri = inputRequestUri.ToString();
40+
else if (baseAddressUri is null && inputRequestUri is null)
41+
requestUri = null;
42+
else
43+
requestUri = $"{baseAddressUri}{inputRequestUri}";
4044

4145
return stringBuilder
4246
.Append($"{requestUri}")

src/HttpClientToCurlGeneratorTest/UnitTest/MediaTypes/Json/SuccessCurlGeneratorTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ public void GenerateCurl_When_BaseAddress_Is_Null_PostMethod()
235235
script.Should().StartWith("curl -X POST");
236236
script.Trim().Should()
237237
.BeEquivalentTo(
238-
@"curl -X POST -H 'Authorization: Bearer 4797c126-3f8a-454a-aff1-96c0220dae61' -H 'Content-Type: application/json; charset=utf-8' -d '{""name"":""nancy"",""requestId"":10001006,""amount"":70000}'");
238+
@"curl -X POST api/test -H 'Authorization: Bearer 4797c126-3f8a-454a-aff1-96c0220dae61' -H 'Content-Type: application/json; charset=utf-8' -d '{""name"":""nancy"",""requestId"":10001006,""amount"":70000}'");
239239
}
240240

241241
[Theory]

0 commit comments

Comments
 (0)