Shuffle perms

cmu-sei · Sep 13, 2024 · 98f92a1 · 98f92a1
1 parent ce3d1ec
commit 98f92a1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/src/Gameboard.Api/Features/User/Permissions/UserRolePermissionsConfigurationService.cs b/src/Gameboard.Api/Features/User/Permissions/UserRolePermissionsConfigurationService.cs
@@ -39,12 +39,14 @@ public IDictionary<UserRoleKey, IEnumerable<PermissionKey>> GetConfiguration()
                     PermissionKey.Support_EditSettings,
                     PermissionKey.Support_ManageTickets,
                     PermissionKey.Support_ViewTickets,
+                    PermissionKey.SystemNotifications_CreateEdit,
                     PermissionKey.Teams_ApproveNameChanges,
                     PermissionKey.Teams_DeployGameResources,
                     PermissionKey.Teams_EditSession,
                     PermissionKey.Teams_Enroll,
                     PermissionKey.Teams_Observe,
-                    PermissionKey.Teams_SendAnnouncements
+                    PermissionKey.Teams_SendAnnouncements,
+                    PermissionKey.Teams_SetSyncStartReady,
                 ]
             },
             {
@@ -53,29 +55,25 @@ public IDictionary<UserRoleKey, IEnumerable<PermissionKey>> GetConfiguration()
                     PermissionKey.Admin_View,
                     PermissionKey.Games_ViewUnpublished,
                     PermissionKey.Play_ChooseChallengeVariant,
+                    PermissionKey.Play_IgnoreExecutionWindow,
+                    PermissionKey.Play_IgnoreSessionResetSettings,
                     PermissionKey.Reports_View,
                     PermissionKey.Scores_ViewLive,
                     PermissionKey.Support_EditSettings,
                     PermissionKey.Support_ManageTickets,
                     PermissionKey.Support_ViewTickets,
-                    PermissionKey.SystemNotifications_CreateEdit,
                     PermissionKey.Teams_ApproveNameChanges,
                     PermissionKey.Teams_Observe,
                     PermissionKey.Teams_Enroll,
-                    PermissionKey.Teams_SetSyncStartReady,
                 ]
             },
             {
                 UserRoleKey.Tester,
                 [
-                    PermissionKey.Admin_View,
                     PermissionKey.Games_ViewUnpublished,
                     PermissionKey.Play_ChooseChallengeVariant,
                     PermissionKey.Play_IgnoreExecutionWindow,
                     PermissionKey.Play_IgnoreSessionResetSettings,
-                    PermissionKey.Teams_ApproveNameChanges,
-                    PermissionKey.Teams_SetSyncStartReady,
-                    PermissionKey.Teams_Enroll,
                 ]
             },
             { UserRoleKey.Member, [] }

diff --git a/src/Gameboard.Api/Features/User/Permissions/UserRolePermissionsService.cs b/src/Gameboard.Api/Features/User/Permissions/UserRolePermissionsService.cs
@@ -36,16 +36,16 @@ internal class UserRolePermissionsService(IActingUserService actingUserService,
         new()
         {
             Group = PermissionKeyGroup.Admin,
-            Key = PermissionKey.Sponsors_CreateEdit,
-            Name = "Create/edit sponsors",
-            Description = "Create and edit sponsor organizations"
+            Key = PermissionKey.Admin_View,
+            Name = "Admin Area",
+            Description = "Access the Admin area"
         },
         new()
         {
             Group = PermissionKeyGroup.Admin,
-            Key = PermissionKey.Admin_View,
-            Name = "Admin Area",
-            Description = "Access the Admin area and various data about teams (even those you're not on)"
+            Key = PermissionKey.SystemNotifications_CreateEdit,
+            Name = "Manage system notifications",
+            Description = "Create, edit, and delete notifications which appear at the top of the app"
         },
         new()
         {
@@ -118,6 +118,13 @@ internal class UserRolePermissionsService(IActingUserService actingUserService,
             Description = "View scores for all players and teams (even before the game has ended)"
         },
         new()
+        {
+            Group = PermissionKeyGroup.Admin,
+            Key = PermissionKey.Sponsors_CreateEdit,
+            Name = "Create/edit sponsors",
+            Description = "Create and edit sponsor organizations"
+        },
+        new()
         {
             Group = PermissionKeyGroup.Support,
             Key = PermissionKey.Support_EditSettings,

diff --git a/...oard.Api/Features/User/Requests/UserRolePermissionsOverview/UserRolePermissionOverview.cs b/...oard.Api/Features/User/Requests/UserRolePermissionsOverview/UserRolePermissionOverview.cs
@@ -39,7 +39,7 @@ await _validatorService
             Categories = groupedPermissions.Select(kv => new UserRolePermissionCategory
             {
                 Name = kv.Key.ToString(),
-                Permissions = kv.Value
+                Permissions = kv.Value.OrderBy(permission => permission.Name)
             }),
             Roles = roles.ToDictionary(kv => kv.Key, kv => kv),
             YourRole = _actingUserService.Get().Role