From a5e85173e9732dccbbacda93a1950be00fe58d9e Mon Sep 17 00:00:00 2001 From: Huib Piguillet Date: Tue, 20 Oct 2020 22:39:14 +0200 Subject: [PATCH] Some missing stuff --- .../Sdk/Api/RequestSender/ApiRequestSender.cs | 1 - .../Api/RequestSender/HttpRequestSender.cs | 5 +- .../Api/RequestSender/ApiRequestSenderTest.cs | 75 ------------------- .../RequestSender/HttpRequestSenderTest.cs | 5 +- 4 files changed, 7 insertions(+), 79 deletions(-) diff --git a/Bynder/Sdk/Api/RequestSender/ApiRequestSender.cs b/Bynder/Sdk/Api/RequestSender/ApiRequestSender.cs index 7a11ea1..a1774e8 100644 --- a/Bynder/Sdk/Api/RequestSender/ApiRequestSender.cs +++ b/Bynder/Sdk/Api/RequestSender/ApiRequestSender.cs @@ -9,7 +9,6 @@ using System.Threading.Tasks; using Bynder.Sdk.Model; using Bynder.Sdk.Api.Requests; -using Bynder.Sdk.Service; using Newtonsoft.Json; using Bynder.Sdk.Query.Decoder; using Bynder.Sdk.Query; diff --git a/Bynder/Sdk/Api/RequestSender/HttpRequestSender.cs b/Bynder/Sdk/Api/RequestSender/HttpRequestSender.cs index 91bc9d0..2794f8d 100644 --- a/Bynder/Sdk/Api/RequestSender/HttpRequestSender.cs +++ b/Bynder/Sdk/Api/RequestSender/HttpRequestSender.cs @@ -15,6 +15,9 @@ internal class HttpRequestSender : IHttpRequestSender { private readonly HttpClient _httpClient = new HttpClient(); + /// + /// User-Agent header we add to each request. + /// public string UserAgent { get { return "bynder-c-sharp-sdk/" + Assembly.GetExecutingAssembly().GetName().Version.ToString(); } @@ -28,7 +31,7 @@ public string UserAgent public async Task SendHttpRequest(HttpRequestMessage httpRequest) { httpRequest.Headers.Add("User-Agent", UserAgent); - HttpResponseMessage response = await _httpClient.SendAsync(httpRequest).ConfigureAwait(false); + var response = await _httpClient.SendAsync(httpRequest).ConfigureAwait(false); response.EnsureSuccessStatusCode(); return response; } diff --git a/Bynder/Test/Api/RequestSender/ApiRequestSenderTest.cs b/Bynder/Test/Api/RequestSender/ApiRequestSenderTest.cs index 895ec98..6d36151 100644 --- a/Bynder/Test/Api/RequestSender/ApiRequestSenderTest.cs +++ b/Bynder/Test/Api/RequestSender/ApiRequestSenderTest.cs @@ -102,7 +102,6 @@ public async Task WhenCredentialInvalidTwoRequestsSent() [Fact] public async Task WhenRequestIsGetThenParametersAreAddedToUrl() { - //await SendRequest(true, HttpMethod.Get) using (var apiRequestSender = CreateApiRequestSender(true)) { var apiRequest = new ApiRequest @@ -129,80 +128,6 @@ public async Task WhenRequestIsGetThenParametersAreAddedToUrl() } } - //private asynv Task SendRequest( - // bool hasValidCredentials, - // HttpMethod httpMethod - //) - //{ - // var httpSenderMock = new Mock(); - // var query = new StubQuery - // { - // Item1 = "Value" - // }; - // var accessToken = "access_token"; - - // using (ApiRequestSender apiRequestSender = new ApiRequestSender( - // new Configuration - // { - // BaseUrl = new Uri("https://example.bynder.com"), - // }, - // GetCredentials(hasValidCredentials, accessToken), - // httpSenderMock.Object - // )) - // { - // var apiRequest = new ApiRequest - // { - // Path = "/fake/api", - // HTTPMethod = httpMethod, - // Query = query - // }; - - // await apiRequestSender.SendRequestAsync(apiRequest); - - // //httpSenderMock.Verify(sender => sender.SendHttpRequest( - // // It.Is( - // // req => req.RequestUri.PathAndQuery.Contains("/fake/api") - // // && req.Method == httpMethod - // // && req.Headers.Authorization.ToString() == $"Bearer {accessToken}" - // // && req.Content.ReadAsStringAsync().Result.Contains("Item1=Value") - // // ))); - // //httpSenderMock.Verify(sender => sender.SendHttpRequest( - // // It.Is( - // // req => req.RequestUri.PathAndQuery.Contains("/fake/api") - // // && req.Method == HttpMethod.Get - // // && req.Headers.Authorization.ToString() == $"Bearer {accessToken}" - // // && req.RequestUri.Query.Contains("Item1=Value") - // // ))); - // //httpSenderMock.Verify(sender => sender.SendHttpRequest( - // // It.Is( - // // req => req.RequestUri.PathAndQuery.Contains("/fake/api") - // // && req.Method == HttpMethod.Get - // // && req.Headers.Authorization.ToString() == $"Bearer {accessToken}" - // // && req.RequestUri.Query.Contains("Item1=Value") - // // ))); - - - - // ////httpSenderMock.Verify(sender => sender.SendHttpRequest( - // //// It.IsAny() - // ////), Times.Once); - // //httpSenderMock.Verify(sender => sender.SendHttpRequest( - // // It.Is( - // // req => req.RequestUri.PathAndQuery.Contains("/oauth2/token") - // // && req.Method == HttpMethod.Post - // // ) - // //), Times.Once); - - // //httpSenderMock.Verify(sender => sender.SendHttpRequest( - // // It.IsAny() - // //), Times.Exactly(2)); - - // //httpSenderMock.Verify(sender => sender.SendHttpRequest( - // // It.IsAny() - // //), Times.Once); - // } - //} - private IApiRequestSender CreateApiRequestSender(bool hasValidCredentials) { return new ApiRequestSender( diff --git a/Bynder/Test/Api/RequestSender/HttpRequestSenderTest.cs b/Bynder/Test/Api/RequestSender/HttpRequestSenderTest.cs index 3c5f63c..4d6c679 100644 --- a/Bynder/Test/Api/RequestSender/HttpRequestSenderTest.cs +++ b/Bynder/Test/Api/RequestSender/HttpRequestSenderTest.cs @@ -19,8 +19,9 @@ public async Task WhenSuccessReceivedResponseIsReturned() using (var httpListener = new TestHttpListener(HttpStatusCode.OK)) using (var httpRequestSender = new HttpRequestSender()) { - HttpRequestMessage requestMessage = new HttpRequestMessage(HttpMethod.Get, httpListener.ListeningUrl); + var requestMessage = new HttpRequestMessage(HttpMethod.Get, httpListener.ListeningUrl); var response = await httpRequestSender.SendHttpRequest(requestMessage); + Assert.Equal( httpRequestSender.UserAgent, response.RequestMessage.Headers.GetValues("User-Agent").First() @@ -34,7 +35,7 @@ public async Task WhenErrorReceivedAnExceptionIsThown() using (var httpListener = new TestHttpListener(HttpStatusCode.Forbidden)) using (var httpRequestSender = new HttpRequestSender()) { - HttpRequestMessage requestMessage = new HttpRequestMessage(HttpMethod.Get, httpListener.ListeningUrl); + var requestMessage = new HttpRequestMessage(HttpMethod.Get, httpListener.ListeningUrl); var doRequest = httpRequestSender.SendHttpRequest(requestMessage); await Assert.ThrowsAsync(() => doRequest);