1 files changed, 28 insertions, 5 deletions
diff --git a/src/DotNetOpenId/Provider/OpenIdProvider.cs b/src/DotNetOpenId/Provider/OpenIdProvider.cs
index b493fda..0fdb4b4 100644
--- a/src/DotNetOpenId/Provider/OpenIdProvider.cs
+++ b/src/DotNetOpenId/Provider/OpenIdProvider.cs
@@ -1,12 +1,12 @@
 using System;
+using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Text;
+using System.Configuration;
+using System.Diagnostics;
 using System.Web;
 using IProviderAssociationStore = DotNetOpenId.IAssociationStore<DotNetOpenId.AssociationRelyingPartyType>;
 using ProviderMemoryStore = DotNetOpenId.AssociationMemoryStore<DotNetOpenId.AssociationRelyingPartyType>;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Net;
+using DotNetOpenId.Configuration;
 
 namespace DotNetOpenId.Provider {
 	/// <summary>
@@ -35,6 +35,10 @@ namespace DotNetOpenId.Provider {
 		/// </summary>
 		internal Protocol Protocol { get; private set; }
 
+		internal static Uri DefaultProviderEndpoint { get { return getProviderEndpointFromContext(); } }
+		internal static Uri DefaultRequestUrl { get { return Util.GetRequestUrlFromContext(); } }
+		internal static NameValueCollection DefaultQuery { get { return Util.GetQueryFromContextNVC(); } }
+
 		/// <summary>
 		/// Constructs an OpenId server that uses the HttpApplication dictionary as
 		/// its association store and detects common settings.
@@ -43,7 +47,7 @@ namespace DotNetOpenId.Provider {
 		/// This method requires a current ASP.NET HttpContext.
 		/// </remarks>
 		public OpenIdProvider()
-			: this(HttpApplicationStore,
+			: this(Configuration.Store.CreateInstanceOfStore(HttpApplicationStore),
 			getProviderEndpointFromContext(), Util.GetRequestUrlFromContext(), Util.GetQueryFromContext()) { }
 		/// <summary>
 		/// Constructs an OpenId server that uses a given query and IAssociationStore.
@@ -67,6 +71,7 @@ namespace DotNetOpenId.Provider {
 			if (providerEndpoint == null) throw new ArgumentNullException("providerEndpoint");
 			if (requestUrl == null) throw new ArgumentNullException("requestUrl");
 			if (query == null) throw new ArgumentNullException("query");
+			Settings = new ProviderSecuritySettings();
 			Endpoint = providerEndpoint;
 			RequestUrl = requestUrl;
 			Query = query;
@@ -83,6 +88,13 @@ namespace DotNetOpenId.Provider {
 		/// </remarks>
 		internal Uri Endpoint { get; private set; }
 
+		// TODO: make this property public WHEN its security settings are actually supported.
+		/// <summary>
+		/// Provides access to the adjustable security settings of this instance
+		/// of <see cref="OpenIdProvider"/>.
+		/// </summary>
+		internal ProviderSecuritySettings Settings { get; private set; }
+
 		bool requestProcessed;
 		Request request;
 		/// <summary>
@@ -189,5 +201,16 @@ namespace DotNetOpenId.Provider {
 			builder.Fragment = null;
 			return builder.Uri;
 		}
+
+		/// <summary>
+		/// Gets the relevant Configuration section for this OpenIdRelyingParty.
+		/// </summary>
+		/// <remarks>
+		/// This is not a static member because depending on the context within which we are
+		/// invoked, the configuration section might be different. (location tag, for example).
+		/// </remarks>
+		internal static ProviderSection Configuration {
+			get { return ProviderSection.Configuration; }
+		}
 	}
 }