diff options
| -rw-r--r-- | BackEnd/Timeline.Tests/IntegratedTests/SearchTest.cs | 6 | ||||
| -rw-r--r-- | BackEnd/Timeline.Tests/IntegratedTests/UserTest.cs | 18 | ||||
| -rw-r--r-- | BackEnd/Timeline/Controllers/UserController.cs | 3 | ||||
| -rw-r--r-- | BackEnd/Timeline/Models/Http/HttpUserPostRequest.cs (renamed from BackEnd/Timeline/Models/Http/HttpCreateUserRequest.cs) | 4 |
4 files changed, 15 insertions, 16 deletions
diff --git a/BackEnd/Timeline.Tests/IntegratedTests/SearchTest.cs b/BackEnd/Timeline.Tests/IntegratedTests/SearchTest.cs index 7782ed82..10a2f115 100644 --- a/BackEnd/Timeline.Tests/IntegratedTests/SearchTest.cs +++ b/BackEnd/Timeline.Tests/IntegratedTests/SearchTest.cs @@ -39,10 +39,10 @@ namespace Timeline.Tests.IntegratedTests var client = await CreateClientAsAdministrator();
{
- await client.TestPostAsync("users", new HttpCreateUserRequest { Username = "hahaha", Password = "p" });
- await client.TestPostAsync("users", new HttpCreateUserRequest { Username = "bababa", Password = "p" });
+ await client.TestPostAsync("users", new HttpUserPostRequest { Username = "hahaha", Password = "p" });
+ await client.TestPostAsync("users", new HttpUserPostRequest { Username = "bababa", Password = "p" });
await client.TestPatchAsync("users/bababa", new HttpUserPatchRequest { Nickname = "hahaha" });
- await client.TestPostAsync("users", new HttpCreateUserRequest { Username = "gagaga", Password = "p" });
+ await client.TestPostAsync("users", new HttpUserPostRequest { Username = "gagaga", Password = "p" });
}
{
diff --git a/BackEnd/Timeline.Tests/IntegratedTests/UserTest.cs b/BackEnd/Timeline.Tests/IntegratedTests/UserTest.cs index 664a0604..c728a280 100644 --- a/BackEnd/Timeline.Tests/IntegratedTests/UserTest.cs +++ b/BackEnd/Timeline.Tests/IntegratedTests/UserTest.cs @@ -214,7 +214,7 @@ namespace Timeline.Tests.IntegratedTests {
using var client = await CreateClientAsAdministrator();
{
- var body = await client.TestPostAsync<HttpUser>(createUserUrl, new HttpCreateUserRequest
+ var body = await client.TestPostAsync<HttpUser>(createUserUrl, new HttpUserPostRequest
{
Username = "aaa",
Password = "bbb",
@@ -233,15 +233,15 @@ namespace Timeline.Tests.IntegratedTests public static IEnumerable<object[]> Op_CreateUser_InvalidModel_Data()
{
- yield return new[] { new HttpCreateUserRequest { Username = "aaa" } };
- yield return new[] { new HttpCreateUserRequest { Password = "bbb" } };
- yield return new[] { new HttpCreateUserRequest { Username = "a!a", Password = "bbb" } };
- yield return new[] { new HttpCreateUserRequest { Username = "aaa", Password = "" } };
+ yield return new[] { new HttpUserPostRequest { Username = "aaa" } };
+ yield return new[] { new HttpUserPostRequest { Password = "bbb" } };
+ yield return new[] { new HttpUserPostRequest { Username = "a!a", Password = "bbb" } };
+ yield return new[] { new HttpUserPostRequest { Username = "aaa", Password = "" } };
}
[Theory]
[MemberData(nameof(Op_CreateUser_InvalidModel_Data))]
- public async Task Op_CreateUser_InvalidModel(HttpCreateUserRequest body)
+ public async Task Op_CreateUser_InvalidModel(HttpUserPostRequest body)
{
using var client = await CreateClientAsAdministrator();
await client.TestPostAssertInvalidModelAsync(createUserUrl, body);
@@ -251,7 +251,7 @@ namespace Timeline.Tests.IntegratedTests public async Task Op_CreateUser_UsernameConflict()
{
using var client = await CreateClientAsAdministrator();
- await client.TestPostAssertErrorAsync(createUserUrl, new HttpCreateUserRequest
+ await client.TestPostAssertErrorAsync(createUserUrl, new HttpUserPostRequest
{
Username = "user1",
Password = "bbb",
@@ -262,7 +262,7 @@ namespace Timeline.Tests.IntegratedTests public async Task Op_CreateUser_NoAuth_Unauthorized()
{
using var client = await CreateDefaultClient();
- await client.TestPostAssertUnauthorizedAsync(createUserUrl, new HttpCreateUserRequest
+ await client.TestPostAssertUnauthorizedAsync(createUserUrl, new HttpUserPostRequest
{
Username = "aaa",
Password = "bbb",
@@ -273,7 +273,7 @@ namespace Timeline.Tests.IntegratedTests public async Task Op_CreateUser_User_Forbid()
{
using var client = await CreateClientAsUser();
- await client.TestPostAssertForbiddenAsync(createUserUrl, new HttpCreateUserRequest
+ await client.TestPostAssertForbiddenAsync(createUserUrl, new HttpUserPostRequest
{
Username = "aaa",
Password = "bbb",
diff --git a/BackEnd/Timeline/Controllers/UserController.cs b/BackEnd/Timeline/Controllers/UserController.cs index b6eaf152..76d6042f 100644 --- a/BackEnd/Timeline/Controllers/UserController.cs +++ b/BackEnd/Timeline/Controllers/UserController.cs @@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
-using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Timeline.Auth;
@@ -69,7 +68,7 @@ namespace Timeline.Controllers [ProducesResponseType(StatusCodes.Status400BadRequest)]
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
[ProducesResponseType(StatusCodes.Status403Forbidden)]
- public async Task<ActionResult<HttpUser>> Post([FromBody] HttpCreateUserRequest body)
+ public async Task<ActionResult<HttpUser>> Post([FromBody] HttpUserPostRequest body)
{
try
{
diff --git a/BackEnd/Timeline/Models/Http/HttpCreateUserRequest.cs b/BackEnd/Timeline/Models/Http/HttpUserPostRequest.cs index 7b221f73..c8cc004b 100644 --- a/BackEnd/Timeline/Models/Http/HttpCreateUserRequest.cs +++ b/BackEnd/Timeline/Models/Http/HttpUserPostRequest.cs @@ -5,9 +5,9 @@ using Timeline.Models.Validation; namespace Timeline.Models.Http
{
/// <summary>
- /// Request model for <see cref="UserController.CreateUser(HttpCreateUserRequest)"/>.
+ /// Request model for <see cref="UserController.Post(HttpUserPostRequest)"/>.
/// </summary>
- public class HttpCreateUserRequest
+ public class HttpUserPostRequest
{
/// <summary>
/// Username of the new user.
|