github-mirror/BookStack
github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-04-02 21:59:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated user avatar reset to clear relation id in database

Browse Source 
Added test to cover.
For #3977
This commit is contained in:
Dan Brown 2023-01-26 17:15:09 +00:00
parent 811be3a36a
commit 03ad288aaa
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
3 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/UserController.php
View File

@ -164,6 +164,8 @@ class UserController extends Controller
// Delete the profile image if reset option is in request // Delete the profile image if reset option is in request
if ($request->has('profile_image_reset')) { if ($request->has('profile_image_reset')) {
$this->imageRepo->destroyImage($user->avatar); $this->imageRepo->destroyImage($user->avatar);
$user->image_id = 0;
$user->save();
} }
$redirectUrl = userCan('users-manage') ? '/settings/users' : "/settings/users/{$user->id}"; $redirectUrl = userCan('users-manage') ? '/settings/users' : "/settings/users/{$user->id}";

1
tests/Settings/SettingsTest.php
View File

@ -2,7 +2,6 @@
namespace Tests\Settings; namespace Tests\Settings;
use Illuminate\Support\Facades\Storage;
use Tests\TestCase; use Tests\TestCase;
use Tests\Uploads\UsesImages; use Tests\Uploads\UsesImages;

33
tests/User/UserManagementTest.php
View File

@ -6,14 +6,18 @@ use BookStack\Actions\ActivityType;
use BookStack\Auth\Access\UserInviteService; use BookStack\Auth\Access\UserInviteService;
use BookStack\Auth\Role; use BookStack\Auth\Role;
use BookStack\Auth\User; use BookStack\Auth\User;
use BookStack\Uploads\Image;
use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use Mockery\MockInterface; use Mockery\MockInterface;
use RuntimeException; use RuntimeException;
use Tests\TestCase; use Tests\TestCase;
use Tests\Uploads\UsesImages;
class UserManagementTest extends TestCase class UserManagementTest extends TestCase
{ {
use UsesImages;
public function test_user_creation() public function test_user_creation()
{ {
/** @var User $user */ /** @var User $user */
@ -274,4 +278,33 @@ class UserManagementTest extends TestCase
$resp->assertSessionHasErrors(['language' => 'The language may not be greater than 15 characters.']); $resp->assertSessionHasErrors(['language' => 'The language may not be greater than 15 characters.']);
$resp->assertSessionHasErrors(['language' => 'The language may only contain letters, numbers, dashes and underscores.']); $resp->assertSessionHasErrors(['language' => 'The language may only contain letters, numbers, dashes and underscores.']);
} }
public function test_user_avatar_update_and_reset()
{
$user = $this->users->viewer();
$avatarFile = $this->getTestImage('avatar-icon.png');
$this->assertEquals(0, $user->image_id);
$upload = $this->asAdmin()->call('PUT', "/settings/users/{$user->id}", [
'name' => 'Barry Scott',
], [], ['profile_image' => $avatarFile], []);
$upload->assertRedirect('/settings/users');
$user->refresh();
$this->assertNotEquals(0, $user->image_id);
/** @var Image $image */
$image = Image::query()->findOrFail($user->image_id);
$this->assertFileExists(public_path($image->path));
$reset = $this->put("/settings/users/{$user->id}", [
'name' => 'Barry Scott',
'profile_image_reset' => 'true',
]);
$upload->assertRedirect('/settings/users');
$user->refresh();
$this->assertFileDoesNotExist(public_path($image->path));
$this->assertEquals(0, $user->image_id);
}
} }