Fix issues with API authentication.

This commit is contained in:
James Cole
2018-02-09 14:47:37 +01:00
parent 3a813c30b4
commit d393c693de
8 changed files with 168 additions and 47 deletions

View File

@@ -25,12 +25,14 @@ namespace FireflyIII\Api\V1\Controllers;
use Auth;
use Carbon\Carbon;
use FireflyIII\Models\Bill;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Transformers\BillTransformer;
use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use League\Fractal\Manager;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use League\Fractal\Resource\Collection as FractalCollection;
use League\Fractal\Resource\Item;
use League\Fractal\Serializer\JsonApiSerializer;
use Preferences;
use Response;
@@ -40,6 +42,28 @@ use Response;
*/
class BillController extends Controller
{
/** @var BillRepositoryInterface */
private $repository;
/**
* BillController constructor.
*
* @throws \FireflyIII\Exceptions\FireflyException
*/
public function __construct()
{
parent::__construct();
$this->middleware(
function ($request, $next) {
/** @var BillRepositoryInterface repository */
$this->repository = app(BillRepositoryInterface::class);
$this->repository->setUser(auth()->user());
return $next($request);
}
);
}
/**
* Remove the specified resource from storage.
*
@@ -49,7 +73,9 @@ class BillController extends Controller
*/
public function destroy(Bill $bill)
{
//
$this->repository->destroy($bill);
return response()->json(null, 204);
}
/**
@@ -69,7 +95,7 @@ class BillController extends Controller
if (null !== $request->get('end')) {
$end = new Carbon($request->get('end'));
}
$paginator = $user->bills()->paginate($pageSize);
$paginator = $this->repository->getPaginator($pageSize);
/** @var Collection $bills */
$bills = $paginator->getCollection();
@@ -84,16 +110,34 @@ class BillController extends Controller
return Response::json($manager->createData($resource)->toArray());
}
/**
* Display the specified resource.
* @param Request $request
* @param Bill $bill
*
* @param \FireflyIII\Models\Bill $bill
*
* @return \Illuminate\Http\Response
* @return \Illuminate\Http\JsonResponse
*/
public function show(Bill $bill)
public function show(Request $request, Bill $bill)
{
//
$start = null;
$end = null;
if (null !== $request->get('start')) {
$start = new Carbon($request->get('start'));
}
if (null !== $request->get('end')) {
$end = new Carbon($request->get('end'));
}
$manager = new Manager();
$manager->parseIncludes(['attachments']);
$baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
$resource = new Item($bill, new BillTransformer($start, $end), 'bill');
return Response::json($manager->createData($resource)->toArray());
}
/**