summaryrefslogtreecommitdiffstats
path: root/samples/OAuthAuthorizationServer/Controllers/AccountController.cs
diff options
context:
space:
mode:
authorAndrew Arnott <andrewarnott@gmail.com>2013-01-23 21:50:40 -0800
committerAndrew Arnott <andrewarnott@gmail.com>2013-01-23 21:50:40 -0800
commit98976665f90b20e4757e932ce3a33268f7e1daa6 (patch)
treeeeefb570e357a608dbe8a20ab1a033233cc65a7a /samples/OAuthAuthorizationServer/Controllers/AccountController.cs
parentb16591e45dd70602b1899d760200e72fd6d5eaec (diff)
downloadDotNetOpenAuth-98976665f90b20e4757e932ce3a33268f7e1daa6.zip
DotNetOpenAuth-98976665f90b20e4757e932ce3a33268f7e1daa6.tar.gz
DotNetOpenAuth-98976665f90b20e4757e932ce3a33268f7e1daa6.tar.bz2
Fixed a bunch more samples.
Diffstat (limited to 'samples/OAuthAuthorizationServer/Controllers/AccountController.cs')
-rw-r--r--samples/OAuthAuthorizationServer/Controllers/AccountController.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/samples/OAuthAuthorizationServer/Controllers/AccountController.cs b/samples/OAuthAuthorizationServer/Controllers/AccountController.cs
index d69a3b5..fe9c7fb 100644
--- a/samples/OAuthAuthorizationServer/Controllers/AccountController.cs
+++ b/samples/OAuthAuthorizationServer/Controllers/AccountController.cs
@@ -1,18 +1,17 @@
namespace OAuthAuthorizationServer.Controllers {
using System;
using System.Linq;
+ using System.Threading.Tasks;
using System.Web.Mvc;
using System.Web.Security;
-
using DotNetOpenAuth.Messaging;
using DotNetOpenAuth.OpenId;
using DotNetOpenAuth.OpenId.RelyingParty;
-
using OAuthAuthorizationServer.Code;
using OAuthAuthorizationServer.Models;
[HandleError]
- public class AccountController : Controller {
+ public class AccountController : AsyncController {
// **************************************
// URL: /Account/LogOn
// **************************************
@@ -21,16 +20,17 @@
}
[HttpPost]
- public ActionResult LogOn(LogOnModel model, string returnUrl) {
+ public async Task<ActionResult> LogOn(LogOnModel model, string returnUrl) {
if (ModelState.IsValid) {
var rp = new OpenIdRelyingParty();
- var request = rp.CreateRequest(model.UserSuppliedIdentifier, Realm.AutoDetect, new Uri(Request.Url, Url.Action("Authenticate")));
+ var request = await rp.CreateRequestAsync(model.UserSuppliedIdentifier, Realm.AutoDetect, new Uri(Request.Url, Url.Action("Authenticate")), Response.ClientDisconnectedToken);
if (request != null) {
if (returnUrl != null) {
request.AddCallbackArguments("returnUrl", returnUrl);
}
- return request.RedirectingResponse.AsActionResult();
+ var response = await request.GetRedirectingResponseAsync(Response.ClientDisconnectedToken);
+ return response.AsActionResult();
} else {
ModelState.AddModelError(string.Empty, "The identifier you supplied is not recognized as a valid OpenID Identifier.");
}
@@ -40,9 +40,9 @@
return View(model);
}
- public ActionResult Authenticate(string returnUrl) {
+ public async Task<ActionResult> Authenticate(string returnUrl) {
var rp = new OpenIdRelyingParty();
- var response = rp.GetResponse();
+ var response = await rp.GetResponseAsync(Request, Response.ClientDisconnectedToken);
if (response != null) {
switch (response.Status) {
case AuthenticationStatus.Authenticated: