* Applied patch from todd for issue #7 (http://code.google.com/p/devdefined-tools/issues/detail?id=7) with minor tweaks. Note: exception handling functionality may be reviewed in the future.

Author: bittercoder

DevDefined.OAuth/Consumer/ConsumerRequest.cs

@@ -31,7 +31,6 @@
 using System.Web;
 using System.Xml.Linq;
 using DevDefined.OAuth.Framework;
-using DevDefined.OAuth.Utility;
 
 namespace DevDefined.OAuth.Consumer
 {
@@ -48,6 +47,8 @@ public ConsumerRequest(IOAuthContext context, IOAuthConsumerContext consumerCont
       _token = token;
     }
 
+    #region IConsumerRequest Members
+
     public IOAuthConsumerContext ConsumerContext
     {
       get { return _consumerContext; }
@@ -66,11 +67,11 @@ public XDocument ToDocument()
     public byte[] ToBytes()
     {
       return FromStream(delegate(Stream stream)
-        {
-          var buffer = new byte[stream.Length];
-          stream.Read(buffer, 0, buffer.Length);
-          return buffer;
-        });
+                          {
+                            var buffer = new byte[stream.Length];
+                            stream.Read(buffer, 0, buffer.Length);
+                            return buffer;
+                          });
     }
 
     public HttpWebRequest ToWebRequest()
@@ -117,10 +118,10 @@ public RequestDescription GetRequestDescription()
       Uri uri = _context.GenerateUri();
 
       var description = new RequestDescription
-        {
-          Url = uri,
-          Method = _context.RequestMethod
-        };
+                          {
+                            Url = uri,
+                            Method = _context.RequestMethod
+                          };
 
       if ((_context.FormEncodedParameters != null) && (_context.FormEncodedParameters.Count > 0))
       {
@@ -141,15 +142,15 @@ public HttpWebResponse ToWebResponse()
       try
       {
         HttpWebRequest request = ToWebRequest();
-        return (HttpWebResponse)request.GetResponse();      
+        return (HttpWebResponse) request.GetResponse();
       }
       catch (WebException webEx)
       {
-        OAuthException authException;
+        Exception wrappedException;
 
-        if (WebExceptionHelper.TryWrapException(Context, webEx, out authException))
+        if (WebExceptionHelper.TryWrapException(Context, webEx, out wrappedException))
         {
-          throw authException;
+          throw wrappedException;
         }
 
         throw;
@@ -196,6 +197,8 @@ public IConsumerRequest SignWithToken(IToken token)
       return this;
     }
 
+    #endregion
+
     public override string ToString()
     {
       return FromStream(stream => new StreamReader(stream).ReadToEnd());

DevDefined.OAuth/Consumer/WebExceptionHelper.cs

@@ -1,36 +1,43 @@
-using System.Net;
+using System;
+using System.Net;
 using DevDefined.OAuth.Framework;
 using DevDefined.OAuth.Utility;
 
 namespace DevDefined.OAuth.Consumer
 {
-  public static class WebExceptionHelper
-  {
-    /// <summary>
-    /// Will attempt to wrap the exception, returning true if the exception was wrapped, or returning false if it was not (in which case
-    /// the original exception should be thrown).
-    /// </summary>
-    /// <param name="requestContext"></param>
-    /// <param name="webEx"></param>
-    /// <param name="authException"></param>
-    /// <returns><c>true</c>, if the authException should be throw, <c>false</c> if the original web exception should be thrown</returns>
-    public static bool TryWrapException(IOAuthContext requestContext, WebException webEx, out OAuthException authException)
+    public static class WebExceptionHelper
     {
-      try
-      {
-        string content = webEx.Response.ReadToEnd();
-        if (content.Contains(Parameters.OAuth_Problem))
+        /// <summary>
+        /// Will attempt to wrap the exception, returning true if the exception was wrapped, or returning false if it was not (in which case
+        /// the original exception should be thrown).
+        /// </summary>
+        /// <param name="requestContext"></param>
+        /// <param name="webException"></param>
+        /// <param name="wrappedException">The wrapped exception (will be set to the webException, if this method returns <c>false</c></param>
+        /// <returns><c>true</c>, if the authException should be throw, <c>false</c> if the wrapped web exception should be thrown</returns>
+        public static bool TryWrapException(IOAuthContext requestContext, WebException webException, out Exception wrappedException)
         {
-          var report = new OAuthProblemReport(content);
-          authException = new OAuthException(report.ProblemAdvice ?? report.Problem, webEx) {Context = requestContext, Report = report};
-          return true;
+            try
+            {
+                string content = webException.Response.ReadToEnd();
+
+                if (content.Contains(Parameters.OAuth_Problem))
+                {
+                  var report = new OAuthProblemReport(content);
+                  wrappedException = new OAuthException(report.ProblemAdvice ?? report.Problem, webException) { Context = requestContext, Report = report };
+                }
+                else
+                {
+                  wrappedException = new ParsedWebException(content, webException.Message, webException.GetBaseException(), webException.Status, webException.Response);
+                }
+
+                return true;
+            }
+            catch
+            {
+              wrappedException = webException;
+              return false;
+            }          
         }
-      }
-      catch
-      {
-      }
-      authException = new OAuthException();
-      return false;
     }
-  }
 }

DevDefined.OAuth/DevDefined.OAuth.csproj

@@ -80,6 +80,7 @@
     <Compile Include="Framework\IConsumer.cs" />
     <Compile Include="Framework\INonceGenerator.cs" />
     <Compile Include="Framework\IOAuthContext.cs" />
+    <Compile Include="Framework\ParsedWebException.cs" />
     <Compile Include="Framework\Signing\IOAuthContextSigner.cs" />
     <Compile Include="Framework\IToken.cs" />
     <Compile Include="Framework\OAuthException.cs" />

DevDefined.OAuth/Framework/ParsedWebException.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Net;
+
+namespace DevDefined.OAuth.Framework
+{
+    /// <summary>
+    /// Extends WebException.  Calls to the underlying Response.GetResponseStream() will fail since the response body has already been read, 
+    /// so the body is included in the property <see cref="ResponseContent" /> instead.
+    /// </summary>
+    public class ParsedWebException : WebException
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="T:System.Net.WebException"/> class with the specified error message, nested exception, status, and response.
+        /// </summary>
+        /// <param name="content">The resposne body content</param>
+        /// <param name="message">The text of the error message.</param>
+        /// <param name="innerException">A nested exception.</param>
+        /// <param name="status">One of the <see cref="T:System.Net.WebExceptionStatus"/> values.</param>
+        /// <param name="response">A <see cref="T:System.Net.WebResponse"/> instance that contains the response from the remote host.</param>
+        public ParsedWebException(string content, string message, Exception innerException, WebExceptionStatus status, WebResponse response) 
+          : base(message, innerException, status, response)
+        {
+            ResponseContent = content;
+        }
+
+        /// <summary>
+        /// The response body content
+        /// </summary>
+        public string ResponseContent { get; private set; }
+    }
+}