summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Arnott <andrewarnott@gmail.com>2010-12-29 20:15:51 -0800
committerAndrew Arnott <andrewarnott@gmail.com>2010-12-29 20:15:51 -0800
commit3d61acf448c8a06b98fb8cc1ec16692258574002 (patch)
tree4c04c762a5bf6c2d2ec15e9c210c2ec84c3af185
parent905c1e662649ae06027fa47ca12590ef9ec25354 (diff)
downloadDotNetOpenAuth-3d61acf448c8a06b98fb8cc1ec16692258574002.zip
DotNetOpenAuth-3d61acf448c8a06b98fb8cc1ec16692258574002.tar.gz
DotNetOpenAuth-3d61acf448c8a06b98fb8cc1ec16692258574002.tar.bz2
Adds the missing attributes on OpenIdRelyingPartyControlBase that make its Extensions property settable inside an ASPX page.
Closes #6
-rw-r--r--samples/OpenIdRelyingPartyWebForms/login.aspx7
-rw-r--r--samples/OpenIdRelyingPartyWebForms/login.aspx.designer.cs3
-rw-r--r--src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingPartyControlBase.cs1
-rw-r--r--src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdSelector.cs1
4 files changed, 8 insertions, 4 deletions
diff --git a/samples/OpenIdRelyingPartyWebForms/login.aspx b/samples/OpenIdRelyingPartyWebForms/login.aspx
index efa2052..e35a649 100644
--- a/samples/OpenIdRelyingPartyWebForms/login.aspx
+++ b/samples/OpenIdRelyingPartyWebForms/login.aspx
@@ -2,6 +2,7 @@
ValidateRequest="false" MasterPageFile="~/Site.Master" %>
<%@ Register Assembly="DotNetOpenAuth" Namespace="DotNetOpenAuth.OpenId.RelyingParty" TagPrefix="rp" %>
+<%@ Register Assembly="DotNetOpenAuth" Namespace="DotNetOpenAuth.OpenId.Extensions.SimpleRegistration" TagPrefix="sreg" %>
<asp:Content runat="server" ContentPlaceHolderID="Main">
<h2>Login Page </h2>
<rp:OpenIdLogin ID="OpenIdLogin1" runat="server" CssClass="openid_login" RequestCountry="Request"
@@ -24,6 +25,10 @@
<p><a href="loginGoogleApps.aspx">Log in using Google Apps for Domains</a>. </p>
<p>
<rp:OpenIdButton runat="server" ImageUrl="~/images/yahoo.png" Text="Login with Yahoo!" ID="yahooLoginButton"
- Identifier="https://me.yahoo.com/" OnLoggingIn="OpenIdLogin1_LoggingIn" OnLoggedIn="OpenIdLogin1_LoggedIn" />
+ Identifier="https://me.yahoo.com/" OnLoggingIn="OpenIdLogin1_LoggingIn" OnLoggedIn="OpenIdLogin1_LoggedIn">
+ <Extensions>
+ <sreg:ClaimsRequest Email="Require" />
+ </Extensions>
+ </rp:OpenIdButton>
</p>
</asp:Content>
diff --git a/samples/OpenIdRelyingPartyWebForms/login.aspx.designer.cs b/samples/OpenIdRelyingPartyWebForms/login.aspx.designer.cs
index 4a2521c..017d259 100644
--- a/samples/OpenIdRelyingPartyWebForms/login.aspx.designer.cs
+++ b/samples/OpenIdRelyingPartyWebForms/login.aspx.designer.cs
@@ -1,10 +1,9 @@
//------------------------------------------------------------------------------
// <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.
+// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
diff --git a/src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingPartyControlBase.cs b/src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingPartyControlBase.cs
index 380417f..62f6554 100644
--- a/src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingPartyControlBase.cs
+++ b/src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingPartyControlBase.cs
@@ -76,6 +76,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
/// A common base class for OpenID Relying Party controls.
/// </summary>
[DefaultProperty("Identifier"), ValidationProperty("Identifier")]
+ [ParseChildren(true), PersistChildren(false)]
public abstract class OpenIdRelyingPartyControlBase : Control, IPostBackEventHandler, IDisposable {
/// <summary>
/// The manifest resource name of the javascript file to include on the hosting page.
diff --git a/src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdSelector.cs b/src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdSelector.cs
index b7a54eb..538e181 100644
--- a/src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdSelector.cs
+++ b/src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdSelector.cs
@@ -29,7 +29,6 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
/// An ASP.NET control that provides a user-friendly way of logging into a web site using OpenID.
/// </summary>
[ToolboxData("<{0}:OpenIdSelector runat=\"server\"></{0}:OpenIdSelector>")]
- [ParseChildren(true), PersistChildren(false)]
public class OpenIdSelector : OpenIdRelyingPartyAjaxControlBase {
/// <summary>
/// The name of the manifest stream containing the OpenIdButtonPanel.js file.