summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--projecttemplates/MvcRelyingParty/Controllers/AccountController.cs2
-rw-r--r--projecttemplates/MvcRelyingParty/Views/Account/LogOn.aspx1
2 files changed, 2 insertions, 1 deletions
diff --git a/projecttemplates/MvcRelyingParty/Controllers/AccountController.cs b/projecttemplates/MvcRelyingParty/Controllers/AccountController.cs
index 03eb505..9046ece 100644
--- a/projecttemplates/MvcRelyingParty/Controllers/AccountController.cs
+++ b/projecttemplates/MvcRelyingParty/Controllers/AccountController.cs
@@ -120,7 +120,7 @@
var token = RelyingPartyLogic.User.ProcessUserLogin(response);
bool rememberMe = response.GetUntrustedCallbackArgument("rememberMe") == "1";
this.FormsAuth.SignIn(token.ClaimedIdentifier, rememberMe);
- string returnUrl = response.GetCallbackArgument("returnUrl");
+ string returnUrl = response.GetUntrustedCallbackArgument("returnUrl");
if (!String.IsNullOrEmpty(returnUrl)) {
return Redirect(returnUrl);
} else {
diff --git a/projecttemplates/MvcRelyingParty/Views/Account/LogOn.aspx b/projecttemplates/MvcRelyingParty/Views/Account/LogOn.aspx
index bb05c21..0a4c428 100644
--- a/projecttemplates/MvcRelyingParty/Views/Account/LogOn.aspx
+++ b/projecttemplates/MvcRelyingParty/Views/Account/LogOn.aspx
@@ -11,6 +11,7 @@
<% using (Html.BeginForm("LogOn", "Account")) { %>
<%= Html.AntiForgeryToken() %>
+ <%= Html.Hidden("ReturnUrl", Request.QueryString["ReturnUrl"]) %>
<div>
<fieldset>
<legend>Account Information</legend>