Merge branch 'master' into contracts

Conflicts:
	src/DotNetOpenAuth.Test/Mocks/MockIdentifier.cs
	src/DotNetOpenAuth.Test/OpenId/Provider/OpenIdProviderTests.cs
	src/DotNetOpenAuth.vsmdi
	src/DotNetOpenAuth/DotNetOpenAuth.csproj
	src/DotNetOpenAuth/Messaging/MessageReceivingEndpoint.cs
	src/DotNetOpenAuth/OAuth/ChannelElements/OAuthServiceProviderMessageFactory.cs
	src/DotNetOpenAuth/OAuth/Protocol.cs
	src/DotNetOpenAuth/OAuth/ServiceProvider.cs
	src/DotNetOpenAuth/OpenId/Association.cs
	src/DotNetOpenAuth/OpenId/Behaviors/PpidGeneration.cs
	src/DotNetOpenAuth/OpenId/NoDiscoveryIdentifier.cs
	src/DotNetOpenAuth/OpenId/Provider/HostProcessedRequest.cs
	src/DotNetOpenAuth/OpenId/Provider/IDirectedIdentityIdentifierProvider.cs
	src/DotNetOpenAuth/OpenId/Provider/PrivatePersonalIdentifierProviderBase.cs
	src/DotNetOpenAuth/OpenId/Realm.cs
	src/DotNetOpenAuth/OpenId/RelyingParty/AuthenticationRequest.cs
	src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdAjaxTextBox.cs
	src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingPartyAjaxControlBase.cs
	src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdTextBox.cs
	src/DotNetOpenAuth/OpenId/RelyingParty/PositiveAuthenticationResponseSnapshot.cs
	src/DotNetOpenAuth/OpenId/UriIdentifier.cs
	src/DotNetOpenAuth/OpenId/XriIdentifier.cs
	src/DotNetOpenAuth/Util.cs

1 files changed, 117 insertions, 0 deletions

diff --git a/samples/OpenIdProviderWebForms/Code/InMemoryTokenManager.cs b/samples/OpenIdProviderWebForms/Code/InMemoryTokenManager.cs
new file mode 100644
index 0000000..b04f736
--- /dev/null
+++ b/samples/OpenIdProviderWebForms/Code/InMemoryTokenManager.cs
@@ -0,0 +1,117 @@
+//-----------------------------------------------------------------------
+// <copyright file="InMemoryTokenManager.cs" company="Andrew Arnott">
+//     Copyright (c) Andrew Arnott. All rights reserved.
+// </copyright>
+//-----------------------------------------------------------------------
+
+namespace OpenIdProviderWebForms.Code {
+	using System;
+	using System.Collections.Generic;
+	using System.Linq;
+	using System.Web;
+	using DotNetOpenAuth.OAuth.ChannelElements;
+	using DotNetOpenAuth.OAuth.Messages;
+	using DotNetOpenAuth.OpenId.Extensions.OAuth;
+
+	/// <summary>
+	/// A simple in-memory token manager.  JUST FOR PURPOSES OF KEEPING THE SAMPLE SIMPLE.
+	/// </summary>
+	/// <remarks>
+	/// This is merely a sample app.  A real web app SHOULD NEVER store a memory-only
+	/// token manager in application.  It should be an IServiceProviderTokenManager
+	/// implementation that is bound to a database.
+	/// </remarks>
+	public class InMemoryTokenManager : IServiceProviderTokenManager, IOpenIdOAuthTokenManager, ICombinedOpenIdProviderTokenManager {
+		private Dictionary<string, InMemoryServiceProviderRequestToken> requestTokens = new Dictionary<string, InMemoryServiceProviderRequestToken>();
+		private Dictionary<string, InMemoryServiceProviderAccessToken> accessTokens = new Dictionary<string, InMemoryServiceProviderAccessToken>();
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="InMemoryTokenManager"/> class.
+		/// </summary>
+		internal InMemoryTokenManager() {
+		}
+
+		#region IServiceProviderTokenManager Members
+
+		public IConsumerDescription GetConsumer(string consumerKey) {
+			return new InMemoryConsumerDescription {
+				Key = consumerKey,
+				Secret = "some crazy secret",
+			};
+		}
+
+		public IServiceProviderRequestToken GetRequestToken(string token) {
+			return this.requestTokens[token];
+		}
+
+		public IServiceProviderAccessToken GetAccessToken(string token) {
+			throw new NotImplementedException();
+		}
+
+		public void UpdateToken(IServiceProviderRequestToken token) {
+			// Nothing to do here, since there's not database in this sample.
+		}
+
+		#endregion
+
+		#region ITokenManager Members
+
+		public string GetTokenSecret(string token) {
+			if (this.requestTokens.ContainsKey(token)) {
+				return this.requestTokens[token].Secret;
+			} else {
+				return this.accessTokens[token].Secret;
+			}
+		}
+
+		public void StoreNewRequestToken(DotNetOpenAuth.OAuth.Messages.UnauthorizedTokenRequest request, DotNetOpenAuth.OAuth.Messages.ITokenSecretContainingMessage response) {
+			throw new NotImplementedException();
+		}
+
+		public bool IsRequestTokenAuthorized(string requestToken) {
+			// In OpenID+OAuth scenarios, request tokens are always authorized.
+			return true;
+		}
+
+		public void ExpireRequestTokenAndStoreNewAccessToken(string consumerKey, string requestToken, string accessToken, string accessTokenSecret) {
+			this.requestTokens.Remove(requestToken);
+			this.accessTokens[accessToken] = new InMemoryServiceProviderAccessToken {
+				Token = accessToken,
+				Secret = accessTokenSecret,
+			};
+		}
+
+		public TokenType GetTokenType(string token) {
+			if (this.requestTokens.ContainsKey(token)) {
+				return TokenType.RequestToken;
+			} else if (this.accessTokens.ContainsKey(token)) {
+				return TokenType.AccessToken;
+			} else {
+				return TokenType.InvalidToken;
+			}
+		}
+
+		#endregion
+
+		#region IOpenIdOAuthTokenManager Members
+
+		public void StoreOpenIdAuthorizedRequestToken(string consumerKey, AuthorizationApprovedResponse authorization) {
+			this.requestTokens[authorization.RequestToken] = new InMemoryServiceProviderRequestToken {
+				Token = authorization.RequestToken,
+				Scope = authorization.Scope,
+				ConsumerVersion = authorization.Version,
+			};
+		}
+
+		#endregion
+
+		#region ICombinedOpenIdProviderTokenManager Members
+
+		public string GetConsumerKey(DotNetOpenAuth.OpenId.Realm realm) {
+			// We just use the realm as the consumer key, like Google does.
+			return realm;
+		}
+
+		#endregion
+	}
+}