Merge branch 'main' of https://github.com/inikoo/aiku into main

app/Actions/SysAdmin/Guest/UpdateGuest.php

@@ -48,8 +48,7 @@ public function handle(Guest $guest, array $modelData): Guest
                 }
             }
         }
-
-        if ($user = $guest->getUser()) {
+        if (!empty($credentials) && $user = $guest->getUser()) {
             UpdateUser::run($user, $credentials);
         }
 
@@ -122,7 +121,11 @@ public function rules(): array
 
 
             ];
-            $rules['password']          = ['sometimes', 'required', app()->isLocal() || app()->environment('testing') ? null : Password::min(8)->uncompromised()];
+            $rules['password'] = [
+                'sometimes',
+                'required',
+                app()->isLocal() || app()->environment('testing') ? 'min:8' : Password::min(8)->uncompromised(),
+            ];
         }
 
 

tests/Feature/AikuSections/SysAdminTest.php

@@ -344,6 +344,33 @@
     return $guest;
 })->depends('create guest from command');
 
+test('update guest credentials', function ($guest) {
+    app()->instance('group', $guest->group);
+    setPermissionsTeamId($guest->group->id);
+
+    $guest = UpdateGuest::make()->action($guest, ['username' => 'testuser']);
+    expect($guest->getUser()->username)->toBe('testuser')
+    ->and(Hash::check('hello1234', $guest->getUser()->password))->toBeTrue();
+
+    $guest = UpdateGuest::make()->action($guest, ['password' => 'testoooo']);
+    expect($guest->getUser()->username)->toBe('testuser')
+    ->and(Hash::check('testoooo', $guest->getUser()->password))->toBeTrue();
+
+    return $guest;
+})->depends('update guest');
+
+test('update guest status', function ($guest) {
+    app()->instance('group', $guest->group);
+    setPermissionsTeamId($guest->group->id);
+
+    $guest = UpdateGuest::make()->action($guest, ['status' => true]);
+    expect($guest->getUser()->username)->toBe('testuser')
+    ->and(Hash::check('testoooo', $guest->getUser()->password))->toBeTrue()
+    ->and($guest->status)->toBeTrue();
+
+    return $guest;
+})->depends('update guest credentials');
+
 test('fail to create guest with invalid usernames', function (Group $group) {
     app()->instance('group', $group);
     setPermissionsTeamId($group->id);
@@ -380,7 +407,7 @@
 })->depends('update guest');
 
 test('update user username', function (User $user) {
-    expect($user->username)->toBe('pika');
+    expect($user->username)->toBe('testuser');
     $user = UpdateUser::make()->action($user, [
         'username' => 'new-username'
     ]);