summaryrefslogtreecommitdiffstats
path: root/samples/OAuthAuthorizationServer/Controllers/OAuthController.cs
diff options
context:
space:
mode:
authorAndrew Arnott <andrewarnott@gmail.com>2012-03-21 22:58:36 -0700
committerAndrew Arnott <andrewarnott@gmail.com>2012-03-21 22:58:36 -0700
commit80028b1c5442c85909b889b3c52cfbd0c0121437 (patch)
treeb1b651c08a349957bb3d26ad5234a266d8d3e42e /samples/OAuthAuthorizationServer/Controllers/OAuthController.cs
parentf02ccf1e93367b7ab8bece3a2c53e960e98d221d (diff)
parente1455ee979b150d1ea4afdf1bc82a9e5cbc5b2ba (diff)
downloadDotNetOpenAuth-80028b1c5442c85909b889b3c52cfbd0c0121437.zip
DotNetOpenAuth-80028b1c5442c85909b889b3c52cfbd0c0121437.tar.gz
DotNetOpenAuth-80028b1c5442c85909b889b3c52cfbd0c0121437.tar.bz2
Merge branch 'v4.0' into dev11
Conflicts: src/DotNetOpenAuth.sln
Diffstat (limited to 'samples/OAuthAuthorizationServer/Controllers/OAuthController.cs')
-rw-r--r--samples/OAuthAuthorizationServer/Controllers/OAuthController.cs9
1 files changed, 1 insertions, 8 deletions
diff --git a/samples/OAuthAuthorizationServer/Controllers/OAuthController.cs b/samples/OAuthAuthorizationServer/Controllers/OAuthController.cs
index 9d2f6e9..4c3e4d4 100644
--- a/samples/OAuthAuthorizationServer/Controllers/OAuthController.cs
+++ b/samples/OAuthAuthorizationServer/Controllers/OAuthController.cs
@@ -21,14 +21,7 @@
/// </summary>
/// <returns>The response to the Client.</returns>
public ActionResult Token() {
- var request = this.authorizationServer.ReadAccessTokenRequest();
- if (request != null) {
- // Prepare the refresh and access tokens.
- var response = this.authorizationServer.PrepareAccessTokenResponse(request);
- return this.authorizationServer.Channel.PrepareResponse(response).AsActionResult();
- }
-
- throw new HttpException((int)HttpStatusCode.BadRequest, "Missing OAuth 2.0 request message.");
+ return this.authorizationServer.HandleTokenRequest(this.Request).AsActionResult();
}
/// <summary>