3 files changed, 36 insertions, 22 deletions
diff --git a/samples/OpenIdWebRingSsoProvider/Default.aspx.cs b/samples/OpenIdWebRingSsoProvider/Default.aspx.cs
index a1ffeec..6a930bd 100644
--- a/samples/OpenIdWebRingSsoProvider/Default.aspx.cs
+++ b/samples/OpenIdWebRingSsoProvider/Default.aspx.cs
@@ -10,17 +10,23 @@
 	using OpenIdWebRingSsoProvider.Code;
 
 	public partial class _Default : System.Web.UI.Page {
-		protected async void Page_Load(object sender, EventArgs e) {
-			// The user may have just completed a login.  If they're logged in, see if we can complete the OpenID login.
-			if (User.Identity.IsAuthenticated && ProviderEndpoint.PendingAuthenticationRequest != null) {
-				await Util.ProcessAuthenticationChallengeAsync(ProviderEndpoint.PendingAuthenticationRequest, Response.ClientDisconnectedToken);
-				if (ProviderEndpoint.PendingAuthenticationRequest.IsAuthenticated.HasValue) {
-					var providerEndpoint = new ProviderEndpoint();
-					var responseMessage = await providerEndpoint.PrepareResponseAsync(this.Response.ClientDisconnectedToken);
-					await responseMessage.SendAsync(new HttpContextWrapper(this.Context), this.Response.ClientDisconnectedToken);
-					this.Context.Response.End();
-				}
-			}
+		protected void Page_Load(object sender, EventArgs e) {
+			this.RegisterAsyncTask(
+				new PageAsyncTask(
+					async ct => {
+						// The user may have just completed a login.  If they're logged in, see if we can complete the OpenID login.
+						if (User.Identity.IsAuthenticated && ProviderEndpoint.PendingAuthenticationRequest != null) {
+							await
+								Util.ProcessAuthenticationChallengeAsync(
+									ProviderEndpoint.PendingAuthenticationRequest, Response.ClientDisconnectedToken);
+							if (ProviderEndpoint.PendingAuthenticationRequest.IsAuthenticated.HasValue) {
+								var providerEndpoint = new ProviderEndpoint();
+								var responseMessage = await providerEndpoint.PrepareResponseAsync(this.Response.ClientDisconnectedToken);
+								await responseMessage.SendAsync(new HttpContextWrapper(this.Context), this.Response.ClientDisconnectedToken);
+								this.Context.Response.End();
+							}
+						}
+					}));
 		}
 	}
 }
diff --git a/samples/OpenIdWebRingSsoProvider/Login.aspx.cs b/samples/OpenIdWebRingSsoProvider/Login.aspx.cs
index c734ba9..10e5aad 100644
--- a/samples/OpenIdWebRingSsoProvider/Login.aspx.cs
+++ b/samples/OpenIdWebRingSsoProvider/Login.aspx.cs
@@ -35,15 +35,19 @@
 			}
 		}
 
-		protected async void cancelButton_Click(object sender, EventArgs e) {
-			var req = ProviderEndpoint.PendingAuthenticationRequest;
-			if (req != null) {
-				req.IsAuthenticated = false;
-				var providerEndpoint = new ProviderEndpoint();
-				var response = await providerEndpoint.PrepareResponseAsync(Response.ClientDisconnectedToken);
-				await response.SendAsync(new HttpContextWrapper(this.Context), Response.ClientDisconnectedToken);
-				this.Context.Response.End();
-			}
+		protected void cancelButton_Click(object sender, EventArgs e) {
+			this.RegisterAsyncTask(
+				new PageAsyncTask(
+					async ct => {
+						var req = ProviderEndpoint.PendingAuthenticationRequest;
+						if (req != null) {
+							req.IsAuthenticated = false;
+							var providerEndpoint = new ProviderEndpoint();
+							var response = await providerEndpoint.PrepareResponseAsync(Response.ClientDisconnectedToken);
+							await response.SendAsync(new HttpContextWrapper(this.Context), Response.ClientDisconnectedToken);
+							this.Context.Response.End();
+						}
+					}));
 		}
 	}
 }
 \ No newline at end of file
diff --git a/samples/OpenIdWebRingSsoProvider/Server.aspx.cs b/samples/OpenIdWebRingSsoProvider/Server.aspx.cs
index 328f85d..805e38f 100644
--- a/samples/OpenIdWebRingSsoProvider/Server.aspx.cs
+++ b/samples/OpenIdWebRingSsoProvider/Server.aspx.cs
@@ -12,8 +12,12 @@
 		protected void Page_Load(object sender, EventArgs e) {
 		}
 
-		protected async void providerEndpoint1_AuthenticationChallenge(object sender, AuthenticationChallengeEventArgs e) {
-			await Util.ProcessAuthenticationChallengeAsync(e.Request, Response.ClientDisconnectedToken);
+		protected void providerEndpoint1_AuthenticationChallenge(object sender, AuthenticationChallengeEventArgs e) {
+			this.RegisterAsyncTask(
+				new PageAsyncTask(
+					async ct => {
+						await Util.ProcessAuthenticationChallengeAsync(e.Request, ct);
+					}));
 		}
 	}
 }