Merge pull request #189 from crupest/admin

Refactor front end to use the new permission system. Enhance admin page.

3 files changed, 21 insertions, 17 deletions

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/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.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<UserNotExistException>();

+            await _service.Awaiting(s => s.AddPermissionToUserAsync(10, UserPermission.HighlightTimelineManagement)).Should().ThrowAsync<UserNotExistException>();

         }

 

         [Fact]

         public async Task RemovePermissionFromInexistentUserShouldThrown()

         {

-            await _service.Awaiting(s => s.RemovePermissionFromUserAsync(10, UserPermission.HighlightTimelineManangement)).Should().ThrowAsync<UserNotExistException>();

+            await _service.Awaiting(s => s.RemovePermissionFromUserAsync(10, UserPermission.HighlightTimelineManagement)).Should().ThrowAsync<UserNotExistException>();

         }

 

         [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();

         }

     }

 }