summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndrew Arnott <andrewarnott@gmail.com>2013-06-09 18:13:22 -0700
committerAndrew Arnott <andrewarnott@gmail.com>2013-06-09 18:13:22 -0700
commita0d44c1ab0e64450623335d2ce00e6627b195385 (patch)
treedc4635f2d9cebe6a07e1681792032ecb72a71f50 /src
parentf3ae2b709b17c48dbc8a2da2b58f4c5f0a807304 (diff)
downloadDotNetOpenAuth-a0d44c1ab0e64450623335d2ce00e6627b195385.zip
DotNetOpenAuth-a0d44c1ab0e64450623335d2ce00e6627b195385.tar.gz
DotNetOpenAuth-a0d44c1ab0e64450623335d2ce00e6627b195385.tar.bz2
Revert "Fixes the OAuthServiceProvider sample issue with recognizing protected resource requests:"
This reverts commit da9e554cd6364ac1bcf7ab23a8b5fe20e8a26192.
Diffstat (limited to 'src')
-rw-r--r--src/DotNetOpenAuth.Core/Messaging/MessagingUtilities.cs18
-rw-r--r--src/DotNetOpenAuth.OAuth/OAuth/ChannelElements/OAuthChannel.cs3
2 files changed, 1 insertions, 20 deletions
diff --git a/src/DotNetOpenAuth.Core/Messaging/MessagingUtilities.cs b/src/DotNetOpenAuth.Core/Messaging/MessagingUtilities.cs
index 337c86d..4dfddae 100644
--- a/src/DotNetOpenAuth.Core/Messaging/MessagingUtilities.cs
+++ b/src/DotNetOpenAuth.Core/Messaging/MessagingUtilities.cs
@@ -1541,24 +1541,6 @@ namespace DotNetOpenAuth.Messaging {
}
/// <summary>
- /// Reassembles multiple values in an HTTP request header as a comma-delimited list.
- /// </summary>
- /// <param name="headers">The headers from which to read a header.</param>
- /// <param name="headerName">Name of the header to read.</param>
- /// <returns>A comma-delimited list of values for the named header, or <c>null</c> if no header was included in the collection by the specified name.</returns>
- internal static string GetJointValues(this System.Net.Http.Headers.HttpRequestHeaders headers, string headerName) {
- Requires.NotNull(headers, "headers");
- Requires.NotNullOrEmpty(headerName, "headerName");
-
- IEnumerable<string> values;
- if (headers.TryGetValues(headerName, out values)) {
- return string.Join(",", values);
- }
-
- return null;
- }
-
- /// <summary>
/// Gets the URI that contains the entire payload that would be sent by the browser for the specified redirect-based request message.
/// </summary>
/// <param name="response">The redirecting response message.</param>
diff --git a/src/DotNetOpenAuth.OAuth/OAuth/ChannelElements/OAuthChannel.cs b/src/DotNetOpenAuth.OAuth/OAuth/ChannelElements/OAuthChannel.cs
index e68dc63..d606ff0 100644
--- a/src/DotNetOpenAuth.OAuth/OAuth/ChannelElements/OAuthChannel.cs
+++ b/src/DotNetOpenAuth.OAuth/OAuth/ChannelElements/OAuthChannel.cs
@@ -120,8 +120,7 @@ namespace DotNetOpenAuth.OAuth.ChannelElements {
/// <returns>The deserialized message, if one is found. Null otherwise.</returns>
protected override async Task<IDirectedProtocolMessage> ReadFromRequestCoreAsync(HttpRequestMessage request, CancellationToken cancellationToken) {
// First search the Authorization header.
- AuthenticationHeaderValue authorization;
- AuthenticationHeaderValue.TryParse(request.Headers.GetJointValues("Authorization"), out authorization);
+ var authorization = request.Headers.Authorization;
var fields = MessagingUtilities.ParseAuthorizationHeader(Protocol.AuthorizationHeaderScheme, authorization).ToDictionary();
fields.Remove("realm"); // ignore the realm parameter, since we don't use it, and it must be omitted from signature base string.