1 files changed, 19 insertions, 2 deletions
diff --git a/src/DotNetOpenId/Provider/ProviderEndpoint.cs b/src/DotNetOpenId/Provider/ProviderEndpoint.cs
index d46d248..40d8dea 100644
--- a/src/DotNetOpenId/Provider/ProviderEndpoint.cs
+++ b/src/DotNetOpenId/Provider/ProviderEndpoint.cs
@@ -5,6 +5,7 @@ using System.Text;
 using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
+using IProviderAssociationStore = DotNetOpenId.IAssociationStore<DotNetOpenId.AssociationRelyingPartyType>;
 
 namespace DotNetOpenId.Provider {
 	/// <summary>
@@ -27,7 +28,7 @@ namespace DotNetOpenId.Provider {
 		/// before responding to the relying party's authentication request.
 		/// </remarks>
 		public static IAuthenticationRequest PendingAuthenticationRequest {
-			get { return HttpContext.Current.Session[pendingAuthenticationRequestKey] as CheckIdRequest; }
+			get { return HttpContext.Current.Session[pendingAuthenticationRequestKey] as IAuthenticationRequest; }
 			set { HttpContext.Current.Session[pendingAuthenticationRequestKey] = value; }
 		}
 
@@ -48,6 +49,15 @@ namespace DotNetOpenId.Provider {
 		}
 
 		/// <summary>
+		/// A custom application store to use.  Null to use the default.
+		/// </summary>
+		/// <remarks>
+		/// If set, this property must be set in each Page Load event
+		/// as it is not persisted across postbacks.
+		/// </remarks>
+		public IProviderAssociationStore CustomApplicationStore { get; set; }
+
+		/// <summary>
 		/// Checks for incoming OpenID requests, responds to ones it can
 		/// respond to without policy checks, and fires events for custom
 		/// handling of the ones it cannot decide on automatically.
@@ -56,7 +66,14 @@ namespace DotNetOpenId.Provider {
 			base.OnLoad(e);
 
 			if (Enabled) {
-				OpenIdProvider provider = new OpenIdProvider();
+				// Use the explicitly given state store on this control if there is one.  
+				// Then try the configuration file specified one.  Finally, use the default
+				// in-memory one that's built into OpenIdProvider.
+				OpenIdProvider provider = new OpenIdProvider(
+					CustomApplicationStore ?? OpenIdProvider.Configuration.Store.CreateInstanceOfStore(OpenIdProvider.HttpApplicationStore),
+					OpenIdProvider.DefaultProviderEndpoint,
+					OpenIdProvider.DefaultRequestUrl,
+					OpenIdProvider.DefaultQuery);
 
 				// determine what incoming message was received
 				if (provider.Request != null) {