ReSharper code cleanup to help get this AspNet contribution into StyleCop compliance.

1 files changed, 45 insertions, 25 deletions

diff --git a/src/DotNetOpenAuth.AspNet/Clients/OAuth/TwitterClient.cs b/src/DotNetOpenAuth.AspNet/Clients/OAuth/TwitterClient.cs
index b147040..ad1a556 100644
--- a/src/DotNetOpenAuth.AspNet/Clients/OAuth/TwitterClient.cs
+++ b/src/DotNetOpenAuth.AspNet/Clients/OAuth/TwitterClient.cs
@@ -7,6 +7,7 @@
 namespace DotNetOpenAuth.AspNet.Clients {
 	using System;
 	using System.Collections.Generic;
+	using System.Diagnostics.CodeAnalysis;
 	using System.IO;
 	using System.Net;
 	using System.Xml.Linq;
@@ -19,48 +20,69 @@ namespace DotNetOpenAuth.AspNet.Clients {
 	/// Represents a Twitter client
 	/// </summary>
 	public class TwitterClient : OAuthClient {
+		#region Constants and Fields
+
 		/// <summary>
 		/// The description of Twitter's OAuth protocol URIs for use with their "Sign in with Twitter" feature.
 		/// </summary>
 		public static readonly ServiceProviderDescription TwitterServiceDescription = new ServiceProviderDescription {
-			RequestTokenEndpoint = new MessageReceivingEndpoint("http://twitter.com/oauth/request_token", HttpDeliveryMethods.GetRequest | HttpDeliveryMethods.AuthorizationHeaderRequest),
-			UserAuthorizationEndpoint = new MessageReceivingEndpoint("http://twitter.com/oauth/authenticate", HttpDeliveryMethods.GetRequest | HttpDeliveryMethods.AuthorizationHeaderRequest),
-			AccessTokenEndpoint = new MessageReceivingEndpoint("http://twitter.com/oauth/access_token", HttpDeliveryMethods.GetRequest | HttpDeliveryMethods.AuthorizationHeaderRequest),
-			TamperProtectionElements = new ITamperProtectionChannelBindingElement[] { new HmacSha1SigningBindingElement() },
+			RequestTokenEndpoint =
+				new MessageReceivingEndpoint(
+					"http://twitter.com/oauth/request_token", 
+					HttpDeliveryMethods.GetRequest | HttpDeliveryMethods.AuthorizationHeaderRequest), 
+			UserAuthorizationEndpoint =
+				new MessageReceivingEndpoint(
+					"http://twitter.com/oauth/authenticate", 
+					HttpDeliveryMethods.GetRequest | HttpDeliveryMethods.AuthorizationHeaderRequest), 
+			AccessTokenEndpoint =
+				new MessageReceivingEndpoint(
+					"http://twitter.com/oauth/access_token", 
+					HttpDeliveryMethods.GetRequest | HttpDeliveryMethods.AuthorizationHeaderRequest), 
+			TamperProtectionElements = new ITamperProtectionChannelBindingElement[] { new HmacSha1SigningBindingElement() }, 
 		};
 
+		#endregion
+
+		#region Constructors and Destructors
+
 		/// <summary>
 		/// Initializes a new instance of the <see cref="TwitterClient"/> class with the specified consumer key and consumer secret.
 		/// </summary>
-		/// <param name="consumerKey">The consumer key.</param>
-		/// <param name="consumerSecret">The consumer secret.</param>
-		[System.Diagnostics.CodeAnalysis.SuppressMessage(
-			"Microsoft.Reliability",
-			"CA2000:Dispose objects before losing scope",
+		/// <param name="consumerKey">
+		/// The consumer key. 
+		/// </param>
+		/// <param name="consumerSecret">
+		/// The consumer secret. 
+		/// </param>
+		[SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", 
 			Justification = "We can't dispose the object because we still need it through the app lifetime.")]
-		public TwitterClient(string consumerKey, string consumerSecret) :
-			base("twitter", TwitterServiceDescription, consumerKey, consumerSecret) {
-		}
+		public TwitterClient(string consumerKey, string consumerSecret)
+			: base("twitter", TwitterServiceDescription, consumerKey, consumerSecret) {}
+
+		#endregion
+
+		#region Methods
 
 		/// <summary>
 		/// Check if authentication succeeded after user is redirected back from the service provider.
 		/// </summary>
-		/// <param name="response">The response token returned from service provider</param>
+		/// <param name="response">
+		/// The response token returned from service provider 
+		/// </param>
 		/// <returns>
-		/// Authentication result
+		/// Authentication result 
 		/// </returns>
-		[System.Diagnostics.CodeAnalysis.SuppressMessage(
-			"Microsoft.Design",
-			"CA1031:DoNotCatchGeneralExceptionTypes",
+		[SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", 
 			Justification = "We don't care if the request for additional data fails.")]
 		protected override AuthenticationResult VerifyAuthenticationCore(AuthorizedTokenResponse response) {
 			string accessToken = response.AccessToken;
 			string userId = response.ExtraData["user_id"];
 			string userName = response.ExtraData["screen_name"];
 
-			string profileRequestUrl = "http://api.twitter.com/1/users/show.xml?user_id=" + MessagingUtilities.EscapeUriDataStringRfc3986(userId);
+			string profileRequestUrl = "http://api.twitter.com/1/users/show.xml?user_id="
+			                           + MessagingUtilities.EscapeUriDataStringRfc3986(userId);
 			var profileEndpoint = new MessageReceivingEndpoint(profileRequestUrl, HttpDeliveryMethods.GetRequest);
-			HttpWebRequest request = WebWorker.PrepareAuthorizedRequest(profileEndpoint, accessToken);
+			HttpWebRequest request = this.WebWorker.PrepareAuthorizedRequest(profileEndpoint, accessToken);
 
 			var extraData = new Dictionary<string, string>();
 			try {
@@ -80,11 +102,9 @@ namespace DotNetOpenAuth.AspNet.Clients {
 			}
 
 			return new AuthenticationResult(
-				isSuccessful: true,
-				provider: ProviderName,
-				providerUserId: userId,
-				userName: userName,
-				extraData: extraData);
+				isSuccessful: true, provider: this.ProviderName, providerUserId: userId, userName: userName, extraData: extraData);
 		}
+
+		#endregion
 	}
-}
\ No newline at end of file
+}