Merge branch 'master' into contracts

Conflicts:
	src/DotNetOpenAuth.vsmdi
	src/DotNetOpenAuth/Configuration/TypeConfigurationCollection.cs
	src/DotNetOpenAuth/Configuration/TypeConfigurationElement.cs
	src/DotNetOpenAuth/DotNetOpenAuth.csproj
	src/DotNetOpenAuth/Messaging/HttpRequestInfo.cs
	src/DotNetOpenAuth/Messaging/Reflection/MessagePart.cs
	src/DotNetOpenAuth/Messaging/Reflection/ValueMapping.cs
	src/DotNetOpenAuth/OAuth/ChannelElements/OAuthChannel.cs
	src/DotNetOpenAuth/OAuth/ConsumerBase.cs
	src/DotNetOpenAuth/OAuth/Messages/MessageBase.cs
	src/DotNetOpenAuth/OAuth/Messages/UnauthorizedTokenResponse.cs
	src/DotNetOpenAuth/OAuth/ServiceProvider.cs
	src/DotNetOpenAuth/OpenId/Protocol.cs
	src/DotNetOpenAuth/OpenId/Provider/AutoResponsiveRequest.cs
	src/DotNetOpenAuth/OpenId/Provider/HostProcessedRequest.cs
	src/DotNetOpenAuth/OpenId/Provider/IHostProcessedRequest.cs
	src/DotNetOpenAuth/OpenId/Provider/Request.cs
	src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingParty.cs
	src/DotNetOpenAuth/OpenId/RelyingParty/ServiceEndpoint.cs

1 files changed, 22 insertions, 3 deletions

diff --git a/samples/OpenIdProviderMvc/Code/AnonymousIdentifierProvider.cs b/samples/OpenIdProviderMvc/Code/AnonymousIdentifierProvider.cs
index 2b9e01c..6dc210d 100644
--- a/samples/OpenIdProviderMvc/Code/AnonymousIdentifierProvider.cs
+++ b/samples/OpenIdProviderMvc/Code/AnonymousIdentifierProvider.cs
@@ -1,15 +1,29 @@
 namespace OpenIdProviderMvc.Code {
 	using System;
 	using System.Web.Security;
-	using DotNetOpenAuth.ApplicationBlock.Provider;
 	using DotNetOpenAuth.OpenId;
+	using DotNetOpenAuth.OpenId.Provider;
 	using OpenIdProviderMvc.Models;
 
-	internal class AnonymousIdentifierProvider : AnonymousIdentifierProviderBase {
+	internal class AnonymousIdentifierProvider : PrivatePersonalIdentifierProviderBase {
+		/// <summary>
+		/// Initializes a new instance of the <see cref="AnonymousIdentifierProvider"/> class.
+		/// </summary>
 		internal AnonymousIdentifierProvider()
 			: base(Util.GetAppPathRootedUri("anon?id=")) {
 		}
 
+		/// <summary>
+		/// Gets the salt to use for generating an anonymous identifier for a given OP local identifier.
+		/// </summary>
+		/// <param name="localIdentifier">The OP local identifier.</param>
+		/// <returns>The salt to use in the hash.</returns>
+		/// <remarks>
+		/// It is important that this method always return the same value for a given
+		/// <paramref name="localIdentifier"/>.
+		/// New salts can be generated for local identifiers without previously assigned salt
+		/// values by calling <see cref="CreateSalt"/> or by a custom method.
+		/// </remarks>
 		protected override byte[] GetHashSaltForLocalIdentifier(Identifier localIdentifier) {
 			// This is just a sample with no database... a real web app MUST return 
 			// a reasonable salt here and have that salt be persistent for each user.
@@ -17,7 +31,12 @@
 			string username = User.GetUserFromClaimedIdentifier(new Uri(localIdentifier));
 			string salt = membership.GetSalt(username);
 			return Convert.FromBase64String(salt);
-			////return AnonymousIdentifierProviderBase.GetNewSalt(5);
+
+			// If users were encountered without a salt, one could be generated like this,
+			// and would also need to be saved to the user's account.
+			//// var newSalt = AnonymousIdentifierProviderBase.GetNewSalt(5);
+			//// user.Salt = newSalt;
+			//// return newSalt;
 		}
 	}
 }