Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions app/Http/Controllers/API/ControlController.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class ControlController extends Controller
{
public function index()
{
abort_if(Auth::User()->role !== 4, Response::HTTP_FORBIDDEN, '403 Forbidden');
abort_if(!Auth::User()->isAPI(), Response::HTTP_FORBIDDEN, '403 Forbidden');

$activities = Control::all();

Expand All @@ -23,7 +23,7 @@ public function index()

public function store(Request $request)
{
abort_if(Auth::User()->role !== 4, Response::HTTP_FORBIDDEN, '403 Forbidden');
abort_if(!Auth::User()->isAPI(), Response::HTTP_FORBIDDEN, '403 Forbidden');

$control = Control::create($request->all());

Expand All @@ -50,14 +50,16 @@ public function store(Request $request)

public function show(Control $control)
{
abort_if(Auth::User()->role !== 4, Response::HTTP_FORBIDDEN, '403 Forbidden');
abort_if(!Auth::User()->isAPI(), Response::HTTP_FORBIDDEN, '403 Forbidden');

$control['measures'] = $control->measures()->pluck('id');

return response()->json($control);
}

public function update(Request $request, Control $control)
{
abort_if(Auth::User()->role !== 4, Response::HTTP_FORBIDDEN, '403 Forbidden');
abort_if(!Auth::User()->isAPI(), Response::HTTP_FORBIDDEN, '403 Forbidden');

$control->update($request->all());

Expand All @@ -84,7 +86,7 @@ public function update(Request $request, Control $control)

public function destroy(Control $control)
{
abort_if(Auth::User()->role !== 4, Response::HTTP_FORBIDDEN, '403 Forbidden');
abort_if(!Auth::User()->isAPI(), Response::HTTP_FORBIDDEN, '403 Forbidden');

$control->measures()->detach();
$control->delete();
Expand Down
12 changes: 7 additions & 5 deletions app/Http/Controllers/API/MeasureController.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class MeasureController extends Controller
{
public function index()
{
abort_if(Auth::User()->isAPI(), Response::HTTP_FORBIDDEN, '403 Forbidden');
abort_if(!Auth::User()->isAPI(), Response::HTTP_FORBIDDEN, '403 Forbidden');

$measures = Measure::all();

Expand All @@ -21,7 +21,7 @@ public function index()

public function store(Request $request)
{
abort_if(Auth::User()->isAPI(), Response::HTTP_FORBIDDEN, '403 Forbidden');
abort_if(!Auth::User()->isAPI(), Response::HTTP_FORBIDDEN, '403 Forbidden');

$measure = Measure::query()->create($request->all());
if ($request->has('controls')) {
Expand All @@ -33,14 +33,16 @@ public function store(Request $request)

public function show(Measure $measure)
{
abort_if(Auth::User()->isAPI(), Response::HTTP_FORBIDDEN, '403 Forbidden');
abort_if(!Auth::User()->isAPI(), Response::HTTP_FORBIDDEN, '403 Forbidden');

$measure['controls'] = $measure->controls()->pluck('id');

return response()->json($measure);
}

public function update(Request $request, Measure $measure)
{
abort_if(Auth::User()->isAPI(), Response::HTTP_FORBIDDEN, '403 Forbidden');
abort_if(!Auth::User()->isAPI(), Response::HTTP_FORBIDDEN, '403 Forbidden');

$measure->update($request->all());
if ($request->has('controls')) {
Expand All @@ -52,7 +54,7 @@ public function update(Request $request, Measure $measure)

public function destroy(Measure $measure)
{
abort_if(Auth::User()->isAPI(), Response::HTTP_FORBIDDEN, '403 Forbidden');
abort_if(!Auth::User()->isAPI(), Response::HTTP_FORBIDDEN, '403 Forbidden');

$measure->delete();

Expand Down