Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Error handling for API

Browse Source
This commit is contained in:
David Bomba 2016-02-15 21:24:06 +11:00
parent cf4eeb8594
commit f8fee3e8cd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/AccountApiController.php
View File

@ -36,14 +36,14 @@ class AccountApiController extends BaseAPIController
{ {
if ( ! env(API_SECRET) || $request->api_secret !== env(API_SECRET)) { if ( ! env(API_SECRET) || $request->api_secret !== env(API_SECRET)) {
sleep(ERROR_DELAY); sleep(ERROR_DELAY);
return 'Invalid secret'; return $this->errorResponse(['message'=>'Invalid secret'],401);
} }
if (Auth::attempt(['email' => $request->email, 'password' => $request->password])) { if (Auth::attempt(['email' => $request->email, 'password' => $request->password])) {
return $this->processLogin($request); return $this->processLogin($request);
} else { } else {
sleep(ERROR_DELAY); sleep(ERROR_DELAY);
return 'Invalid credentials'; return $this->errorResponse(['message'=>'Invalid credentials'],401);
} }
} }

4
app/Http/Controllers/BaseAPIController.php
View File

@ -107,13 +107,13 @@ class BaseAPIController extends Controller
return Response::make($response, 200, $headers); return Response::make($response, 200, $headers);
} }
protected function errorResponse($response) protected function errorResponse($response, $httpErrorCode = 400)
{ {
$error['error'] = $response; $error['error'] = $response;
$error = json_encode($error, JSON_PRETTY_PRINT); $error = json_encode($error, JSON_PRETTY_PRINT);
$headers = Utils::getApiHeaders(); $headers = Utils::getApiHeaders();
return Response::make($error, 400, $headers); return Response::make($error, $httpErrorCode, $headers);
} }