Try to fix RavenDB-1633

ravendb · Feb 4, 2014 · 64fb9dd · 64fb9dd
1 parent 03efd09
commit 64fb9dd
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/Raven.Abstractions/OAuth/SecuredAuthenticator.cs b/Raven.Abstractions/OAuth/SecuredAuthenticator.cs
@@ -194,8 +194,23 @@ public async Task<Action<HttpWebRequest>> DoOAuthRequestAsync(string oauthSource
 						return (Action<HttpWebRequest>)(request => SetHeader(request.Headers, "Authorization", CurrentOauthToken));
 					}
 				}
-				catch (WebException ex)
+				catch (Exception e)
 				{
+					WebException ex;
+
+					var ae = e as AggregateException;
+					if (ae != null)
+					{
+						ex = ae.ExtractSingleInnerException() as WebException;
+					}
+					else
+					{
+						ex = e as WebException;
+					}
+
+					if (ex == null)
+						throw;
+
 					if (tries > 2)
 						// We've already tried three times and failed
 						throw;
@@ -222,6 +237,7 @@ public async Task<Action<HttpWebRequest>> DoOAuthRequestAsync(string oauthSource
 				}
 			}
 		}
+
 #if SILVERLIGHT
 		private void BrowserCookieToAllowUserToUseStandardRequests(string baseUrl, string currentOauthToken)
 		{

diff --git a/Raven.Client.Silverlight/Connection/HttpJsonRequest.cs b/Raven.Client.Silverlight/Connection/HttpJsonRequest.cs
@@ -212,9 +212,8 @@ private async Task<string> ReadResponseStringAsync()
                         }
                         break;
                     case HttpStatusCode.Forbidden:
-                        HandleForbiddenResponseAsync(webResponse);
-                        break;
-                    case HttpStatusCode.PreconditionFailed:
+					case HttpStatusCode.PreconditionFailed:
+						HandleForbiddenResponseAsync(webResponse);
                         break;
                 }
                 if (authorizeResponse == null)
@@ -294,9 +293,8 @@ public async Task<byte[]> ReadResponseBytesAsync()
                         }
                         break;
                     case HttpStatusCode.Forbidden:
-                        HandleForbiddenResponseAsync(webResponse);
-                        break;
-                    case HttpStatusCode.PreconditionFailed:
+					case HttpStatusCode.PreconditionFailed:
+						HandleForbiddenResponseAsync(webResponse);
                         break;
                 }
                 if (authorizeResponse == null)