- refactored move method

- refactored FavouriteController.php store method
- added some tests methods
This commit is contained in:
Peter Papp
2021-02-27 10:22:35 +01:00
parent 92962aac17
commit 27675d7f38
7 changed files with 126 additions and 71 deletions

View File

@@ -116,7 +116,7 @@ class EditItemsController extends Controller
}
// If request have a change folder icon values set the folder icon
if ($request->type === 'folder' && $request->filled('emoji')) {
if ($request->type === 'folder' && ($request->filled('emoji') || $request->filled('color'))) {
Editor::set_folder_icon($request, $id);
}
@@ -499,10 +499,11 @@ class EditItemsController extends Controller
return Demo::response_204();
}
$to_unique_id = $request->input('to_unique_id');
$to_id = $request->input('to_id');
// Check permission to upload for authenticated editor
if ($request->user()->tokenCan('editor')) {
// check if shared_token cookie exist
if (!$request->hasCookie('shared_token')) abort('401');
@@ -510,11 +511,11 @@ class EditItemsController extends Controller
$shared = get_shared($request->cookie('shared_token'));
// Check access to requested directory
Guardian::check_item_access($to_unique_id, $shared);
Guardian::check_item_access($to_id, $shared);
}
// Move item
Editor::move($request, $to_unique_id);
Editor::move($request, $to_id);
return response('Done!', 204);
}

View File

@@ -2,8 +2,8 @@
namespace App\Http\Controllers\FileFunctions;
use App\Folder;
use App\Http\Tools\Demo;
use App\Models\Folder;
use Illuminate\Support\Facades\Validator;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
@@ -19,33 +19,25 @@ class FavouriteController extends Controller
*/
public function store(Request $request)
{
// Validate request
$validator = Validator::make($request->input('folders'), [
'*.unique_id' => 'required|integer',
]);
// todo: pridat validator ako AddToFavouritesRequest
// Return error
if ($validator->fails()) abort(400, 'Bad input');
foreach ($request->input('folders') as $id) {
foreach($request->input('folders') as $item) {
// Get user & folder
$user = Auth::user();
// Get user & folder
$user = Auth::user();
$folder = Folder::where('unique_id', $item['unique_id'])->first();
if (is_demo($user->id)) {
return Demo::favourites($user);
}
if (is_demo($user->id)) {
return Demo::favourites($user);
// Add folder to user favourites
$user
->favourite_folders()
->syncWithoutDetaching($id);
}
// Check ownership
if ($folder->user_id !== $user->id) abort(403);
// Add folder to user favourites
$user->favourite_folders()->syncWithoutDetaching($item['unique_id']);
}
// Return updated favourites
return $user->favourite_folders;
return response($user->favourite_folders, 204);
}
/**