New roles added and set role endpoint properly registered.

Author: Martin Krulis

app/V1Module/router/RouterFactory.php

@@ -331,6 +331,7 @@ private static function createUsersRoutes(string $prefix): RouteList {
     $router[] = new PostRoute("$prefix/<id>", "Users:updateProfile");
     $router[] = new PostRoute("$prefix/<id>/settings", "Users:updateSettings");
     $router[] = new PostRoute("$prefix/<id>/create-local", "Users:createLocalAccount");
+    $router[] = new PostRoute("$prefix/<id>/role", "Users:setRole");
     return $router;
   }
 

app/V1Module/security/Roles.php

@@ -13,15 +13,19 @@ class Roles
   use Nette\SmartObject;
 
   public const STUDENT_ROLE = "student";
+  public const SUPERVISOR_STUDENT_ROLE = "supervisor-student";
   public const SUPERVISOR_ROLE = "supervisor";
+  public const SUPERVISOR_EMPOWERED_ROLE = "supervisor-empowered";
   public const SUPERADMIN_ROLE = "superadmin";
 
   /**
    * Array containing all above roles for better searching.
    */
   public const ROLES = [
     self::STUDENT_ROLE,
+    self::SUPERVISOR_STUDENT_ROLE,
     self::SUPERVISOR_ROLE,
+    self::SUPERVISOR_EMPOWERED_ROLE.
     self::SUPERADMIN_ROLE
   ];
 

app/config/permissions.neon

@@ -4,9 +4,16 @@ roles:
     - name: student
       parents: unauthenticated
 
-    - name: supervisor
+    - name: supervisor-student
       parents: student
 
+    - name: supervisor
+      parents: supervisor-student
+
+    - name: supervisor-empowered
+      parents: supervisor
+
+
     - name: superadmin
 permissions:
     - allow: true
@@ -130,7 +137,7 @@ permissions:
 
     - allow: true
       resource: group
-      role: supervisor
+      role: supervisor-student
       actions:
           - supervise
 
@@ -156,7 +163,7 @@ permissions:
         - viewDetail
 
     - allow: true
-      role: supervisor
+      role: supervisor-student
       resource: instance
       actions: addGroup
       conditions: instance.isMember
@@ -168,7 +175,7 @@ permissions:
           - viewGroups
 
     - allow: true
-      role: supervisor
+      role: supervisor-student
       resource: instance
       actions: []
 
@@ -239,7 +246,7 @@ permissions:
         - user.isSameUser
 
     - allow: true
-      role: supervisor
+      role: supervisor-student
       resource: user
       actions:
           - viewDetail
@@ -495,22 +502,22 @@ permissions:
           - referenceExerciseSolution.isExerciseAuthor
 
     - allow: true
-      role: supervisor
+      role: supervisor-student
       resource: exercise
       actions:
           - viewDetail
       conditions:
           - exercise.isPublic
 
     - allow: true
-      role: supervisor
+      role: supervisor-student
       resource: exercise
       actions:
           - viewAll
           - viewAllAuthors
 
     - allow: true
-      role: supervisor
+      role: supervisor-student
       resource: group
       actions:
           - createExercise
@@ -549,7 +556,7 @@ permissions:
             - file.isRelatedToAssignment
 
     - allow: true
-      role: supervisor
+      role: supervisor-student
       resource: uploadedFile
       actions:
           - download
@@ -559,7 +566,7 @@ permissions:
           - file.isExerciseOrAssignmentPublic
 
     - allow: true
-      role: supervisor
+      role: supervisor-student
       resource: uploadedFile
       actions:
           - viewDetail
@@ -596,7 +603,7 @@ permissions:
           - viewAll
 
     - allow: true
-      role: supervisor
+      role: supervisor-student
       resource: hardwareGroup
       actions:
           - viewAll
@@ -613,14 +620,14 @@ permissions:
           - viewAll
 
     - allow: true
-      role: supervisor
+      role: supervisor-student
       resource: pipeline
       actions:
           - viewDetail
           - viewAll
 
     - allow: true
-      role: supervisor
+      role: supervisor-student
       resource: pipeline
       actions:
           - update
@@ -642,7 +649,7 @@ permissions:
         - viewCourses
 
     - allow: true
-      role: supervisor
+      role: supervisor-student
       resource: sis
       actions:
         - createTerm