Renamed all the OAuth message types.

3 files changed, 17 insertions, 17 deletions

diff --git a/src/DotNetOAuth/ChannelElements/ITokenManager.cs b/src/DotNetOAuth/ChannelElements/ITokenManager.cs
index 878f176..af22d7c 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(GetRequestTokenMessage request, ITokenSecretContainingMessage response);

+		void StoreNewRequestToken(UnauthorizedTokenRequest request, ITokenSecretContainingMessage 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 1bb255e..b628527 100644
--- a/src/DotNetOAuth/ChannelElements/OAuthConsumerMessageTypeProvider.cs
+++ b/src/DotNetOAuth/ChannelElements/OAuthConsumerMessageTypeProvider.cs
@@ -30,7 +30,7 @@ namespace DotNetOAuth.ChannelElements {
 		/// <param name="fields">The name/value pairs that make up the message payload.</param>

 		/// <remarks>

 		/// The request messages are:

-		/// DirectUserToConsumerMessage

+		/// UserAuthorizationResponse

 		/// </remarks>

 		/// <returns>

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

@@ -42,7 +42,7 @@ namespace DotNetOAuth.ChannelElements {
 			}

 

 			if (fields.ContainsKey("oauth_token")) {

-				return typeof(DirectUserToConsumerMessage);

+				return typeof(UserAuthorizationResponse);

 			}

 

 			return null;

@@ -63,8 +63,8 @@ namespace DotNetOAuth.ChannelElements {
 		/// </returns>

 		/// <remarks>

 		/// The response messages are:

-		/// GrantRequestTokenMessage

-		/// GrantAccessTokenMessage

+		/// UnauthorizedTokenResponse

+		/// AuthorizedTokenResponse

 		/// </remarks>

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

 			if (fields == null) {

@@ -82,10 +82,10 @@ namespace DotNetOAuth.ChannelElements {
 				return null;

 			}

 

-			if (request is GetRequestTokenMessage) {

-				return typeof(GrantRequestTokenMessage);

-			} else if (request is GetAccessTokenMessage) {

-				return typeof(GrantAccessTokenMessage);

+			if (request is UnauthorizedTokenRequest) {

+				return typeof(UnauthorizedTokenResponse);

+			} else if (request is AuthorizedTokenRequest) {

+				return typeof(AuthorizedTokenResponse);

 			} else {

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

 				throw new ProtocolException(Strings.InvalidIncomingMessage);

diff --git a/src/DotNetOAuth/ChannelElements/OAuthServiceProviderMessageTypeProvider.cs b/src/DotNetOAuth/ChannelElements/OAuthServiceProviderMessageTypeProvider.cs
index 8632f0f..d056475 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:

-		/// GetRequestTokenMessage

-		/// GetAccessTokenMessage

-		/// DirectUserToServiceProviderMessage

-		/// AccessProtectedResourceMessage

+		/// UnauthorizedTokenRequest

+		/// AuthorizedTokenRequest

+		/// UserAuthorizationRequest

+		/// AccessProtectedResourceRequest

 		/// </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(GetRequestTokenMessage);

+				return typeof(UnauthorizedTokenRequest);

 			}

 

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

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

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

 

-				return tokenTypeIsAccessToken ? typeof(AccessProtectedResourceMessage) :

-					typeof(GetAccessTokenMessage);

+				return tokenTypeIsAccessToken ? typeof(AccessProtectedResourceRequest) :

+					typeof(AuthorizedTokenRequest);

 			}

 

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

-			return typeof(DirectUserToServiceProviderMessage);

+			return typeof(UserAuthorizationRequest);

 		}

 

 		/// <summary>