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

Add support for BadRequest in RazorPages (#7097) 

Addresses #7095
This commit is contained in:
Jass Bagga 2017-12-01 12:03:24 -08:00 committed by GitHub
parent 6b2a702ff4
commit 0bb3f18049
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 167 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Microsoft.AspNetCore.Mvc.Core/ControllerBase.cs
View File

@ -1750,7 +1750,7 @@ namespace Microsoft.AspNetCore.Mvc
/// <summary>
/// Creates an <see cref="BadRequestObjectResult"/> that produces a <see cref="StatusCodes.Status400BadRequest"/> response.
/// </summary>
/// <param name="modelState">The model state dictionary containing errors to be returned to the client.</param>
/// <param name="modelState">The <see cref="ModelStateDictionary" /> containing errors to be returned to the client.</param>
/// <returns>The created <see cref="BadRequestObjectResult"/> for the response.</returns>
[NonAction]
public virtual BadRequestObjectResult BadRequest(ModelStateDictionary modelState)
@ -1787,7 +1787,7 @@ namespace Microsoft.AspNetCore.Mvc
/// <summary>
/// Creates an <see cref="UnprocessableEntityObjectResult"/> that produces a <see cref="StatusCodes.Status422UnprocessableEntity"/> response.
/// </summary>
/// <param name="modelState">The model state dictionary containing errors to be returned to the client.</param>
/// <param name="modelState">The <see cref="ModelStateDictionary" /> containing errors to be returned to the client.</param>
/// <returns>The created <see cref="UnprocessableEntityObjectResult"/> for the response.</returns>
[NonAction]
public virtual UnprocessableEntityObjectResult UnprocessableEntity(ModelStateDictionary modelState)
@ -1820,7 +1820,7 @@ namespace Microsoft.AspNetCore.Mvc
/// <summary>
/// Creates an <see cref="ConflictObjectResult"/> that produces a <see cref="StatusCodes.Status409Conflict"/> response.
/// </summary>
/// <param name="modelState">The model state dictionary containing errors to be returned to the client.</param>
/// <param name="modelState">The <see cref="ModelStateDictionary" /> containing errors to be returned to the client.</param>
/// <returns>The created <see cref="ConflictObjectResult"/> for the response.</returns>
[NonAction]
public virtual ConflictObjectResult Conflict(ModelStateDictionary modelState)

33
src/Microsoft.AspNetCore.Mvc.RazorPages/PageBase.cs
View File

@ -145,6 +145,39 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages
}
}
/// <summary>
/// Creates a <see cref="BadRequestResult"/> that produces a <see cref="StatusCodes.Status400BadRequest"/> response.
/// </summary>
/// <returns>The created <see cref="BadRequestResult"/> for the response.</returns>
[NonAction]
public virtual BadRequestResult BadRequest()
=> new BadRequestResult();
/// <summary>
/// Creates a <see cref="BadRequestObjectResult"/> that produces a <see cref="StatusCodes.Status400BadRequest"/> response.
/// </summary>
/// <param name="error">An error object to be returned to the client.</param>
/// <returns>The created <see cref="BadRequestObjectResult"/> for the response.</returns>
[NonAction]
public virtual BadRequestObjectResult BadRequest(object error)
=> new BadRequestObjectResult(error);
/// <summary>
/// Creates a <see cref="BadRequestObjectResult"/> that produces a <see cref="StatusCodes.Status400BadRequest"/> response.
/// </summary>
/// <param name="modelState">The <see cref="ModelStateDictionary" /> containing errors to be returned to the client.</param>
/// <returns>The created <see cref="BadRequestObjectResult"/> for the response.</returns>
[NonAction]
public virtual BadRequestObjectResult BadRequest(ModelStateDictionary modelState)
{
if (modelState == null)
{
throw new ArgumentNullException(nameof(modelState));
}
return new BadRequestObjectResult(modelState);
}
/// <summary>
/// Creates a <see cref="ChallengeResult"/>.
/// </summary>

33
src/Microsoft.AspNetCore.Mvc.RazorPages/PageModel.cs
View File

