...

3 files changed, 17 insertions, 47 deletions

diff --git a/BackEnd/Timeline.Tests/IntegratedTests/IntegratedTestBase.cs b/BackEnd/Timeline.Tests/IntegratedTests/IntegratedTestBase.cs
index 7cf27297..f75ce69c 100644
--- a/BackEnd/Timeline.Tests/IntegratedTests/IntegratedTestBase.cs
+++ b/BackEnd/Timeline.Tests/IntegratedTests/IntegratedTestBase.cs
@@ -7,7 +7,6 @@ using System.Net.Http;
 using System.Text.Json;

 using System.Text.Json.Serialization;

 using System.Threading.Tasks;

-using Timeline.Models;

 using Timeline.Models.Converters;

 using Timeline.Models.Http;

 using Timeline.Services;

@@ -60,26 +59,14 @@ namespace Timeline.Tests.IntegratedTests
 

             using (var scope = TestApp.Host.Services.CreateScope())

             {

-                var users = new List<User>()

+                var users = new List<(string username, string password, string nickname)>()

                 {

-                    new User

-                    {

-                        Username = "admin",

-                        Password = "adminpw",

-                        Administrator = true,

-                        Nickname = "administrator"

-                    }

+                    ("admin", "adminpw", "administrator")

                 };

 

                 for (int i = 1; i <= _userCount; i++)

                 {

-                    users.Add(new User

-                    {

-                        Username = $"user{i}",

-                        Password = $"user{i}pw",

-                        Administrator = false,

-                        Nickname = $"imuser{i}"

-                    });

+                    users.Add(($"user{i}", $"user{i}pw", $"imuser{i}"));

                 }

 

                 var userInfoList = new List<UserInfo>();

@@ -87,7 +74,9 @@ namespace Timeline.Tests.IntegratedTests
                 var userService = scope.ServiceProvider.GetRequiredService<IUserService>();

                 foreach (var user in users)

                 {

-                    await userService.CreateUser(user);

+                    var (username, password, nickname) = user;

+                    var u = await userService.CreateUser(username, password);

+                    await userService.ModifyUser(u.Id, new ModifyUserParams() { Nickname = nickname });

                 }

 

                 using var client = await CreateDefaultClient();

@@ -99,7 +88,7 @@ namespace Timeline.Tests.IntegratedTests
                 options.Converters.Add(new JsonDateTimeConverter());

                 foreach (var user in users)

                 {

-                    var s = await client.GetStringAsync($"users/{user.Username}");

+                    var s = await client.GetStringAsync($"users/{user.username}");

                     userInfoList.Add(JsonSerializer.Deserialize<UserInfo>(s, options));

                 }

 

diff --git a/BackEnd/Timeline.Tests/IntegratedTests/TokenTest.cs b/BackEnd/Timeline.Tests/IntegratedTests/TokenTest.cs
index 480d66cd..f4a406d1 100644
--- a/BackEnd/Timeline.Tests/IntegratedTests/TokenTest.cs
+++ b/BackEnd/Timeline.Tests/IntegratedTests/TokenTest.cs
@@ -103,7 +103,8 @@ namespace Timeline.Tests.IntegratedTests
             {

                 // create a user for test

                 var userService = scope.ServiceProvider.GetRequiredService<IUserService>();

-                await userService.ModifyUser("user1", new User { Password = "user1pw" });

+                var id = await userService.GetUserIdByUsername("user1");

+                await userService.ModifyUser(id, new ModifyUserParams { Password = "user1pw" });

             }

 

             (await client.PostAsJsonAsync(VerifyTokenUrl,

diff --git a/BackEnd/Timeline.Tests/IntegratedTests/UserTest.cs b/BackEnd/Timeline.Tests/IntegratedTests/UserTest.cs
index 9dfcc6a5..329e53f5 100644
--- a/BackEnd/Timeline.Tests/IntegratedTests/UserTest.cs
+++ b/BackEnd/Timeline.Tests/IntegratedTests/UserTest.cs
@@ -2,6 +2,7 @@ using FluentAssertions;
 using System.Collections.Generic;

 using System.Net;

 using System.Net.Http;

+using System.Net.Http.Json;

 using System.Threading.Tasks;

 using Timeline.Models.Http;

 using Timeline.Tests.Helpers;

@@ -129,13 +130,11 @@ namespace Timeline.Tests.IntegratedTests
                     {

                         Username = "newuser",

                         Password = "newpw",

-                        Administrator = true,

                         Nickname = "aaa"

                     });

                 var body = res.Should().HaveStatusCode(200)

                     .And.HaveJsonBody<UserInfo>()

                     .Which;

-                body.Administrator.Should().Be(true);

                 body.Nickname.Should().Be("aaa");

             }

 

@@ -144,14 +143,14 @@ namespace Timeline.Tests.IntegratedTests
                 var body = res.Should().HaveStatusCode(200)

                     .And.HaveJsonBody<UserInfo>()

                     .Which;

-                body.Administrator.Should().Be(true);

                 body.Nickname.Should().Be("aaa");

             }

 

             {

+                var token = userClient.DefaultRequestHeaders.Authorization.Parameter;

                 // Token should expire.

-                var res = await userClient.GetAsync("testing/auth/Authorize");

-                res.Should().HaveStatusCode(HttpStatusCode.Unauthorized);

+                var res = await userClient.PostAsJsonAsync<VerifyTokenRequest>("token/verify", new() { Token = token });

+                res.Should().HaveStatusCode(HttpStatusCode.BadRequest);

             }

 

             {

@@ -236,14 +235,6 @@ namespace Timeline.Tests.IntegratedTests
         }

 

         [Fact]

