OAuth 2.0 web flow now works, client, auth server, and resource server, in the sample!

Yay.

4 files changed, 10 insertions, 7 deletions

diff --git a/src/DotNetOpenAuth/OAuth/ChannelElements/OAuthPrincipal.cs b/src/DotNetOpenAuth/OAuth/ChannelElements/OAuthPrincipal.cs
index 025ef09..48fe813 100644
--- a/src/DotNetOpenAuth/OAuth/ChannelElements/OAuthPrincipal.cs
+++ b/src/DotNetOpenAuth/OAuth/ChannelElements/OAuthPrincipal.cs
@@ -51,7 +51,7 @@ namespace DotNetOpenAuth.OAuth.ChannelElements {
 		/// </summary>
 		/// <param name="username">The username.</param>
 		/// <param name="roles">The roles this user belongs to.</param>
-		internal OAuthPrincipal(string username, string[] roles)
+		public OAuthPrincipal(string username, string[] roles)
 			: this(new OAuthIdentity(username), roles) {
 		}
 
diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/AccessProtectedResourceRequest.cs b/src/DotNetOpenAuth/OAuthWrap/Messages/AccessProtectedResourceRequest.cs
index 1f2efaa..dfdacb7 100644
--- a/src/DotNetOpenAuth/OAuthWrap/Messages/AccessProtectedResourceRequest.cs
+++ b/src/DotNetOpenAuth/OAuthWrap/Messages/AccessProtectedResourceRequest.cs
@@ -18,7 +18,7 @@ namespace DotNetOpenAuth.OAuthWrap.Messages {
 		/// </summary>
 		/// <param name="version">The version.</param>
 		/// <param name="recipient">The recipient.</param>
-		internal AccessProtectedResourceRequest(Version version, Uri recipient)
+		internal AccessProtectedResourceRequest(Uri recipient, Version version)
 			: base(version, MessageTransport.Direct, recipient) {
 		}
 
diff --git a/src/DotNetOpenAuth/OAuthWrap/StandardAccessTokenAnalyzer.cs b/src/DotNetOpenAuth/OAuthWrap/StandardAccessTokenAnalyzer.cs
index 5eaa1e5..3797cba 100644
--- a/src/DotNetOpenAuth/OAuthWrap/StandardAccessTokenAnalyzer.cs
+++ b/src/DotNetOpenAuth/OAuthWrap/StandardAccessTokenAnalyzer.cs
@@ -14,13 +14,15 @@ namespace DotNetOpenAuth.OAuthWrap {
 	using DotNetOpenAuth.Messaging;
 	using DotNetOpenAuth.OAuthWrap.ChannelElements;
 
-	internal class StandardAccessTokenAnalyzer : IAccessTokenAnalyzer {
-		internal StandardAccessTokenAnalyzer() {
+	public class StandardAccessTokenAnalyzer : IAccessTokenAnalyzer {
+		public StandardAccessTokenAnalyzer(RSAParameters authorizationServerPublicSigningKey, RSAParameters resourceServerPrivateEncryptionKey) {
+			this.AuthorizationServerPublicSigningKey = authorizationServerPublicSigningKey;
+			this.ResourceServerPrivateEncryptionKey = resourceServerPrivateEncryptionKey;
 		}
 
-		internal RSAParameters AuthorizationServerPublicSigningKey { get; set; }
+		public RSAParameters AuthorizationServerPublicSigningKey { get; private set; }
 
-		internal RSAParameters ResourceServerPrivateEncryptionKey { get; set; }
+		public RSAParameters ResourceServerPrivateEncryptionKey { get; private set; }
 
 		public bool TryValidateAccessToken(string accessToken, out string user, out string scope) {
 			var token = AccessToken.Decode(this.AuthorizationServerPublicSigningKey, this.ResourceServerPrivateEncryptionKey, accessToken);
diff --git a/src/DotNetOpenAuth/OAuthWrap/WebAppClient.cs b/src/DotNetOpenAuth/OAuthWrap/WebAppClient.cs
index 1847886..e351198 100644
--- a/src/DotNetOpenAuth/OAuthWrap/WebAppClient.cs
+++ b/src/DotNetOpenAuth/OAuthWrap/WebAppClient.cs
@@ -52,7 +52,8 @@ namespace DotNetOpenAuth.OAuthWrap {
 			Contract.Ensures(Contract.Result<WebAppRequest>().Callback == authorization.Callback);
 
 			if (authorization.Callback == null) {
-				authorization.Callback = this.Channel.GetRequestFromContext().UrlBeforeRewriting;
+				authorization.Callback = this.Channel.GetRequestFromContext().UrlBeforeRewriting
+					.StripMessagePartsFromQueryString(this.Channel.MessageDescriptions.Get(typeof(WebAppSuccessResponse), Protocol.Default.Version));
 				authorization.SaveChanges();
 			}