Fixed bug in providerportal sample and streamlined default ASPX code …

…emitted by dropping controls onto design surface.
DotNetOpenAuth · Aug 20, 2008 · eb85846 · eb85846
1 parent a16b4e6
commit eb85846
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/samples/ProviderPortal/decide.aspx.cs b/samples/ProviderPortal/decide.aspx.cs
@@ -43,9 +43,14 @@ public partial class decide : Page {
 
 	protected void Yes_Click(Object sender, EventArgs e) {
 		var sregRequest = ProviderEndpoint.PendingAuthenticationRequest.GetExtension<ClaimsRequest>();
-		var sregResponse = profileFields.GetOpenIdProfileFields(sregRequest);
+		ClaimsResponse sregResponse = null;
+		if (sregRequest != null) {
+			sregResponse = profileFields.GetOpenIdProfileFields(sregRequest);
+		}
 		ProviderEndpoint.PendingAuthenticationRequest.IsAuthenticated = true;
-		ProviderEndpoint.PendingAuthenticationRequest.AddResponseExtension(sregResponse);
+		if (sregResponse != null) {
+			ProviderEndpoint.PendingAuthenticationRequest.AddResponseExtension(sregResponse);
+		}
 		Debug.Assert(ProviderEndpoint.PendingAuthenticationRequest.IsResponseReady);
 		ProviderEndpoint.PendingAuthenticationRequest.Response.Send();
 		ProviderEndpoint.PendingAuthenticationRequest = null;

diff --git a/src/DotNetOpenId/RelyingParty/OpenIdLogin.cs b/src/DotNetOpenId/RelyingParty/OpenIdLogin.cs
@@ -21,7 +21,7 @@ namespace DotNetOpenId.RelyingParty
 	/// </summary>
 	[SuppressMessage("Microsoft.Naming", "CA1726:UsePreferredTerms", MessageId = "Login")]
 	[DefaultProperty("Text"), ValidationProperty("Text")]
-	[ToolboxData("<{0}:OpenIdLogin runat=\"server\"></{0}:OpenIdLogin>")]
+	[ToolboxData("<{0}:OpenIdLogin runat=\"server\" />")]
 	public class OpenIdLogin : OpenIdTextBox
 	{
 		Panel panel;

diff --git a/src/DotNetOpenId/RelyingParty/OpenIdTextBox.cs b/src/DotNetOpenId/RelyingParty/OpenIdTextBox.cs
@@ -33,7 +33,7 @@ namespace DotNetOpenId.RelyingParty
 	/// assemble a complete login experience.
 	/// </remarks>
 	[DefaultProperty("Text"), ValidationProperty("Text")]
-	[ToolboxData("<{0}:OpenIdTextBox runat=\"server\"></{0}:OpenIdTextBox>")]
+	[ToolboxData("<{0}:OpenIdTextBox runat=\"server\" />")]
 	public class OpenIdTextBox : CompositeControl, IEditableTextControl, ITextControl
 	{
 		/// <summary>