kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-05 20:22:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'apifix' into develop

Browse Source 
* apifix:
  Fix issues with API authentication.

# Conflicts:
#	app/Api/V1/Controllers/BillController.php
#	app/Http/Middleware/HttpBinder.php
#	app/Transformers/AttachmentTransformer.php
#	app/Transformers/BillTransformer.php
#	app/Transformers/NoteTransformer.php
#	routes/api.php
This commit is contained in:
James Cole
2018-02-09 14:57:39 +01:00
parent d4a84ed198 d393c693de
commit d2a8819dd4
6 changed files with 104 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Api/V1/Controllers/BillController.php
View File

@@ -52,12 +52,16 @@ class BillController extends Controller
*/
public function __construct()
{
/** @var BillRepositoryInterface repository */
$this->repository = app(BillRepositoryInterface::class);
$user = Auth::guard('api')->user();
$this->repository->setUser($user);
parent::__construct();
$this->middleware(
function ($request, $next) {
/** @var BillRepositoryInterface repository */
$this->repository = app(BillRepositoryInterface::class);
$this->repository->setUser(auth()->user());
return $next($request);
}
);
}
/**
@@ -104,10 +108,10 @@ class BillController extends Controller
return Response::json($manager->createData($resource)->toArray());
}
/**
* Display the specified resource.
*
* @param \FireflyIII\Models\Bill $bill
* @param Request $request
* @param Bill $bill
*
* @return \Illuminate\Http\JsonResponse
*/