Unverified Commit 41983ea1 authored by Viral Solani's avatar Viral Solani Committed by GitHub

Merge pull request #169 from viralsolani/analysis-XplWZW

Apply fixes from StyleCI
parents 78a91df2 a30d7ba8
......@@ -61,20 +61,20 @@ class Handler extends ExceptionHandler
return response()->json([
'status' => 'error',
'error' => 'Token has not been provided',
'data' => json_decode("{}"),
'data' => json_decode('{}'),
], $exception->getStatusCode());
case \Tymon\JWTAuth\Exceptions\TokenExpiredException::class:
return response()->json([
'status' => 'error',
'error' => 'Token has expired',
'data' => json_decode("{}"),
'data' => json_decode('{}'),
], $exception->getStatusCode());
case \Tymon\JWTAuth\Exceptions\TokenInvalidException::class:
case \Tymon\JWTAuth\Exceptions\TokenBlacklistedException::class:
return response()->json([
'status' => 'error',
'error' => 'Token is invalid',
'data' => json_decode("{}"),
'data' => json_decode('{}'),
], $exception->getStatusCode());
default:
break;
......@@ -145,7 +145,6 @@ class Handler extends ExceptionHandler
*/
protected function unauthenticated($request, AuthenticationException $exception)
{
if ($request->expectsJson()) {
return response()->json(['error' => 'Unauthenticated.'], 401);
}
......
......@@ -178,7 +178,6 @@ class APIController extends Controller
return $this->setStatusCode(204)->respond(null);
}
/**Note this function is same as the below function but instead of responding with error below function returns error json
* Throw Validation.
*
......@@ -201,6 +200,6 @@ class APIController extends Controller
*/
public function throwValidation($validation)
{
return ["error"=>$validation->errors()];
return ['error'=>$validation->errors()];
}
}
......@@ -2,13 +2,12 @@
namespace App\Http\Controllers\Api\V1;
use App\Http\Requests\Backend\BlogTags\StoreApiBlogTagsRequest;
use App\Http\Resources\BlogTagsResource;
use App\Models\BlogTags\BlogTag;
use App\Repositories\Backend\BlogTags\BlogTagsRepository;
use Illuminate\Http\Request;
use App\Http\Requests\Backend\BlogTags\StoreApiBlogTagsRequest;
use Validator;
use Exception;
class BlogTagsController extends APIController
{
......@@ -75,8 +74,6 @@ class BlogTagsController extends APIController
* @param Request $request
*
* @return \Illuminate\Http\Response
*
*
*/
// public function store(StoreApiBlogTagsRequest $request)
// {
......
......@@ -2,17 +2,14 @@
namespace App\Http\Controllers\Api\V1;
use App\Events\Backend\Access\User\UserCreated;
use App\Events\Backend\Access\User\UserUpdated;
use App\Http\Resources\UserResource;
use App\Models\Access\User\User;
use App\Repositories\Backend\Access\User\UserRepository;
use Illuminate\Http\Request;
use Validator;
class DeactivatedUsersController extends APIController
{
protected $repository;
/**
* __construct.
*
......
......@@ -2,17 +2,14 @@
namespace App\Http\Controllers\Api\V1;
use App\Events\Backend\Access\User\UserCreated;
use App\Events\Backend\Access\User\UserUpdated;
use App\Http\Resources\UserResource;
use App\Models\Access\User\User;
use App\Repositories\Backend\Access\User\UserRepository;
use Illuminate\Http\Request;
use Validator;
class DeletedUsersController extends APIController
{
protected $repository;
/**
* __construct.
*
......@@ -38,5 +35,4 @@ class DeletedUsersController extends APIController
$this->repository->getForDataTable(0, true)->paginate($limit)
);
}
}
......@@ -22,7 +22,6 @@ class RolesController extends APIController
$this->repository = $repository;
}
/**
* Return the roles.
*
......@@ -115,7 +114,6 @@ class RolesController extends APIController
*
* @return Validator object
*/
public function validateRole(Request $request)
{
$permissions = '';
......
......@@ -26,7 +26,6 @@ class StoreApiBlogTagsRequest extends Request
*/
public function rules()
{
return [
'name' => 'required|max:191',
];
......
......@@ -28,13 +28,12 @@ Route::group(['namespace' => 'Api\V1', 'prefix' => 'v1', 'as' => 'v1.'], functio
// Route::post('password/reset', 'ResetPasswordController@reset')->name('password.reset');
});
// Users
Route::resource('users', 'UsersController', ['except' => ['create','edit']]);
Route::resource('users', 'UsersController', ['except' => ['create', 'edit']]);
Route::get('deactivatedUsers', 'DeactivatedUsersController@index');
Route::get('deletedUsers', 'DeletedUsersController@index');
// Roles
Route::resource('roles', 'RolesController' , ['except' => ['create', 'edit']]);
Route::resource('roles', 'RolesController', ['except' => ['create', 'edit']]);
// Permission
Route::resource('permission', 'PermissionController');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment