-
Notifications
You must be signed in to change notification settings - Fork 247
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update master from dev since we've published. (#300)
* expose HttpProvider internal constructor with param HttpMessageHandle… (#289) * expose HttpProvider internal constructor with param HttpMessageHandler to public * Update HttpProviderTests.cs * add unit tests * Add Dispose method to RedirectHander and Xunit tests for RedirectHandler * 1. Update RedirectHandler SendAsync method 2. Add RedriectHandlerTests for RedirectHandler in Microsoft.Graph.Core.Test with Mstest framework 3. Update RedirecthHandlerTests for RedirecthHandler in Microsoft.Graph.DotnetCore.Core.Test to test excpetioons thrown. * 1. Update CopyRequest Method for setting content 1. Update IsRedirect Method to be more explicit 3. Update SendAsync for re-issue request and removeAuth 4. Add tests for updates * 1. change Dispose Method and typo in comments 2. remove ref * remove ref * remove NuGetPackageImportStamp * disable PlannerTests * move copy content into CopyRequest Method * remove unnessary dispose and fix typo * remove unused comments and fix tests issues. * Generated new files that support the Security API, updates to the Intune API, Insights functionality on the user, MailTips, update to the subscription entity and additional documentation comments that will be used in the IntelliSense file. (#298) * Updated copyright, version, and release notes. (#299) * updated copyright per requirements * Updated spec for build and packaging.
- Loading branch information
1 parent
044880e
commit 8fb11a7
Showing
270 changed files
with
13,549 additions
and
449 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,151 @@ | ||
| // ------------------------------------------------------------------------------ | ||
| // Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information. | ||
| // ------------------------------------------------------------------------------ | ||
|
|
||
| namespace Microsoft.Graph | ||
| { | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Net.Http; | ||
| using System.Text; | ||
| using System.Net.Http.Headers; | ||
| using System.Threading; | ||
| using System.Threading.Tasks; | ||
| using System.Net; | ||
| using System.IO; | ||
|
|
||
| /// <summary> | ||
| /// An <see cref="DelegatingHandler"/> implementation using standard .NET libraries. | ||
| /// </summary> | ||
| public class RedirectHandler : DelegatingHandler | ||
| { | ||
|
|
||
| private const int maxRedirects = 5; | ||
|
|
||
| /// <summary> | ||
| /// Constructs a new <see cref="RedirectHandler"/> | ||
| /// </summary> | ||
| /// <param name="innerHandler">An HTTP message handler to pass to the <see cref="HttpMessageHandler"/> for sending requests.</param> | ||
| public RedirectHandler(HttpMessageHandler innerHandler) | ||
| { | ||
| InnerHandler = innerHandler; | ||
| } | ||
|
|
||
|
|
||
| /// <summary> | ||
| /// Sends the Request | ||
| /// </summary> | ||
| /// <param name="request">The <see cref="HttpRequestMessage"/> to send.</param> | ||
| /// <param name="cancellationToken">The <see cref="CancellationToken"/>for the request.</param> | ||
| /// <returns>The <see cref="HttpResponseMessage"/>.</returns> | ||
| protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) | ||
| { | ||
|
|
||
| // send request first time to get response | ||
| var response = await base.SendAsync(request, cancellationToken); | ||
|
|
||
| // check response status code | ||
| if (IsRedirect(response.StatusCode)) | ||
| { | ||
|
|
||
| var redirectCount = 0; | ||
|
|
||
| while (redirectCount < maxRedirects) | ||
| { | ||
| // general copy request with internal CopyRequest(see copyRequest for details) method | ||
| var newRequest = await CopyRequest(response.RequestMessage); | ||
|
|
||
| // status code == 303: change request method from post to get and content to be null | ||
| if (response.StatusCode == HttpStatusCode.SeeOther) | ||
| { | ||
| newRequest.Content = null; | ||
| newRequest.Method = HttpMethod.Get; | ||
| } | ||
|
|
||
| // Set newRequestUri from response | ||
| newRequest.RequestUri = response.Headers.Location; | ||
|
|
||
| // Remove Auth if http request's scheme or host changes | ||
| if (String.Compare(newRequest.RequestUri.Host, request.RequestUri.Host, StringComparison.OrdinalIgnoreCase) != 0 || | ||
| !newRequest.RequestUri.Scheme.Equals(request.RequestUri.Scheme)) | ||
| { | ||
| newRequest.Headers.Authorization = null; | ||
| } | ||
|
|
||
| // Send redirect request to get reponse | ||
| response = await base.SendAsync(newRequest, cancellationToken); | ||
|
|
||
| // Check response status code | ||
| if (!IsRedirect(response.StatusCode)) | ||
| { | ||
| return response; | ||
| } | ||
| redirectCount++; | ||
| } | ||
| throw new ServiceException( | ||
| new Error | ||
| { | ||
| Code = ErrorConstants.Codes.TooManyRedirects, | ||
| Message = string.Format(ErrorConstants.Messages.TooManyRedirectsFormatString, redirectCount) | ||
| }); | ||
|
|
||
| } | ||
| return response; | ||
|
|
||
| } | ||
|
|
||
| /// <summary> | ||
| /// Create a new HTTP request by copying previous HTTP request's headers and properties from response's request message. | ||
| /// </summary> | ||
| /// <param name="originalRequest">The previous <see cref="HttpRequestMessage"/> needs to be copy.</param> | ||
| /// <returns>The <see cref="HttpRequestMessage"/>.</returns> | ||
| /// <remarks> | ||
| /// Re-issue a new HTTP request with the previous request's headers and properities | ||
| /// </remarks> | ||
| internal async Task<HttpRequestMessage> CopyRequest(HttpRequestMessage originalRequest) | ||
| { | ||
| var newRequest = new HttpRequestMessage(originalRequest.Method, originalRequest.RequestUri); | ||
|
|
||
| foreach (var header in originalRequest.Headers) | ||
| { | ||
| newRequest.Headers.TryAddWithoutValidation(header.Key, header.Value); | ||
| } | ||
|
|
||
| foreach (var property in originalRequest.Properties) | ||
| { | ||
| newRequest.Properties.Add(property); | ||
| } | ||
|
|
||
| // Set Content if previous request contains | ||
| if (originalRequest.Content != null && originalRequest.Content.Headers.ContentLength != 0) | ||
| { | ||
| newRequest.Content = new StreamContent(await originalRequest.Content.ReadAsStreamAsync()); | ||
| } | ||
|
|
||
| return newRequest; | ||
| } | ||
|
|
||
|
|
||
| /// <summary> | ||
| /// Checks whether <see cref="HttpStatusCode"/> is redirected | ||
| /// </summary> | ||
| /// <param name="statusCode">The <see cref="HttpStatusCode"/>.</param> | ||
| /// <returns>Bool value for redirection or not</returns> | ||
| private bool IsRedirect(HttpStatusCode statusCode) | ||
| { | ||
| if (statusCode == HttpStatusCode.MovedPermanently || | ||
| statusCode == HttpStatusCode.Found || | ||
| statusCode == HttpStatusCode.SeeOther || | ||
| statusCode == HttpStatusCode.TemporaryRedirect || | ||
| statusCode == (HttpStatusCode)308 | ||
| ) | ||
| { | ||
| return true; | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
|
|
||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.