@ -520,6 +520,39 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages
propertyFilter);
}
/// <summary>
/// Creates a <see cref="BadRequestResult"/> that produces a <see cref="StatusCodes.Status400BadRequest"/> response.
/// </summary>
/// <returns>The created <see cref="BadRequestResult"/> for the response.</returns>
[NonAction]
public virtual BadRequestResult BadRequest()
=> new BadRequestResult();
/// <summary>
/// Creates a <see cref="BadRequestObjectResult"/> that produces a <see cref="StatusCodes.Status400BadRequest"/> response.
/// </summary>
/// <param name="error">An error object to be returned to the client.</param>
/// <returns>The created <see cref="BadRequestObjectResult"/> for the response.</returns>
[NonAction]
public virtual BadRequestObjectResult BadRequest(object error)
=> new BadRequestObjectResult(error);
/// <summary>
/// Creates a <see cref="BadRequestObjectResult"/> that produces a <see cref="StatusCodes.Status400BadRequest"/> response.
/// </summary>
/// <param name="modelState">The <see cref="ModelStateDictionary" /> containing errors to be returned to the client.</param>
/// <returns>The created <see cref="BadRequestObjectResult"/> for the response.</returns>
[NonAction]
public virtual BadRequestObjectResult BadRequest(ModelStateDictionary modelState)
{
if (modelState == null)
{
throw new ArgumentNullException(nameof(modelState));
}
return new BadRequestObjectResult(modelState);
}
/// <summary>
/// Creates a <see cref="ChallengeResult"/>.
/// </summary>

14
test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesTest.cs
View File

@ -291,6 +291,20 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
}
[Fact]
public async Task PageHandlerCanReturnBadRequest()
{
// Arrange
var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/Pages/HandlerWithParameter");
// Act
var response = await Client.SendAsync(request);
// Assert
Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
Assert.Equal("Parameter cannot be null.", await response.Content.ReadAsStringAsync());
}
[Fact]
public async Task HelloWorld_CanGetContent()
{

29
test/Microsoft.AspNetCore.Mvc.RazorPages.Test/PageModelTest.cs
View File

@ -1495,6 +1495,35 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages
Assert.Equal(StatusCodes.Status401Unauthorized, result.StatusCode);
}
[Fact]
public void BadRequest_SetsStatusCode()
{
// Arrange
var page = new TestPage();
// Act
var result = page.BadRequest();
// Assert
Assert.IsType<BadRequestResult>(result);
Assert.Equal(StatusCodes.Status400BadRequest, result.StatusCode);
}
[Fact]
public void BadRequest_SetsStatusCodeAndResponseContent()
{
// Arrange
var page = new TestPage();
// Act
var result = page.BadRequest("Test Content");
// Assert
Assert.IsType<BadRequestObjectResult>(result);
Assert.Equal(StatusCodes.Status400BadRequest, result.StatusCode);
Assert.Equal("Test Content", result.Value);
}
[Fact]
public void NotFound_SetsStatusCode()
{

29
test/Microsoft.AspNetCore.Mvc.RazorPages.Test/PageTest.cs
View File

@ -1486,6 +1486,35 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages
Assert.Equal(StatusCodes.Status401Unauthorized, result.StatusCode);
}
[Fact]
public void BadRequest_SetsStatusCode()
{
// Arrange
var page = new TestPage();
// Act
var result = page.BadRequest();
// Assert
Assert.IsType<BadRequestResult>(result);
Assert.Equal(StatusCodes.Status400BadRequest, result.StatusCode);
}
[Fact]
public void BadRequest_SetsStatusCodeAndResponseContent()
{
// Arrange
var page = new TestPage();
// Act
var result = page.BadRequest("Test Content");
// Assert
Assert.IsType<BadRequestObjectResult>(result);
Assert.Equal(StatusCodes.Status400BadRequest, result.StatusCode);
Assert.Equal("Test Content", result.Value);
}
[Fact]
public void NotFound_SetsStatusCode()
{

1
test/WebSites/RazorPagesWebSite/HelloWorldWithPageModelAttributeModel.cs
View File

@ -1,7 +1,6 @@
// 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 Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
namespace RazorPagesWebSite

1
test/WebSites/RazorPagesWebSite/HelloWorldWithPageModelHandler.cs
View File

@ -1,7 +1,6 @@
// 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 Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc.RazorPages;
namespace RazorPagesWebSite

1
test/WebSites/RazorPagesWebSite/ModelWithPageFilter.cs
View File

@ -3,7 +3,6 @@
using System;
using System.Linq;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Mvc.RazorPages;

5
test/WebSites/RazorPagesWebSite/Pages/HandlerWithParameter.cshtml Normal file
View File

@ -0,0 +1,5 @@
@page
@model HandlerWithParameterModel
@{
}
Handler with parameter

21
test/WebSites/RazorPagesWebSite/Pages/HandlerWithParameter.cshtml.cs Normal file
View File

@ -0,0 +1,21 @@
// 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 Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
namespace RazorPagesWebSite.Pages
{
public class HandlerWithParameterModel : PageModel
{
public IActionResult OnGet(string testParameter = null)
{
if (testParameter == null)
{
return BadRequest("Parameter cannot be null.");
}
return Page();
}
}
}