diff options
| author | crupest <crupest@outlook.com> | 2020-11-20 21:05:50 +0800 |
|---|---|---|
| committer | crupest <crupest@outlook.com> | 2020-11-20 21:05:50 +0800 |
| commit | aa3faef40e6ea79685cf08aeb5ae5ba744bf2437 (patch) | |
| tree | 40836b5dc6a6f6c617c2ccb394b144299fce2155 | |
| parent | 6897dbd6aec8ffebdad9622e1242fb24415fe89e (diff) | |
| download | timeline-aa3faef40e6ea79685cf08aeb5ae5ba744bf2437.tar.gz timeline-aa3faef40e6ea79685cf08aeb5ae5ba744bf2437.tar.bz2 timeline-aa3faef40e6ea79685cf08aeb5ae5ba744bf2437.zip | |
feat: Remove administrator field from user.
| -rw-r--r-- | BackEnd/Timeline.Tests/IntegratedTests/UserTest.cs | 6 | ||||
| -rw-r--r-- | BackEnd/Timeline/Models/Http/UserInfo.cs | 4 | ||||
| -rw-r--r-- | BackEnd/Timeline/Models/User.cs | 2 | ||||
| -rw-r--r-- | BackEnd/Timeline/Services/UserService.cs | 1 |
4 files changed, 5 insertions, 8 deletions
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<UserInfo>($"users/admin");
+ var user = await client.TestGetAsync<UserInfo>($"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.
/// </summary>
public string Nickname { get; set; } = default!;
- /// <summary>
- /// True if the user is a administrator.
- /// </summary>
- public bool? Administrator { get; set; } = default!;
#pragma warning disable CA2227 // Collection properties should be read only
/// <summary>
/// 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,
|