Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: issue 128 - Added sanitization for guid #130

Merged
merged 4 commits into from
Sep 25, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions Microsoft.Kiota.Abstractions.Tests/RequestInformationTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,28 @@ public void SetsPathParametersOfBooleanType()
// Assert
Assert.Contains("%24count=true", requestInfo.URI.OriginalString);
}
[Fact]
public void SetsPathParametersOfGuidType()
{
// Arrange as the request builders would
var requestInfo = new RequestInformation
{
HttpMethod = Method.GET,
UrlTemplate = "http://localhost/users{?%24requestId}"
};

// Act
var guid = Guid.Parse("6d320a89-2d8f-4204-855d-b98a1bc176d4");
var pathParameters = new Dictionary<string, object>
{
{ "%24requestId", guid }
};

requestInfo.PathParameters = pathParameters;

// Assert
Assert.Contains($"%24requestId=6d320a89-2d8f-4204-855d-b98a1bc176d4", requestInfo.URI.OriginalString);
}

[Fact]
public void ThrowsInvalidOperationExceptionWhenBaseUrlNotSet()
Expand Down Expand Up @@ -369,6 +391,9 @@ internal class GetQueryParameters
/// <summary>Select properties to be returned</summary>\
[QueryParameter("%24select")]
public string[] Select { get; set; }
/// <summary>Unique id of the request</summary>
[QueryParameter("%24requestId")]
public Guid RequestId { get; set; }
/// <summary>Include count of items</summary>
[QueryParameter("%24count")]
public bool? Count { get; set; }
Expand Down
1 change: 1 addition & 0 deletions src/RequestInformation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ public Uri URI
bool boolean => boolean.ToString().ToLower(),// pass in a lowercase string as the final url will be uppercase due to the way ToString() works for booleans
DateTimeOffset dateTimeOffset => dateTimeOffset.ToString("o"),// Default to ISO 8601 for datetimeoffsets in the url.
DateTime dateTime => dateTime.ToString("o"),// Default to ISO 8601 for datetimes in the url.
Guid guid => guid.ToString("D"),// Default of 32 digits separated by hyphens
_ => value,//return object as is as the ToString method is good enough.
};

Expand Down