Bugfixes: update-command

CatoTH · Sep 13, 2024 · c0b8640 · c0b8640
1 parent e788dd7
commit c0b8640
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/commands/UserController.php b/commands/UserController.php
@@ -17,7 +17,7 @@ class UserController extends Controller
     public function options($actionID): array
     {
         return match ($actionID) {
-            'create', 'createOrUpdate' => ['groupIds', 'organization', 'welcomeFile'],
+            'create', 'create-or-update' => ['groupIds', 'organization', 'welcomeFile'],
             'update' => ['groupIds', 'organization', 'password'],
             default => [],
         };
@@ -184,8 +184,15 @@ public function updateUser(?User $user, ?string $organization, ?string $password
             $user->changePassword($password);
         }
 
+        $existingGroups = [];
+        foreach ($user->userGroups as $userGroup) {
+            $existingGroups[] = $userGroup->id;
+        }
+
         foreach ($toUserGroups as $toUserGroup) {
-            $user->link('userGroups', $toUserGroup);
+            if (!in_array($toUserGroup->id, $existingGroups)) {
+                $user->link('userGroups', $toUserGroup);
+            }
         }
 
         $this->stdout('Updated the user: ' . $user->auth);