Skip to content

Commit 62a25a4

Browse files
committed
Improve the Exceptions Handler
1 parent 4a31b0c commit 62a25a4

1 file changed

Lines changed: 13 additions & 2 deletions

File tree

app/Platform/Exceptions/Handler.php

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ protected function createErrorResponse(HttpException $e, Request $request)
101101

102102
$e = FlattenException::create($e, $status);
103103

104-
if ($request->ajax() || $request->wantsJson()) {
104+
if ($this->isAjaxRequest($request)) {
105105
return Response::json($e->toArray(), $status, $e->getHeaders());
106106
}
107107

@@ -117,6 +117,17 @@ protected function createErrorResponse(HttpException $e, Request $request)
117117
return Response::make($view->render(), $status, $e->getHeaders());
118118
}
119119

120+
/**
121+
* Returns true if the given Request instance is AJAX.
122+
*
123+
* @param \Nova\Http\Request $request
124+
* @return bool
125+
*/
126+
protected function isAjaxRequest(Request $request)
127+
{
128+
return ($request->ajax() || $request->wantsJson());
129+
}
130+
120131
/**
121132
* Convert the given exception into a Response instance.
122133
*
@@ -143,7 +154,7 @@ protected function convertExceptionToResponse(Exception $e, Request $request)
143154
*/
144155
protected function unauthenticated(Request $request, AuthenticationException $exception)
145156
{
146-
if ($request->ajax() || $request->wantsJson() || $request->is('api/*')) {
157+
if ($this->isAjaxRequest($request) || $request->is('api/*')) {
147158
return Response::json(array('error' => 'Unauthenticated.'), 401);
148159
}
149160

0 commit comments

Comments
 (0)