Merge branch 'v2.3' into v2.4

1 files changed, 10 insertions, 0 deletions

diff --git a/src/DotNetOpenId/RelyingParty/OpenIdTextBox.cs b/src/DotNetOpenId/RelyingParty/OpenIdTextBox.cs
index a32cfea..1d23341 100644
--- a/src/DotNetOpenId/RelyingParty/OpenIdTextBox.cs
+++ b/src/DotNetOpenId/RelyingParty/OpenIdTextBox.cs
@@ -221,6 +221,7 @@ namespace DotNetOpenId.RelyingParty
 			set { ViewState[showLogoViewStateKey] = value; }

 		}

 

+		const string usePersistentCookieCallbackKey = "OpenIdTextBox_UsePersistentCookie";

 		const string usePersistentCookieViewStateKey = "UsePersistentCookie";

 		/// <summary>

 		/// Default value of <see cref="UsePersistentCookie"/>.

@@ -593,6 +594,12 @@ namespace DotNetOpenId.RelyingParty
 			if (!Enabled || Page.IsPostBack) return;

 			var consumer = createRelyingParty();

 			if (consumer.Response != null) {

+				string persistentString = consumer.Response.GetCallbackArgument(usePersistentCookieCallbackKey);

+				bool persistentBool;

+				if (persistentString != null && bool.TryParse(persistentString, out persistentBool)) {

+					UsePersistentCookie = persistentBool;

+				}

+

 				switch (consumer.Response.Status) {

 					case AuthenticationStatus.Canceled:

 						OnCanceled(consumer.Response);

@@ -686,6 +693,9 @@ namespace DotNetOpenId.RelyingParty
 					Request = consumer.CreateRequest(userSuppliedIdentifier, new Realm(realm));

 					Request.Mode = ImmediateMode ? AuthenticationRequestMode.Immediate : AuthenticationRequestMode.Setup;

 					if (EnableRequestProfile) addProfileArgs(Request);

+

+					// Add state that needs to survive across the redirect.

+					Request.AddCallbackArguments(usePersistentCookieCallbackKey, UsePersistentCookie.ToString(CultureInfo.InvariantCulture));

 				} else {

 					Logger.WarnFormat("An invalid identifier was entered ({0}), but not caught by any validation routine.", Text);

 					Request = null;