kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-04 19:53:44 +00:00
Code Issues Projects Releases Wiki Activity

Can again destroy data.

Browse Source
This commit is contained in:
James Cole
2021-03-07 08:16:33 +01:00
parent f2e5e7d182
commit d6dd6795fe
6 changed files with 53 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Api/V1/Controllers/todo-Destruction/DestroyController.php → app/Api/V1/Controllers/Data/DestroyController.php
View File

@@ -1,7 +1,7 @@
<?php
/**
/*
* DestroyController.php
* Copyright (c) 2020 james@firefly-iii.org
* Copyright (c) 2021 james@firefly-iii.org
*
* This file is part of Firefly III (https://github.com/firefly-iii).
*
@@ -24,7 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Data;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\DataDestroyRequest;
use FireflyIII\Api\V1\Requests\Data\DestroyRequest;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
@@ -52,9 +52,12 @@ use Illuminate\Http\JsonResponse;
class DestroyController extends Controller
{
/**
* @param DestroyRequest $request
*
* @return JsonResponse
* @throws FireflyException
*/
public function destroy(DataDestroyRequest $request): JsonResponse
public function destroy(DestroyRequest $request): JsonResponse
{
$objects = $request->getObjects();

17
app/Api/V1/Controllers/todo/UserController.php → app/Api/V1/Controllers/System/UserController.php
View File

@@ -1,8 +1,8 @@
<?php
/**
/*
* UserController.php
* Copyright (c) 2019 james@firefly-iii.org
* Copyright (c) 2021 james@firefly-iii.org
*
* This file is part of Firefly III (https://github.com/firefly-iii).
*
@@ -22,10 +22,11 @@
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers;
namespace FireflyIII\Api\V1\Controllers\System;
use FireflyIII\Api\V1\Requests\UserStoreRequest;
use FireflyIII\Api\V1\Requests\UserUpdateRequest;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\System\UserStoreRequest;
use FireflyIII\Api\V1\Requests\System\UserUpdateRequest;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Transformers\UserTransformer;
@@ -72,10 +73,14 @@ class UserController extends Controller
* @throws FireflyException
* @codeCoverageIgnore
*/
public function delete(User $user): JsonResponse
public function destroy(User $user): JsonResponse
{
/** @var User $admin */
$admin = auth()->user();
if($admin->id === $user->id) {
return response()->json([], 500);
}
if ($admin->id !== $user->id && $this->repository->hasRole($admin, 'owner')) {
$this->repository->destroy($user);

6
app/Api/V1/Requests/todo/DataDestroyRequest.php → app/Api/V1/Requests/Data/DestroyRequest.php
View File

@@ -21,16 +21,16 @@
declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests;
namespace FireflyIII\Api\V1\Requests\Data;
use FireflyIII\Support\Request\ChecksLogin;
use FireflyIII\Support\Request\ConvertsDataTypes;
use Illuminate\Foundation\Http\FormRequest;
/**
* Class DataDestroyRequest
* Class DestroyRequest
*/
class DataDestroyRequest extends FormRequest
class DestroyRequest extends FormRequest
{
use ConvertsDataTypes, ChecksLogin;

6
app/Api/V1/Requests/todo/UserStoreRequest.php → app/Api/V1/Requests/System/UserStoreRequest.php
View File

@@ -1,8 +1,8 @@
<?php
/**
/*
* UserStoreRequest.php
* Copyright (c) 2019 james@firefly-iii.org
* Copyright (c) 2021 james@firefly-iii.org
*
* This file is part of Firefly III (https://github.com/firefly-iii).
*
@@ -22,7 +22,7 @@
declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests;
namespace FireflyIII\Api\V1\Requests\System;
use FireflyIII\Rules\IsBoolean;
use FireflyIII\Support\Request\ChecksLogin;

6
app/Api/V1/Requests/todo/UserUpdateRequest.php → app/Api/V1/Requests/System/UserUpdateRequest.php
View File

@@ -1,8 +1,8 @@
<?php
/**
/*
* UserUpdateRequest.php
* Copyright (c) 2019 james@firefly-iii.org
* Copyright (c) 2021 james@firefly-iii.org
*
* This file is part of Firefly III (https://github.com/firefly-iii).
*
@@ -22,7 +22,7 @@
declare(strict_types=1);
namespace FireflyIII\Api\V1\Requests;
namespace FireflyIII\Api\V1\Requests\System;
use FireflyIII\Rules\IsBoolean;
use FireflyIII\Support\Request\ChecksLogin;