From 40a2dff74ccc053145d68c7d9b38146e067dfdd4 Mon Sep 17 00:00:00 2001 From: crupest Date: Fri, 20 Nov 2020 20:13:11 +0800 Subject: fix: Fix a typo in user permissions. --- .../IntegratedTests/UserPermissionTest.cs | 14 +++++++------- .../Services/UserPermissionServiceTest.cs | 18 +++++++++--------- BackEnd/Timeline/Services/UserPermissionService.cs | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) (limited to 'BackEnd') diff --git a/BackEnd/Timeline.Tests/IntegratedTests/UserPermissionTest.cs b/BackEnd/Timeline.Tests/IntegratedTests/UserPermissionTest.cs index 3fb581f0..ba3d893e 100644 --- a/BackEnd/Timeline.Tests/IntegratedTests/UserPermissionTest.cs +++ b/BackEnd/Timeline.Tests/IntegratedTests/UserPermissionTest.cs @@ -115,12 +115,12 @@ namespace Timeline.Tests.IntegratedTests body.Permissions.Should().BeEquivalentTo(UserPermission.AllTimelineManagement.ToString()); } - await client.TestPutAsync($"users/user1/permissions/{UserPermission.HighlightTimelineManangement}"); + await client.TestPutAsync($"users/user1/permissions/{UserPermission.HighlightTimelineManagement}"); { var body = await client.GetUserAsync("user1"); body.Permissions.Should().BeEquivalentTo(UserPermission.AllTimelineManagement.ToString(), - UserPermission.HighlightTimelineManangement.ToString()); + UserPermission.HighlightTimelineManagement.ToString()); } await client.TestPutAsync($"users/user1/permissions/{UserPermission.UserManagement}"); @@ -129,11 +129,11 @@ namespace Timeline.Tests.IntegratedTests var body = await client.GetUserAsync("user1"); body.Permissions.Should().BeEquivalentTo( UserPermission.AllTimelineManagement.ToString(), - UserPermission.HighlightTimelineManangement.ToString(), + UserPermission.HighlightTimelineManagement.ToString(), UserPermission.UserManagement.ToString()); } - await client.TestDeleteAsync($"users/user1/permissions/{UserPermission.HighlightTimelineManangement}"); + await client.TestDeleteAsync($"users/user1/permissions/{UserPermission.HighlightTimelineManagement}"); { var body = await client.GetUserAsync("user1"); @@ -149,15 +149,15 @@ namespace Timeline.Tests.IntegratedTests body.Permissions.Should().BeEquivalentTo(UserPermission.UserManagement.ToString()); } - await client.TestPutAsync($"users/user1/permissions/{UserPermission.HighlightTimelineManangement}"); + await client.TestPutAsync($"users/user1/permissions/{UserPermission.HighlightTimelineManagement}"); { var body = await client.GetUserAsync("user1"); body.Permissions.Should().BeEquivalentTo( - UserPermission.HighlightTimelineManangement.ToString(), UserPermission.UserManagement.ToString()); + UserPermission.HighlightTimelineManagement.ToString(), UserPermission.UserManagement.ToString()); } - await client.TestDeleteAsync($"users/user1/permissions/{UserPermission.HighlightTimelineManangement}"); + await client.TestDeleteAsync($"users/user1/permissions/{UserPermission.HighlightTimelineManagement}"); { var body = await client.GetUserAsync("user1"); diff --git a/BackEnd/Timeline.Tests/Services/UserPermissionServiceTest.cs b/BackEnd/Timeline.Tests/Services/UserPermissionServiceTest.cs index ea20bd18..f20a7d62 100644 --- a/BackEnd/Timeline.Tests/Services/UserPermissionServiceTest.cs +++ b/BackEnd/Timeline.Tests/Services/UserPermissionServiceTest.cs @@ -62,27 +62,27 @@ namespace Timeline.Tests.Services var permission = await _service.GetPermissionsOfUserAsync(2); permission.Should().BeEquivalentTo(UserPermission.AllTimelineManagement); } - await _service.AddPermissionToUserAsync(2, UserPermission.HighlightTimelineManangement); + await _service.AddPermissionToUserAsync(2, UserPermission.HighlightTimelineManagement); { var permission = await _service.GetPermissionsOfUserAsync(2); - permission.Should().BeEquivalentTo(UserPermission.AllTimelineManagement, UserPermission.HighlightTimelineManangement); + permission.Should().BeEquivalentTo(UserPermission.AllTimelineManagement, UserPermission.HighlightTimelineManagement); } // Add duplicate permission should work. - await _service.AddPermissionToUserAsync(2, UserPermission.HighlightTimelineManangement); + await _service.AddPermissionToUserAsync(2, UserPermission.HighlightTimelineManagement); { var permission = await _service.GetPermissionsOfUserAsync(2); - permission.Should().BeEquivalentTo(UserPermission.AllTimelineManagement, UserPermission.HighlightTimelineManangement); + permission.Should().BeEquivalentTo(UserPermission.AllTimelineManagement, UserPermission.HighlightTimelineManagement); } - await _service.RemovePermissionFromUserAsync(2, UserPermission.HighlightTimelineManangement); + await _service.RemovePermissionFromUserAsync(2, UserPermission.HighlightTimelineManagement); { var permission = await _service.GetPermissionsOfUserAsync(2); permission.Should().BeEquivalentTo(UserPermission.AllTimelineManagement); } // Remove non-owned permission should work. - await _service.RemovePermissionFromUserAsync(2, UserPermission.HighlightTimelineManangement); + await _service.RemovePermissionFromUserAsync(2, UserPermission.HighlightTimelineManagement); { var permission = await _service.GetPermissionsOfUserAsync(2); permission.Should().BeEquivalentTo(UserPermission.AllTimelineManagement); @@ -92,19 +92,19 @@ namespace Timeline.Tests.Services [Fact] public async Task AddPermissionToInexistentUserShouldThrown() { - await _service.Awaiting(s => s.AddPermissionToUserAsync(10, UserPermission.HighlightTimelineManangement)).Should().ThrowAsync(); + await _service.Awaiting(s => s.AddPermissionToUserAsync(10, UserPermission.HighlightTimelineManagement)).Should().ThrowAsync(); } [Fact] public async Task RemovePermissionFromInexistentUserShouldThrown() { - await _service.Awaiting(s => s.RemovePermissionFromUserAsync(10, UserPermission.HighlightTimelineManangement)).Should().ThrowAsync(); + await _service.Awaiting(s => s.RemovePermissionFromUserAsync(10, UserPermission.HighlightTimelineManagement)).Should().ThrowAsync(); } [Fact] public async Task RemovePermissionFromInexistentUserShouldNotThrownIfNotCheck() { - await _service.Awaiting(s => s.RemovePermissionFromUserAsync(10, UserPermission.HighlightTimelineManangement, false)).Should().NotThrowAsync(); + await _service.Awaiting(s => s.RemovePermissionFromUserAsync(10, UserPermission.HighlightTimelineManagement, false)).Should().NotThrowAsync(); } } } diff --git a/BackEnd/Timeline/Services/UserPermissionService.cs b/BackEnd/Timeline/Services/UserPermissionService.cs index 42c93283..9683000a 100644 --- a/BackEnd/Timeline/Services/UserPermissionService.cs +++ b/BackEnd/Timeline/Services/UserPermissionService.cs @@ -22,7 +22,7 @@ namespace Timeline.Services /// /// This permission allow to add or remove highlight timelines. /// - HighlightTimelineManangement + HighlightTimelineManagement } /// -- cgit v1.2.3 From 8a1f0ea162880b7a702a7ee62aa572bff936ca59 Mon Sep 17 00:00:00 2001 From: crupest Date: Fri, 20 Nov 2020 21:05:50 +0800 Subject: feat: Remove administrator field from user. --- BackEnd/Timeline.Tests/IntegratedTests/UserTest.cs | 6 +++++- BackEnd/Timeline/Models/Http/UserInfo.cs | 4 ---- BackEnd/Timeline/Models/User.cs | 2 -- BackEnd/Timeline/Services/UserService.cs | 1 - 4 files changed, 5 insertions(+), 8 deletions(-) (limited to 'BackEnd') diff --git a/BackEnd/Timeline.Tests/IntegratedTests/UserTest.cs b/BackEnd/Timeline.Tests/IntegratedTests/UserTest.cs index 55a37198..e0ebf635 100644 --- a/BackEnd/Timeline.Tests/IntegratedTests/UserTest.cs +++ b/BackEnd/Timeline.Tests/IntegratedTests/UserTest.cs @@ -29,7 +29,11 @@ namespace Timeline.Tests.IntegratedTests public async Task Get() { using var client = await CreateDefaultClient(); - await client.TestGetAsync($"users/admin"); + var user = await client.TestGetAsync($"users/admin"); + user.Username.Should().Be("admin"); + user.Nickname.Should().Be("administrator"); + user.UniqueId.Should().NotBeNullOrEmpty(); + user.Permissions.Should().NotBeNull(); } [Fact] diff --git a/BackEnd/Timeline/Models/Http/UserInfo.cs b/BackEnd/Timeline/Models/Http/UserInfo.cs index 26b04e90..0f865172 100644 --- a/BackEnd/Timeline/Models/Http/UserInfo.cs +++ b/BackEnd/Timeline/Models/Http/UserInfo.cs @@ -25,10 +25,6 @@ namespace Timeline.Models.Http /// Nickname. /// public string Nickname { get; set; } = default!; - /// - /// True if the user is a administrator. - /// - public bool? Administrator { get; set; } = default!; #pragma warning disable CA2227 // Collection properties should be read only /// /// The permissions of the user. diff --git a/BackEnd/Timeline/Models/User.cs b/BackEnd/Timeline/Models/User.cs index 1e90cd1d..ae2afe85 100644 --- a/BackEnd/Timeline/Models/User.cs +++ b/BackEnd/Timeline/Models/User.cs @@ -11,8 +11,6 @@ namespace Timeline.Models public string Username { get; set; } = default!; public string Nickname { get; set; } = default!; - [Obsolete("Use permissions instead.")] - public bool Administrator { get; set; } public UserPermissions Permissions { get; set; } = default!; public DateTime UsernameChangeTime { get; set; } diff --git a/BackEnd/Timeline/Services/UserService.cs b/BackEnd/Timeline/Services/UserService.cs index f83d2928..2c5644cd 100644 --- a/BackEnd/Timeline/Services/UserService.cs +++ b/BackEnd/Timeline/Services/UserService.cs @@ -157,7 +157,6 @@ namespace Timeline.Services { UniqueId = entity.UniqueId, Username = entity.Username, - Administrator = permission.Contains(UserPermission.UserManagement), Permissions = permission, Nickname = string.IsNullOrEmpty(entity.Nickname) ? entity.Username : entity.Nickname, Id = entity.Id, -- cgit v1.2.3