mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-10 15:44:11 -08:00
c0c02eebd2
* Toggles the disabled state of auto_increment_prefix To insert a prefix you had to toggle the checkbox, save the settings and reload. With this script it is immediate. Fixes #1390 * Delete asset image: made checkbox more visible Related to #3153 * Added personal-access-token component * Created basic API testing configuration * First version of /components endpoind cest * On-the-fly bearer token generation * Completed testing of PATCH and PUT methods * Added /components/{id}/assets route with tests * Updated route and dataTable in view * Completed test assertion * Added links to assets in ComponentsAssets view * Linked Company in AssetView page * Fixed purchase_cost format expectation in ApiComponentsCest * Refactored api routes file Sorted all prefixes in alphabetical order, removed duplicate routes. For every prefix I placed first Route::resource and then any additional route in a Route::group. Expanded arrays for readability and consistency. Removed useless calls as create and edit everywhere. * Refactored and added one more test to ApiComponentsAssetsCest * Marked one test as incomplete, 404 response should return json * Fixed value expectation * Refactored getToken() * Added API debugging routes * Added more information to ValidationException reporting Now the payload contains the validation errors for each invalid attribute. * /apitests: refactored expectations in component assertions * Created ApiAssetsCest * /apitests: Cleanup in Exceptions/Handler * Reverted change to use * Marked two tests as incomplete, looking for solutions
117 lines
3.8 KiB
PHP
117 lines
3.8 KiB
PHP
<?php
|
|
|
|
namespace App\Exceptions;
|
|
|
|
use Exception;
|
|
use Illuminate\Auth\AuthenticationException;
|
|
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
|
|
use App\Helpers\Helper;
|
|
use Illuminate\Validation\ValidationException;
|
|
|
|
class Handler extends ExceptionHandler
|
|
{
|
|
/**
|
|
* A list of the exception types that should not be reported.
|
|
*
|
|
* @var array
|
|
*/
|
|
protected $dontReport = [
|
|
\Illuminate\Auth\AuthenticationException::class,
|
|
\Illuminate\Auth\Access\AuthorizationException::class,
|
|
\Symfony\Component\HttpKernel\Exception\HttpException::class,
|
|
\Illuminate\Database\Eloquent\ModelNotFoundException::class,
|
|
\Illuminate\Session\TokenMismatchException::class,
|
|
\Illuminate\Validation\ValidationException::class,
|
|
];
|
|
|
|
/**
|
|
* Report or log an exception.
|
|
*
|
|
* This is a great spot to send exceptions to Sentry, Bugsnag, etc.
|
|
*
|
|
* @param \Exception $exception
|
|
* @return void
|
|
*/
|
|
public function report(Exception $exception)
|
|
{
|
|
parent::report($exception);
|
|
}
|
|
|
|
/**
|
|
* Render an exception into an HTTP response.
|
|
*
|
|
* @param \Illuminate\Http\Request $request
|
|
* @param \Exception $e
|
|
* @return \Illuminate\Http\Response
|
|
*/
|
|
public function render($request, Exception $e)
|
|
{
|
|
|
|
|
|
// CSRF token mismatch error
|
|
if ($e instanceof \Illuminate\Session\TokenMismatchException) {
|
|
return redirect()->back()->with('error', trans('general.token_expired'));
|
|
}
|
|
|
|
|
|
// Handle Ajax requests that fail because the model doesn't exist
|
|
if ($request->ajax() || $request->wantsJson()) {
|
|
|
|
if ($e instanceof \Illuminate\Database\Eloquent\ModelNotFoundException) {
|
|
$className = last(explode('\\', $e->getModel()));
|
|
return response()->json(Helper::formatStandardApiResponse('error', null, $className . ' not found'), 200);
|
|
}
|
|
|
|
if ($e instanceof \Illuminate\Validation\ValidationException) {
|
|
return response()->json(Helper::formatStandardApiResponse('error', $e->response['messages'], $e->getMessage(), 400));
|
|
}
|
|
|
|
if ($this->isHttpException($e)) {
|
|
|
|
$statusCode = $e->getStatusCode();
|
|
|
|
switch ($e->getStatusCode()) {
|
|
case '404':
|
|
return response()->json(Helper::formatStandardApiResponse('error', null, $statusCode . ' endpoint not found'), 404);
|
|
case '405':
|
|
return response()->json(Helper::formatStandardApiResponse('error', null, 'Method not allowed'), 405);
|
|
default:
|
|
return response()->json(Helper::formatStandardApiResponse('error', null, $statusCode), 405);
|
|
|
|
}
|
|
}
|
|
// Try to parse 500 Errors ina bit nicer way when debug is enabled.
|
|
if (config('app.debug')) {
|
|
return response()->json(Helper::formatStandardApiResponse('error', null, "An Error has occured! " . $e->getMessage()), 500);
|
|
}
|
|
|
|
}
|
|
|
|
|
|
if ($this->isHttpException($e) && (isset($statusCode)) && ($statusCode == '404' )) {
|
|
return response()->view('layouts/basic', [
|
|
'content' => view('errors/404')
|
|
]);
|
|
}
|
|
|
|
return parent::render($request, $e);
|
|
|
|
}
|
|
|
|
/**
|
|
* Convert an authentication exception into an unauthenticated response.
|
|
*
|
|
* @param \Illuminate\Http\Request $request
|
|
* @param \Illuminate\Auth\AuthenticationException $exception
|
|
* @return \Illuminate\Http\Response
|
|
*/
|
|
protected function unauthenticated($request, AuthenticationException $exception)
|
|
{
|
|
if ($request->expectsJson()) {
|
|
return response()->json(['error' => 'Unauthorized.'], 401);
|
|
}
|
|
|
|
return redirect()->guest('login');
|
|
}
|
|
}
|