Basic OpenID RP login sample working again.

6 files changed, 33 insertions, 18 deletions

diff --git a/samples/OpenIdRelyingPartyWebForms/Default.aspx b/samples/OpenIdRelyingPartyWebForms/Default.aspx
index 3119fae..99f9885 100644
--- a/samples/OpenIdRelyingPartyWebForms/Default.aspx
+++ b/samples/OpenIdRelyingPartyWebForms/Default.aspx
@@ -1,6 +1,6 @@
 <%@ Page Language="C#" AutoEventWireup="true" MasterPageFile="~/Site.Master" %>
 
-<%@ Register Assembly="DotNetOpenAuth.OpenId" Namespace="DotNetOpenAuth" TagPrefix="openid" %>
+<%@ Register Assembly="DotNetOpenAuth.OpenId.UI" Namespace="DotNetOpenAuth" TagPrefix="openid" %>
 <asp:Content runat="server" ContentPlaceHolderID="head">
 	<openid:XrdsPublisher ID="XrdsPublisher1" runat="server" XrdsUrl="~/xrds.aspx" />
 </asp:Content>
diff --git a/samples/OpenIdRelyingPartyWebForms/DetectGoogleSession.aspx.cs b/samples/OpenIdRelyingPartyWebForms/DetectGoogleSession.aspx.cs
index 98fe745..d6cf2ac 100644
--- a/samples/OpenIdRelyingPartyWebForms/DetectGoogleSession.aspx.cs
+++ b/samples/OpenIdRelyingPartyWebForms/DetectGoogleSession.aspx.cs
@@ -1,6 +1,7 @@
 namespace OpenIdRelyingPartyWebForms {
 	using System;
 	using DotNetOpenAuth.ApplicationBlock.CustomExtensions;
+	using DotNetOpenAuth.OpenId;
 	using DotNetOpenAuth.OpenId.Extensions.UI;
 	using DotNetOpenAuth.OpenId.RelyingParty;
 
diff --git a/samples/OpenIdRelyingPartyWebForms/OpenIdRelyingPartyWebForms.csproj b/samples/OpenIdRelyingPartyWebForms/OpenIdRelyingPartyWebForms.csproj
index ce4df80..633a9ab 100644
--- a/samples/OpenIdRelyingPartyWebForms/OpenIdRelyingPartyWebForms.csproj
+++ b/samples/OpenIdRelyingPartyWebForms/OpenIdRelyingPartyWebForms.csproj
@@ -220,6 +220,10 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\src\DotNetOpenAuth.Messaging.UI\DotNetOpenAuth.Messaging.UI.csproj">
+      <Project>{173E7B8D-E751-46E2-A133-F72297C0D2F4}</Project>
+      <Name>DotNetOpenAuth.Messaging.UI</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\DotNetOpenAuth.Messaging\DotNetOpenAuth.Messaging.csproj">
       <Project>{60426312-6AE5-4835-8667-37EDEA670222}</Project>
       <Name>DotNetOpenAuth.Messaging</Name>
@@ -228,6 +232,18 @@
       <Project>{A288FCC8-6FCF-46DA-A45E-5F9281556361}</Project>
       <Name>DotNetOpenAuth.OAuth</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\src\DotNetOpenAuth.OpenId.RelyingParty.UI\DotNetOpenAuth.OpenId.RelyingParty.UI.csproj">
+      <Project>{1ED8D424-F8AB-4050-ACEB-F27F4F909484}</Project>
+      <Name>DotNetOpenAuth.OpenId.RelyingParty.UI</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\DotNetOpenAuth.OpenId.RelyingParty\DotNetOpenAuth.OpenId.RelyingParty.csproj">
+      <Project>{F458AB60-BA1C-43D9-8CEF-EC01B50BE87B}</Project>
+      <Name>DotNetOpenAuth.OpenId.RelyingParty</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\DotNetOpenAuth.OpenId.UI\DotNetOpenAuth.OpenId.UI.csproj">
+      <Project>{75E13AAE-7D51-4421-ABFD-3F3DC91F576E}</Project>
+      <Name>DotNetOpenAuth.OpenId.UI</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\DotNetOpenAuth.OpenId\DotNetOpenAuth.OpenId.csproj">
       <Project>{3896A32A-E876-4C23-B9B8-78E17D134CD3}</Project>
       <Name>DotNetOpenAuth.OpenId</Name>
diff --git a/samples/OpenIdRelyingPartyWebForms/Web.config b/samples/OpenIdRelyingPartyWebForms/Web.config
index 6c1648b..5514e4f 100644
--- a/samples/OpenIdRelyingPartyWebForms/Web.config
+++ b/samples/OpenIdRelyingPartyWebForms/Web.config
@@ -41,7 +41,7 @@
 				<behaviors>
 					<!-- The following OPTIONAL behavior allows RPs to use SREG only, but be compatible
 					     with OPs that use Attribute Exchange (in various formats). -->
-					<add type="DotNetOpenAuth.OpenId.Behaviors.AXFetchAsSregTransform, DotNetOpenAuth.OpenId" />
+					<add type="DotNetOpenAuth.OpenId.Behaviors.AXFetchAsSregRelyingPartyTransform, DotNetOpenAuth.OpenId.RelyingParty" />
 					<!--<add type="DotNetOpenAuth.OpenId.Behaviors.GsaIcamProfile, DotNetOpenAuth" />-->
 				</behaviors>
 				<!-- Uncomment the following to activate the sample custom store.  -->
diff --git a/samples/OpenIdRelyingPartyWebForms/login.aspx b/samples/OpenIdRelyingPartyWebForms/login.aspx
index 554540d..98eee7a 100644
--- a/samples/OpenIdRelyingPartyWebForms/login.aspx
+++ b/samples/OpenIdRelyingPartyWebForms/login.aspx
@@ -1,7 +1,7 @@
 <%@ Page Language="C#" AutoEventWireup="True" CodeBehind="login.aspx.cs" Inherits="OpenIdRelyingPartyWebForms.login"
 	ValidateRequest="false" MasterPageFile="~/Site.Master" %>
 
-<%@ Register Assembly="DotNetOpenAuth.OpenId" Namespace="DotNetOpenAuth.OpenId.RelyingParty" TagPrefix="rp" %>
+<%@ Register Assembly="DotNetOpenAuth.OpenId.RelyingParty.UI" Namespace="DotNetOpenAuth.OpenId.RelyingParty" TagPrefix="rp" %>
 <%@ Register Assembly="DotNetOpenAuth.OpenId" Namespace="DotNetOpenAuth.OpenId.Extensions.SimpleRegistration" TagPrefix="sreg" %>
 <asp:Content runat="server" ContentPlaceHolderID="Main">
 	<h2>Login Page </h2>
diff --git a/src/DotNetOpenAuth.OpenId/Configuration/OpenIdElement.cs b/src/DotNetOpenAuth.OpenId/Configuration/OpenIdElement.cs
index c6b17a8..e4e210f 100644
--- a/src/DotNetOpenAuth.OpenId/Configuration/OpenIdElement.cs
+++ b/src/DotNetOpenAuth.OpenId/Configuration/OpenIdElement.cs
@@ -16,7 +16,7 @@ namespace DotNetOpenAuth.Configuration {
 	/// Represents the &lt;openid&gt; element in the host's .config file.
 	/// </summary>
 	[ContractVerification(true)]
-	internal class OpenIdElement : ConfigurationSectionGroup {
+	internal class OpenIdElement : ConfigurationSection {
 		/// <summary>
 		/// The name of the section under which this library's settings must be found.
 		/// </summary>
@@ -58,8 +58,6 @@ namespace DotNetOpenAuth.Configuration {
 		internal OpenIdElement() {
 		}
 
-		private Dictionary<string, object> indexer;
-
 		/// <summary>
 		/// Gets the configuration section from the .config file.
 		/// </summary>
@@ -83,14 +81,14 @@ namespace DotNetOpenAuth.Configuration {
 		internal TimeSpan MaxAuthenticationTime {
 			get {
 				Contract.Ensures(Contract.Result<TimeSpan>() > TimeSpan.Zero);
-				TimeSpan result = (TimeSpan)indexer[MaxAuthenticationTimePropertyName];
+				TimeSpan result = (TimeSpan)this[MaxAuthenticationTimePropertyName];
 				Contract.Assume(result > TimeSpan.Zero); // our PositiveTimeSpanValidator should take care of this
 				return result;
 			}
 
 			set {
 				Contract.Requires<ArgumentOutOfRangeException>(value > TimeSpan.Zero);
-				indexer[MaxAuthenticationTimePropertyName] = value;
+				this[MaxAuthenticationTimePropertyName] = value;
 			}
 		}
 
@@ -108,8 +106,8 @@ namespace DotNetOpenAuth.Configuration {
 		/// </remarks>
 		[ConfigurationProperty(CacheDiscoveryPropertyName, DefaultValue = true)]
 		internal bool CacheDiscovery {
-			get { return (bool)indexer[CacheDiscoveryPropertyName]; }
-			set { indexer[CacheDiscoveryPropertyName] = value; }
+			get { return (bool)this[CacheDiscoveryPropertyName]; }
+			set { this[CacheDiscoveryPropertyName] = value; }
 		}
 
 		/// <summary>
@@ -117,8 +115,8 @@ namespace DotNetOpenAuth.Configuration {
 		/// </summary>
 		[ConfigurationProperty(RelyingPartyElementName)]
 		internal OpenIdRelyingPartyElement RelyingParty {
-			get { return (OpenIdRelyingPartyElement)indexer[RelyingPartyElementName] ?? new OpenIdRelyingPartyElement(); }
-			set { indexer[RelyingPartyElementName] = value; }
+			get { return (OpenIdRelyingPartyElement)this[RelyingPartyElementName] ?? new OpenIdRelyingPartyElement(); }
+			set { this[RelyingPartyElementName] = value; }
 		}
 
 		/// <summary>
@@ -126,8 +124,8 @@ namespace DotNetOpenAuth.Configuration {
 		/// </summary>
 		[ConfigurationProperty(ProviderElementName)]
 		internal OpenIdProviderElement Provider {
-			get { return (OpenIdProviderElement)indexer[ProviderElementName] ?? new OpenIdProviderElement(); }
-			set { indexer[ProviderElementName] = value; }
+			get { return (OpenIdProviderElement)this[ProviderElementName] ?? new OpenIdProviderElement(); }
+			set { this[ProviderElementName] = value; }
 		}
 
 		/// <summary>
@@ -136,8 +134,8 @@ namespace DotNetOpenAuth.Configuration {
 		[ConfigurationProperty(ExtensionFactoriesElementName, IsDefaultCollection = false)]
 		[ConfigurationCollection(typeof(TypeConfigurationCollection<IOpenIdExtensionFactory>))]
 		internal TypeConfigurationCollection<IOpenIdExtensionFactory> ExtensionFactories {
-			get { return (TypeConfigurationCollection<IOpenIdExtensionFactory>)indexer[ExtensionFactoriesElementName] ?? new TypeConfigurationCollection<IOpenIdExtensionFactory>(); }
-			set { indexer[ExtensionFactoriesElementName] = value; }
+			get { return (TypeConfigurationCollection<IOpenIdExtensionFactory>)this[ExtensionFactoriesElementName] ?? new TypeConfigurationCollection<IOpenIdExtensionFactory>(); }
+			set { this[ExtensionFactoriesElementName] = value; }
 		}
 
 		/// <summary>
@@ -145,8 +143,8 @@ namespace DotNetOpenAuth.Configuration {
 		/// </summary>
 		[ConfigurationProperty(XriResolverElementName)]
 		internal XriResolverElement XriResolver {
-			get { return (XriResolverElement)indexer[XriResolverElementName] ?? new XriResolverElement(); }
-			set { indexer[XriResolverElementName] = value; }
+			get { return (XriResolverElement)this[XriResolverElementName] ?? new XriResolverElement(); }
+			set { this[XriResolverElementName] = value; }
 		}
 	}
 }