Renamed a few OAuth messages and a few more methods.

3 files changed, 11 insertions, 11 deletions

diff --git a/src/DotNetOAuth/ChannelElements/ITokenManager.cs b/src/DotNetOAuth/ChannelElements/ITokenManager.cs
index e3b218b..2b8c3b5 100644
--- a/src/DotNetOAuth/ChannelElements/ITokenManager.cs
+++ b/src/DotNetOAuth/ChannelElements/ITokenManager.cs
@@ -42,7 +42,7 @@ namespace DotNetOAuth.ChannelElements {
 		/// <param name="request">The request message that resulted in the generation of a new unauthorized request token.</param>

 		/// <param name="response">The response message that includes the unauthorized request token.</param>

 		/// <exception cref="ArgumentException">Thrown if the consumer key is not registered, or a required parameter was not found in the parameters collection.</exception>

-		void StoreNewRequestToken(RequestTokenMessage request, UnauthorizedRequestTokenMessage response);

+		void StoreNewRequestToken(GetRequestTokenMessage request, GrantRequestTokenMessage response);

 

 		/// <summary>

 		/// Checks whether a given request token has already been authorized

diff --git a/src/DotNetOAuth/ChannelElements/OAuthConsumerMessageTypeProvider.cs b/src/DotNetOAuth/ChannelElements/OAuthConsumerMessageTypeProvider.cs
index af17527..b3cc859 100644
--- a/src/DotNetOAuth/ChannelElements/OAuthConsumerMessageTypeProvider.cs
+++ b/src/DotNetOAuth/ChannelElements/OAuthConsumerMessageTypeProvider.cs
@@ -74,7 +74,7 @@ namespace DotNetOAuth.ChannelElements {
 		/// </returns>

 		/// <remarks>

 		/// The response messages are:

-		/// UnauthorizedRequestTokenMessage

+		/// GrantRequestTokenMessage

 		/// GrantAccessTokenMessage

 		/// </remarks>

 		public virtual Type GetResponseMessageType(IProtocolMessage request, IDictionary<string, string> fields) {

@@ -93,9 +93,9 @@ namespace DotNetOAuth.ChannelElements {
 				return null;

 			}

 

-			if (request is RequestTokenMessage) {

-				return typeof(UnauthorizedRequestTokenMessage);

-			} else if (request is RequestAccessTokenMessage) {

+			if (request is GetRequestTokenMessage) {

+				return typeof(GrantRequestTokenMessage);

+			} else if (request is GetAccessTokenMessage) {

 				return typeof(GrantAccessTokenMessage);

 			} else {

 				Logger.ErrorFormat("Unexpected response message given the request type {0}", request.GetType().Name);

diff --git a/src/DotNetOAuth/ChannelElements/OAuthServiceProviderMessageTypeProvider.cs b/src/DotNetOAuth/ChannelElements/OAuthServiceProviderMessageTypeProvider.cs
index ab9105f..8632f0f 100644
--- a/src/DotNetOAuth/ChannelElements/OAuthServiceProviderMessageTypeProvider.cs
+++ b/src/DotNetOAuth/ChannelElements/OAuthServiceProviderMessageTypeProvider.cs
@@ -41,10 +41,10 @@ namespace DotNetOAuth.ChannelElements {
 		/// <param name="fields">The name/value pairs that make up the message payload.</param>

 		/// <remarks>

 		/// The request messages are:

-		/// RequestTokenMessage

-		/// RequestAccessTokenMessage

+		/// GetRequestTokenMessage

+		/// GetAccessTokenMessage

 		/// DirectUserToServiceProviderMessage

-		/// AccessProtectedResourcesMessage

+		/// AccessProtectedResourceMessage

 		/// </remarks>

 		/// <returns>

 		/// The <see cref="IProtocolMessage"/>-derived concrete class that this message can

@@ -57,7 +57,7 @@ namespace DotNetOAuth.ChannelElements {
 

 			if (fields.ContainsKey("oauth_consumer_key") &&

 				!fields.ContainsKey("oauth_token")) {

-				return typeof(RequestTokenMessage);

+				return typeof(GetRequestTokenMessage);

 			}

 

 			if (fields.ContainsKey("oauth_consumer_key") &&

@@ -67,8 +67,8 @@ namespace DotNetOAuth.ChannelElements {
 				// is in the token parameter.

 				bool tokenTypeIsAccessToken = this.tokenManager.GetTokenType(fields["oauth_token"]) == TokenType.AccessToken;

 

-				return tokenTypeIsAccessToken ? typeof(AccessProtectedResourcesMessage) :

-					typeof(RequestAccessTokenMessage);

+				return tokenTypeIsAccessToken ? typeof(AccessProtectedResourceMessage) :

+					typeof(GetAccessTokenMessage);

 			}

 

 			// fail over to the message with no required fields at all.