Merge branch 'master' into mvcProjTemplate

Conflicts:
	projecttemplates/RelyingPartyLogic/Utilities.cs
	src/DotNetOpenAuth.sln

1 files changed, 23 insertions, 0 deletions

diff --git a/samples/OpenIdWebRingSsoProvider/user.aspx.cs b/samples/OpenIdWebRingSsoProvider/user.aspx.cs
new file mode 100644
index 0000000..8050367
--- /dev/null
+++ b/samples/OpenIdWebRingSsoProvider/user.aspx.cs
@@ -0,0 +1,23 @@
+namespace OpenIdWebRingSsoProvider {
+	using System;
+	using DotNetOpenAuth.OpenId.Provider;
+	using OpenIdWebRingSsoProvider.Code;
+
+	/// <summary>
+	/// This page is a required as part of the service discovery phase of the openid protocol (step 1).
+	/// </summary>
+	/// <remarks>
+	/// <para>The XRDS (or Yadis) content is also rendered to provide the consumer with an alternative discovery mechanism. The Yadis protocol allows the consumer 
+	/// to provide the user with a more flexible range of authentication mechanisms (which ever has been defined in xrds.aspx). See http://en.wikipedia.org/wiki/Yadis.</para>
+	/// </remarks>
+	public partial class User : System.Web.UI.Page {
+		protected void Page_Load(object sender, EventArgs e) {
+			this.usernameLabel.Text = Util.ExtractUserName(Page.Request.Url);
+		}
+
+		protected void IdentityEndpoint20_NormalizeUri(object sender, IdentityEndpointNormalizationEventArgs e) {
+			string username = Util.ExtractUserName(Page.Request.Url);
+			e.NormalizedIdentifier = new Uri(Util.BuildIdentityUrl(username));
+		}
+	}
+}
\ No newline at end of file