Merge branch 'v2.5' into monoorigin/mono

Conflicts:
	src/DotNetOpenId/Properties/AssemblyInfo.cs
	src/DotNetOpenId/RelyingParty/AuthenticationResponse.cs

1 files changed, 19 insertions, 5 deletions

diff --git a/samples/ProviderPortal/decide.aspx.cs b/samples/ProviderPortal/decide.aspx.cs
index 882c320..2c563a6 100644
--- a/samples/ProviderPortal/decide.aspx.cs
+++ b/samples/ProviderPortal/decide.aspx.cs
@@ -4,6 +4,7 @@ using System.Web.Security;
 using System.Web.UI;

 using DotNetOpenId.Extensions.SimpleRegistration;

 using DotNetOpenId.Provider;

+using DotNetOpenId.Extensions.ProviderAuthenticationPolicy;

 

 /// <summary>

 /// Page for giving the user the option to continue or cancel out of authentication with a consumer.

@@ -23,16 +24,16 @@ public partial class decide : Page {
 		realmLabel.Text = ProviderEndpoint.PendingAuthenticationRequest.Realm.ToString();

 

 		// check that the logged in user is the same as the user requesting authentication to the consumer. If not, then log them out.

-		if (User.Identity.Name == Util.ExtractUserName(ProviderEndpoint.PendingAuthenticationRequest.LocalIdentifier)) {

+		if (String.Equals(User.Identity.Name, Util.ExtractUserName(ProviderEndpoint.PendingAuthenticationRequest.LocalIdentifier), StringComparison.OrdinalIgnoreCase)) {

 			// if simple registration fields were used, then prompt the user for them

 			var requestedFields = ProviderEndpoint.PendingAuthenticationRequest.GetExtension<ClaimsRequest>();

 			if (requestedFields != null) {

 				this.profileFields.Visible = true;

 				this.profileFields.SetRequiredFieldsFromRequest(requestedFields);

 				if (!IsPostBack) {

-					this.profileFields.OpenIdProfileFields = new ClaimsResponse() {

-						Email = Membership.GetUser().Email,

-					};

+					var sregResponse = requestedFields.CreateResponse();

+					sregResponse.Email = Membership.GetUser().Email;

+					this.profileFields.SetOpenIdProfileFields(sregResponse);

 				}

 			}

 		} else {

@@ -42,8 +43,21 @@ public partial class decide : Page {
 	}

 

 	protected void Yes_Click(Object sender, EventArgs e) {

+		var sregRequest = ProviderEndpoint.PendingAuthenticationRequest.GetExtension<ClaimsRequest>();

+		ClaimsResponse sregResponse = null;

+		if (sregRequest != null) {

+			sregResponse = profileFields.GetOpenIdProfileFields(sregRequest);

+			ProviderEndpoint.PendingAuthenticationRequest.AddResponseExtension(sregResponse);

+		}

+		var papeRequest = ProviderEndpoint.PendingAuthenticationRequest.GetExtension<PolicyRequest>();

+		PolicyResponse papeResponse = null;

+		if (papeRequest != null) {

+			papeResponse = new PolicyResponse();

+			papeResponse.NistAssuranceLevel = NistAssuranceLevel.InsufficientForLevel1;

+			ProviderEndpoint.PendingAuthenticationRequest.AddResponseExtension(papeResponse);

+		}

+

 		ProviderEndpoint.PendingAuthenticationRequest.IsAuthenticated = true;

-		ProviderEndpoint.PendingAuthenticationRequest.AddResponseExtension(profileFields.OpenIdProfileFields);

 		Debug.Assert(ProviderEndpoint.PendingAuthenticationRequest.IsResponseReady);

 		ProviderEndpoint.PendingAuthenticationRequest.Response.Send();

 		ProviderEndpoint.PendingAuthenticationRequest = null;