FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show admin dropdown for admin-access ability (#515)

Browse Source 
* Show admin dropdown for admin-access ability closes #509

* Formatting
This commit is contained in:
Nabeel S
2020-01-30 09:00:41 -05:00
committed by GitHub
parent e431f75ad4
commit ff913e5304
8 changed files with 251 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
app/Exceptions/Handler.php
View File

@@ -30,8 +30,8 @@ class Handler extends ExceptionHandler
* A list of the exception types that should not be reported.
*/
protected $dontReport = [
AuthenticationException::class,
AuthorizationException::class,
//AuthenticationException::class,
//AuthorizationException::class,
AbstractHttpException::class,
IlluminateValidationException::class,
ModelNotFoundException::class,
@@ -50,36 +50,7 @@ class Handler extends ExceptionHandler
public function render($request, Exception $exception)
{
if ($request->is('api/*')) {
Log::error('API Error', $exception->getTrace());
if ($exception instanceof AbstractHttpException) {
return $exception->getResponse();
}
/*
* Not of the HttpException abstract class. Map these into
*/
if ($exception instanceof ModelNotFoundException ||
$exception instanceof NotFoundHttpException) {
$error = new AssetNotFound($exception);
return $error->getResponse();
}
// Custom exceptions should be extending HttpException
if ($exception instanceof SymfonyHttpException) {
$error = new SymfonyException($exception);
return $error->getResponse();
}
// Create the detailed errors from the validation errors
if ($exception instanceof IlluminateValidationException) {
$error = new ValidationException($exception);
return $error->getResponse();
}
$error = new GenericExceptionAbstract($exception);
return $error->getResponse();
return $this->handleApiError($request, $exception);
}
if ($exception instanceof AbstractHttpException
@@ -90,6 +61,51 @@ class Handler extends ExceptionHandler
return parent::render($request, $exception);
}
/**
* Handle errors in the API
*
* @param $request
* @param \Exception $exception
*
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
*/
private function handleApiError($request, Exception $exception)
{
Log::error('API Error', $exception->getTrace());
if ($exception instanceof AbstractHttpException) {
return $exception->getResponse();
}
/*
* Not of the HttpException abstract class. Map these into
*/
if ($exception instanceof ModelNotFoundException || $exception instanceof NotFoundHttpException) {
$error = new AssetNotFound($exception);
return $error->getResponse();
}
// Custom exceptions should be extending HttpException
if ($exception instanceof SymfonyHttpException) {
$error = new SymfonyException($exception);
return $error->getResponse();
}
// Create the detailed errors from the validation errors
if ($exception instanceof IlluminateValidationException) {
$error = new ValidationException($exception);
return $error->getResponse();
}
$error = new GenericExceptionAbstract($exception);
return $error->getResponse();
}
/**
* Convert an authentication exception into an unauthenticated response.
*