Fix roles usage

Author: Sigri44

src/Entity/User.php

@@ -89,8 +89,6 @@ public function getUsername(): string
     public function getRoles(): array
     {
         $roles = $this->roles;
-        // guarantee every user at least has ROLE_USER
-        //$roles[] = 'ROLE_USER';
 
         return array_unique($roles);
     }

src/Service/UserService.php

@@ -23,10 +23,24 @@ class UserService extends Service
      */
     public function userRegistration(Request $request): array
     {
-        if ($request->get('isAdmin')) {
-            $roles = ["ROLE_USER", "ROLE_ADMIN"];
-        } else {
-            $roles = ["ROLE_USER"];
+        $roles = ["ROLE_USER"];
+
+        switch ($request->get('quotaRole')) {
+            case 'isAdmin':
+                array_push($roles, "ROLE_ADMIN");
+                break;
+            case 'isVip':
+                array_push($roles, "ROLE_VIP");
+                break;
+            case 'isExternal':
+                array_push($roles, "ROLE_EXTERNAL");
+                break;
+            case 'isPremium':
+                array_push($roles, "ROLE_PREMIUM");
+                break;
+            case 'isFreemium':
+                array_push($roles, "ROLE_FREEMIUM");
+                break;
         }
 
         $user = $this->checkUserExistence($request->get('email'));

templates/admin/registerApiUser.html.twig

@@ -12,39 +12,33 @@
             </div>
             <div class="form-group">
                 <div class="form-check form-check-inline">
-                    <input class="form-check-input" type="checkbox" value="isUser" name="isUser" id="isUser" checked disabled>
-                    <label class="form-check-label" for="isUser">
-                        User
-                    </label>
-                </div>
-                <div class="form-check form-check-inline">
-                    <input class="form-check-input" type="checkbox" value="isAdmin" name="isAdmin" id="isAdmin">
+                    <input class="form-check-input" type="radio" value="isAdmin" name="quotaRole" id="isAdmin">
                     <label class="form-check-label" for="isAdmin">
                         Admin
                     </label>
                 </div>
                 <div class="form-check form-check-inline">
-                    <input class="form-check-input" type="checkbox" value="isFreemium" name="isFreemium" id="isFreemium">
-                    <label class="form-check-label" for="isFreemium">
-                        Freemium
+                    <input class="form-check-input" type="radio" value="isVip" name="quotaRole" id="isVip">
+                    <label class="form-check-label" for="isVip">
+                        VIP
                     </label>
                 </div>
                 <div class="form-check form-check-inline">
-                    <input class="form-check-input" type="checkbox" value="isPremium" name="isPremium" id="isPremium">
-                    <label class="form-check-label" for="isPremium">
-                        Premium
+                    <input class="form-check-input" type="radio" value="isExternal" name="quotaRole" id="isExternal">
+                    <label class="form-check-label" for="isExternal">
+                        External
                     </label>
                 </div>
                 <div class="form-check form-check-inline">
-                    <input class="form-check-input" type="checkbox" value="isExternal" name="isExternal" id="isExternal">
-                    <label class="form-check-label" for="isExternal">
-                        External
+                    <input class="form-check-input" type="radio" value="isPremium" name="quotaRole" id="isPremium">
+                    <label class="form-check-label" for="isPremium">
+                        Premium
                     </label>
                 </div>
                 <div class="form-check form-check-inline">
-                    <input class="form-check-input" type="checkbox" value="isVip" name="isVip" id="isVip">
-                    <label class="form-check-label" for="isVip">
-                        VIP
+                    <input class="form-check-input" type="radio" value="isFreemium" name="quotaRole" id="isFreemium">
+                    <label class="form-check-label" for="isFreemium">
+                        Freemium
                     </label>
                 </div>
             </div>