Merge pull request #80 from dotnetjunky/master

Fix unit tests failing.

1 files changed, 21 insertions, 6 deletions

diff --git a/src/DotNetOpenAuth.AspNet/Clients/OAuth/OAuthClient.cs b/src/DotNetOpenAuth.AspNet/Clients/OAuth/OAuthClient.cs
index 42b960c..bae3f82 100644
--- a/src/DotNetOpenAuth.AspNet/Clients/OAuth/OAuthClient.cs
+++ b/src/DotNetOpenAuth.AspNet/Clients/OAuth/OAuthClient.cs
@@ -11,6 +11,7 @@ namespace DotNetOpenAuth.AspNet.Clients {
 	using DotNetOpenAuth.OAuth;
 	using DotNetOpenAuth.OAuth.ChannelElements;
 	using DotNetOpenAuth.OAuth.Messages;
+    using System.Collections.Generic;
 
 	/// <summary>
 	/// Represents base class for OAuth 1.0 clients
@@ -128,13 +129,27 @@ namespace DotNetOpenAuth.AspNet.Clients {
 				return AuthenticationResult.Failed;
 			}
 
-			// add the access token to the user data dictionary just in case page developers want to use it
 			AuthenticationResult result = this.VerifyAuthenticationCore(response);
-			if (result.IsSuccessful && result.ExtraData != null) {
-				result.ExtraData["accesstoken"] = response.AccessToken;
-			}
-
-			return result;
+            if (result.IsSuccessful && result.ExtraData != null)
+            {
+                // add the access token to the user data dictionary just in case page developers want to use it
+                var wrapExtraData = result.ExtraData.IsReadOnly 
+                    ? new Dictionary<string, string>(result.ExtraData) 
+                    : result.ExtraData;
+                wrapExtraData["accesstoken"] = response.AccessToken;
+
+                AuthenticationResult wrapResult = new AuthenticationResult(
+                    result.IsSuccessful,
+                    result.Provider,
+                    result.ProviderUserId,
+                    result.UserName,
+                    wrapExtraData
+                );
+
+                result = wrapResult;
+            }
+
+            return result;
 		}
 
 		#endregion