Skip to content

Commit

Permalink
Ignore case when string comparing response headers with ServiceContro…
Browse files Browse the repository at this point in the history
…lHeaders (#1485)

* ignore case when comparing response headers

* typo fix
  • Loading branch information
soujay authored Aug 29, 2024
1 parent 17d9c0b commit fd2a3a8
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions src/ServiceInsight/ServiceControl/DefaultServiceControl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public DefaultServiceControl(
}
}

var header = response.Headers.SingleOrDefault(x => x.Name == ServiceControlHeaders.ParticularVersion);
var header = response.Headers.SingleOrDefault(x => string.Equals(x.Name, ServiceControlHeaders.ParticularVersion, StringComparison.OrdinalIgnoreCase));

return (header?.Value?.ToString(), address);
}
Expand Down Expand Up @@ -344,7 +344,8 @@ static RestRequestWithCache CreateMessagesRequest(string endpointName = null) =>
response =>
{
string first = null, prev = null, next = null, last = null;
var links = (string)response.Headers.FirstOrDefault(header => header.Name == ServiceControlHeaders.Link)?.Value;
var links = (string)response.Headers.FirstOrDefault(x => string.Equals(x.Name, ServiceControlHeaders.Link, StringComparison.OrdinalIgnoreCase))?.Value;

if (links != null)
{
var linksByRel = linkExpression.Matches(links)
Expand All @@ -366,12 +367,12 @@ static RestRequestWithCache CreateMessagesRequest(string endpointName = null) =>
pageSize = int.Parse(perPage);
}

var pageSizeText = (string)response.Headers.FirstOrDefault(header => header.Name == ServiceControlHeaders.PageSize)?.Value;
var pageSizeText = (string)response.Headers.FirstOrDefault(x => string.Equals(x.Name, ServiceControlHeaders.PageSize, StringComparison.OrdinalIgnoreCase))?.Value;

if (pageSizeText != null)
{
pageSize = int.Parse(pageSizeText);
}

var currentPage = 1;
var queryPage = requestQueryParameters["page"];
if (queryPage != null) //Clicking a next/prev link
Expand Down Expand Up @@ -399,7 +400,7 @@ static RestRequestWithCache CreateMessagesRequest(string endpointName = null) =>
PrevLink = prev,
LastLink = last,
FirstLink = first,
TotalCount = int.Parse(response.Headers.Single(x => x.Name == ServiceControlHeaders.TotalCount).Value.ToString()),
TotalCount = int.Parse(response.Headers.Single(x => string.Equals(x.Name, ServiceControlHeaders.TotalCount, StringComparison.OrdinalIgnoreCase)).Value.ToString()),
PageSize = pageSize
};
},
Expand Down

0 comments on commit fd2a3a8

Please sign in to comment.