RP sample now uses a web user control to display profile fields so it can be reused elsewhere.

5 files changed, 125 insertions, 76 deletions

diff --git a/samples/OpenIdRelyingPartyWebForms/MembersOnly/Default.aspx b/samples/OpenIdRelyingPartyWebForms/MembersOnly/Default.aspx
index 46458e8..cbc13ee 100644
--- a/samples/OpenIdRelyingPartyWebForms/MembersOnly/Default.aspx
+++ b/samples/OpenIdRelyingPartyWebForms/MembersOnly/Default.aspx
@@ -1,6 +1,6 @@
 <%@ Page Language="C#" AutoEventWireup="true" MasterPageFile="~/Site.Master" %>
 <%@ Import Namespace="OpenIdRelyingPartyWebForms" %>
-
+<%@ Register Src="~/MembersOnly/ProfileFieldsDisplay.ascx" TagPrefix="cc1" TagName="ProfileFieldsDisplay" %>
 <asp:Content ID="Content1" runat="server" ContentPlaceHolderID="Main">
 	<h2>
 		Members Only Area
@@ -22,85 +22,13 @@
 	</ul>
 <% } %>
 
-<% if (State.ProfileFields != null) { %>
+<% if (State.ProfileFields != null) {
+		 profileFieldsDisplay.ProfileValues = State.ProfileFields; %>
 	<p>
 		In addition to authenticating you, your OpenID Provider may
 		have told us something about you using the 
 		Simple Registration extension:
 	</p>
-	<table id="profileFieldsTable" runat="server">
-		<tr>
-			<td>
-				Nickname
-			</td>
-			<td>
-				<%=State.ProfileFields.Nickname %>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				Email
-			</td>
-			<td>
-				<%=State.ProfileFields.Email%>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				FullName
-			</td>
-			<td>
-				<%=State.ProfileFields.FullName%>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				Date of Birth
-			</td>
-			<td>
-				<%=State.ProfileFields.BirthDate.ToString()%>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				Gender
-			</td>
-			<td>
-				<%=State.ProfileFields.Gender.ToString()%>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				Post Code
-			</td>
-			<td>
-				<%=State.ProfileFields.PostalCode%>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				Country
-			</td>
-			<td>
-				<%=State.ProfileFields.Country%>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				Language
-			</td>
-			<td>
-				<%=State.ProfileFields.Language%>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				Timezone
-			</td>
-			<td>
-				<%=State.ProfileFields.TimeZone%>
-			</td>
-		</tr>
-	</table>
+	<cc1:ProfileFieldsDisplay runat="server" ID="profileFieldsDisplay" />
 <% } %>
 </asp:Content>
diff --git a/samples/OpenIdRelyingPartyWebForms/MembersOnly/ProfileFieldsDisplay.ascx b/samples/OpenIdRelyingPartyWebForms/MembersOnly/ProfileFieldsDisplay.ascx
new file mode 100644
index 0000000..b2e5f7e
--- /dev/null
+++ b/samples/OpenIdRelyingPartyWebForms/MembersOnly/ProfileFieldsDisplay.ascx
@@ -0,0 +1,75 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProfileFieldsDisplay.ascx.cs" Inherits="OpenIdRelyingPartyWebForms.MembersOnly.ProfileFieldsDisplay" %>
+<table id="profileFieldsTable" runat="server">
+	<tr>
+		<td>
+			Nickname
+		</td>
+		<td>
+			<%=ProfileValues.Nickname %>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			Email
+		</td>
+		<td>
+			<%=ProfileValues.Email%>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			FullName
+		</td>
+		<td>
+			<%=ProfileValues.FullName%>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			Date of Birth
+		</td>
+		<td>
+			<%=ProfileValues.BirthDate.ToString()%>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			Gender
+		</td>
+		<td>
+			<%=ProfileValues.Gender.ToString()%>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			Post Code
+		</td>
+		<td>
+			<%=ProfileValues.PostalCode%>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			Country
+		</td>
+		<td>
+			<%=ProfileValues.Country%>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			Language
+		</td>
+		<td>
+			<%=ProfileValues.Language%>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			Timezone
+		</td>
+		<td>
+			<%=ProfileValues.TimeZone%>
+		</td>
+	</tr>
+</table>
diff --git a/samples/OpenIdRelyingPartyWebForms/MembersOnly/ProfileFieldsDisplay.ascx.cs b/samples/OpenIdRelyingPartyWebForms/MembersOnly/ProfileFieldsDisplay.ascx.cs
new file mode 100644
index 0000000..8e10ff3
--- /dev/null
+++ b/samples/OpenIdRelyingPartyWebForms/MembersOnly/ProfileFieldsDisplay.ascx.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using DotNetOpenAuth.OpenId.Extensions.SimpleRegistration;
+
+namespace OpenIdRelyingPartyWebForms.MembersOnly {
+	public partial class ProfileFieldsDisplay : System.Web.UI.UserControl {
+		public ClaimsResponse ProfileValues { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/samples/OpenIdRelyingPartyWebForms/MembersOnly/ProfileFieldsDisplay.ascx.designer.cs b/samples/OpenIdRelyingPartyWebForms/MembersOnly/ProfileFieldsDisplay.ascx.designer.cs
new file mode 100644
index 0000000..4a5dc8a
--- /dev/null
+++ b/samples/OpenIdRelyingPartyWebForms/MembersOnly/ProfileFieldsDisplay.ascx.designer.cs
@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.4918
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace OpenIdRelyingPartyWebForms.MembersOnly {
+    
+    
+    public partial class ProfileFieldsDisplay {
+        
+        /// <summary>
+        /// profileFieldsTable control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTable profileFieldsTable;
+    }
+}
diff --git a/samples/OpenIdRelyingPartyWebForms/OpenIdRelyingPartyWebForms.csproj b/samples/OpenIdRelyingPartyWebForms/OpenIdRelyingPartyWebForms.csproj
index 556dadf..d3bf92c 100644
--- a/samples/OpenIdRelyingPartyWebForms/OpenIdRelyingPartyWebForms.csproj
+++ b/samples/OpenIdRelyingPartyWebForms/OpenIdRelyingPartyWebForms.csproj
@@ -132,6 +132,13 @@
     <Compile Include="MembersOnly\DisplayGoogleContacts.aspx.designer.cs">
       <DependentUpon>DisplayGoogleContacts.aspx</DependentUpon>
     </Compile>
+    <Compile Include="MembersOnly\ProfileFieldsDisplay.ascx.cs">
+      <DependentUpon>ProfileFieldsDisplay.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="MembersOnly\ProfileFieldsDisplay.ascx.designer.cs">
+      <DependentUpon>ProfileFieldsDisplay.ascx</DependentUpon>
+    </Compile>
     <Compile Include="m\Login.aspx.cs">
       <DependentUpon>Login.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -168,6 +175,7 @@
     <Content Include="images\yahoo.png" />
     <Content Include="loginPlusOAuth.aspx" />
     <Content Include="MembersOnly\DisplayGoogleContacts.aspx" />
+    <Content Include="MembersOnly\ProfileFieldsDisplay.ascx" />
     <Content Include="MembersOnly\Web.config" />
     <Content Include="m\Login.aspx" />
     <Content Include="NoIdentityOpenId.aspx" />