Updated to "Bearer Tokens draft 6" spec.

2 files changed, 1 insertions, 5 deletions

diff --git a/src/DotNetOpenAuth/OAuth2/ChannelElements/OAuth2ResourceServerChannel.cs b/src/DotNetOpenAuth/OAuth2/ChannelElements/OAuth2ResourceServerChannel.cs
index 59f536e..94df1a8 100644
--- a/src/DotNetOpenAuth/OAuth2/ChannelElements/OAuth2ResourceServerChannel.cs
+++ b/src/DotNetOpenAuth/OAuth2/ChannelElements/OAuth2ResourceServerChannel.cs
@@ -137,10 +137,6 @@ namespace DotNetOpenAuth.OAuth2.ChannelElements {
 				var contentType = new ContentType(request.Headers[HttpRequestHeader.ContentType]);
 				if (string.Equals(contentType.MediaType, HttpFormUrlEncoded, StringComparison.Ordinal)) {
 					if (request.Form[Protocol.BearerTokenEncodedUrlParameterName] != null) {
-						// We're only interested in the oauth_token parameter -- not the others that can appear in an Authorization header.
-						// Note that we intentionally change the name of the key here
-						// because depending on the method used to obtain the token, the token's key changes
-						// but we need to consolidate to one name so it works with the rest of the system.
 						return request.Form[Protocol.BearerTokenEncodedUrlParameterName];
 					}
 				}
diff --git a/src/DotNetOpenAuth/OAuth2/Protocol.cs b/src/DotNetOpenAuth/OAuth2/Protocol.cs
index d9d7dd2..2b50439 100644
--- a/src/DotNetOpenAuth/OAuth2/Protocol.cs
+++ b/src/DotNetOpenAuth/OAuth2/Protocol.cs
@@ -42,7 +42,7 @@ namespace DotNetOpenAuth.OAuth2 {
 		/// The name of the parameter whose value is an OAuth 2.0 bearer access token, as it is defined
 		/// in a URL-encoded POST entity or URL query string.
 		/// </summary>
-		internal const string BearerTokenEncodedUrlParameterName = "bearer_token";
+		internal const string BearerTokenEncodedUrlParameterName = "access_token";
 
 		/// <summary>
 		/// The "type" string.