huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove special cookie ajax redirect behavior

This commit is contained in:
Hao Kung 2015-07-09 16:43:34 -07:00
parent 8d7f052cf4
commit 5065835a05
3 changed files with 2 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNet.Authentication.Cookies/Notifications/CookieAuthenticationNotifications.cs
View File

@ -22,7 +22,7 @@ namespace Microsoft.AspNet.Authentication.Cookies
OnResponseSignIn = context => { };
OnResponseSignedIn = context => { };
OnResponseSignOut = context => { };
OnApplyRedirect = DefaultBehavior.ApplyRedirect;
OnApplyRedirect = context => context.Response.Redirect(context.RedirectUri);
OnException = context => { };
}

57
src/Microsoft.AspNet.Authentication.Cookies/Notifications/DefaultBehavior.cs
View File

@ -1,57 +0,0 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using Microsoft.AspNet.Http;
using Newtonsoft.Json;
namespace Microsoft.AspNet.Authentication.Cookies
{
internal static class DefaultBehavior
{
internal static readonly Action<CookieApplyRedirectContext> ApplyRedirect = context =>
{
if (IsAjaxRequest(context.Request))
{
var jsonResponse = JsonConvert.SerializeObject(new
{
status = context.Response.StatusCode,
headers = new
{
location = context.RedirectUri
}
}, Formatting.None);
context.Response.StatusCode = 200;
context.Response.Headers.Append("X-Responded-JSON", jsonResponse);
}
else
{
context.Response.Redirect(context.RedirectUri);
}
};
private static bool IsAjaxRequest(HttpRequest request)
{
var query = request.Query;
if (query != null)
{
if (query["X-Requested-With"] == "XMLHttpRequest")
{
return true;
}
}
var headers = request.Headers;
if (headers != null)
{
if (headers["X-Requested-With"] == "XMLHttpRequest")
{
return true;
}
}
return false;
}
}
}

18
test/Microsoft.AspNet.Authentication.Test/Cookies/CookieMiddlewareTests.cs
View File

@ -533,27 +533,11 @@ namespace Microsoft.AspNet.Authentication.Cookies
clock.Add(TimeSpan.FromMinutes(4));
Transaction transaction5 = await SendAsync(server, "http://example.com/me/Cookies", transaction4.CookieNameValue);
var transaction5 = await SendAsync(server, "http://example.com/me/Cookies", transaction4.CookieNameValue);
transaction5.SetCookie.ShouldBe(null);
FindClaimValue(transaction5, ClaimTypes.Name).ShouldBe("Alice");
}
[Fact]
public async Task AjaxRedirectsAsExtraHeaderOnTwoHundred()
{
var server = CreateServer(options =>
{
options.LoginPath = new PathString("/login");
options.AutomaticAuthentication = true;
});
var transaction = await SendAsync(server, "http://example.com/protected", ajaxRequest: true);
transaction.Response.StatusCode.ShouldBe(HttpStatusCode.OK);
var responded = transaction.Response.Headers.GetValues("X-Responded-JSON");
responded.Count().ShouldBe(1);
responded.Single().ShouldContain("\"location\"");
}
[Fact]
public async Task CookieUsesPathBaseByDefault()
{