-        public async Task Patch_Administrator_Forbid()

-        {

-            using var client = await CreateClientAsUser();

-            var res = await client.PatchAsJsonAsync("users/user1", new UserPatchRequest { Administrator = true });

-            res.Should().HaveStatusCode(HttpStatusCode.Forbidden);

-        }

-

-        [Fact]

         public async Task Delete_Deleted()

         {

             using var client = await CreateClientAsAdministrator();

@@ -301,22 +292,16 @@ namespace Timeline.Tests.IntegratedTests
                 {

                     Username = "aaa",

                     Password = "bbb",

-                    Administrator = true,

-                    Nickname = "ccc"

                 });

                 var body = res.Should().HaveStatusCode(200)

                     .And.HaveJsonBody<UserInfo>().Which;

                 body.Username.Should().Be("aaa");

-                body.Nickname.Should().Be("ccc");

-                body.Administrator.Should().BeTrue();

             }

             {

                 var res = await client.GetAsync("users/aaa");

                 var body = res.Should().HaveStatusCode(200)

                     .And.HaveJsonBody<UserInfo>().Which;

                 body.Username.Should().Be("aaa");

-                body.Nickname.Should().Be("ccc");

-                body.Administrator.Should().BeTrue();

             }

             {

                 // Test password.

@@ -326,12 +311,10 @@ namespace Timeline.Tests.IntegratedTests
 

         public static IEnumerable<object[]> Op_CreateUser_InvalidModel_Data()

         {

-            yield return new[] { new CreateUserRequest { Username = "aaa", Password = "bbb" } };

-            yield return new[] { new CreateUserRequest { Username = "aaa", Administrator = true } };

-            yield return new[] { new CreateUserRequest { Password = "bbb", Administrator = true } };

-            yield return new[] { new CreateUserRequest { Username = "a!a", Password = "bbb", Administrator = true } };

-            yield return new[] { new CreateUserRequest { Username = "aaa", Password = "", Administrator = true } };

-            yield return new[] { new CreateUserRequest { Username = "aaa", Password = "bbb", Administrator = true, Nickname = new string('a', 40) } };

+            yield return new[] { new CreateUserRequest { Username = "aaa" } };

+            yield return new[] { new CreateUserRequest { Password = "bbb" } };

+            yield return new[] { new CreateUserRequest { Username = "a!a", Password = "bbb" } };

+            yield return new[] { new CreateUserRequest { Username = "aaa", Password = "" } };

         }

 

         [Theory]

@@ -354,7 +337,6 @@ namespace Timeline.Tests.IntegratedTests
                 {

                     Username = "user1",

                     Password = "bbb",

-                    Administrator = false

                 });

                 res.Should().HaveStatusCode(400)

                     .And.HaveCommonBody(ErrorCodes.UserController.UsernameConflict);

@@ -370,7 +352,6 @@ namespace Timeline.Tests.IntegratedTests
                 {

                     Username = "aaa",

                     Password = "bbb",

-                    Administrator = false

                 });

                 res.Should().HaveStatusCode(HttpStatusCode.Unauthorized);

             }

@@ -385,7 +366,6 @@ namespace Timeline.Tests.IntegratedTests
                 {

                     Username = "aaa",

                     Password = "bbb",

-                    Administrator = false

                 });

                 res.Should().HaveStatusCode(HttpStatusCode.Forbidden);

             }