1 files changed, 20 insertions, 33 deletions
diff --git a/src/DotNetOAuth/Messages/RequestTokenMessage.cs b/src/DotNetOAuth/Messages/RequestTokenMessage.cs
index e327e72..4d47db0 100644
--- a/src/DotNetOAuth/Messages/RequestTokenMessage.cs
+++ b/src/DotNetOAuth/Messages/RequestTokenMessage.cs
@@ -9,44 +9,31 @@ namespace DotNetOAuth.Messages {
 	using System.Runtime.Serialization;
 	using DotNetOAuth.Messaging;
 
-	internal class RequestTokenMessage : MessageBase, IDirectedProtocolMessage {
-		private Uri serviceProvider;
-
-		internal RequestTokenMessage(Uri serviceProvider) {
-			if (serviceProvider == null) {
-				throw new ArgumentNullException("serviceProvider");
-			}
-
-			this.serviceProvider = serviceProvider;
+	/// <summary>
+	/// A direct message sent from Consumer to Service Provider to request a token.
+	/// </summary>
+	internal class RequestTokenMessage : MessageBase {
+		/// <summary>
+		/// Initializes a new instance of the <see cref="RequestTokenMessage"/> class.
+		/// </summary>
+		/// <param name="serviceProvider">The URI of the Service Provider endpoint to send this message to.</param>
+		internal RequestTokenMessage(Uri serviceProvider)
+			: base(MessageProtection.All, MessageTransport.Direct, serviceProvider) {
 		}
 
+		/// <summary>
+		/// Gets or sets the consumer key.
+		/// </summary>
 		[MessagePart(Name = "oauth_consumer_key", IsRequired = true)]
 		public string ConsumerKey { get; set; }
-		[MessagePart(Name = "oauth_signature_method", IsRequired = true)]
-		public string SignatureMethod { get; set; }
-		[MessagePart(Name = "oauth_signature", IsRequired = true)]
-		public string Signature { get; set; }
-		[MessagePart(Name = "oauth_timestamp", IsRequired = true)]
-		public Uri Timestamp { get; set; }
-		[MessagePart(Name = "oauth_nonce", IsRequired = true)]
-		public Uri Nonce { get; set; }
-		[MessagePart(Name = "oauth_version", IsRequired = false)]
-		public Uri Version { get; set; }
-
-		protected override MessageTransport Transport {
-			get { return MessageTransport.Direct; }
-		}
 
-		protected override MessageProtection RequiredProtection {
-			get { return MessageProtection.All; }
-		}
-
-		#region IDirectedProtocolMessage Members
-
-		Uri IDirectedProtocolMessage.Recipient {
-			get { return this.serviceProvider; }
+		/// <summary>
+		/// Gets or sets the protocol version used in the construction of this message.
+		/// </summary>
+		[MessagePart(Name = "oauth_version", IsRequired = false)]
+		public string Version {
+			get { return this.VersionString; }
+			set { this.VersionString = value; }
 		}
-
-		#endregion
 	}
 }