remove unecessary gates for users routes and add UserPolicy
This commit is contained in:
@@ -6,6 +6,7 @@ use App\Models\Notification;
|
||||
use App\Models\User;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Gate;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use App\Services\GetRole;
|
||||
@@ -16,7 +17,6 @@ class UserController extends Controller
|
||||
{
|
||||
public function me(Request $request): JsonResponse {
|
||||
try {
|
||||
$this->authorize('me');
|
||||
return response()->json(UserService::getData($request->user()->id));
|
||||
} catch(\Exception $e) {
|
||||
Log::info($e->getMessage());
|
||||
@@ -68,15 +68,13 @@ class UserController extends Controller
|
||||
|
||||
public function deleteById(Request $request, int $id): JsonResponse {
|
||||
|
||||
if(!$this->isAdmin($request->user()->role)){
|
||||
if(Gate::denies('deleteOther', $request->user())){
|
||||
return response()->json(["message" => "Can't delete this user"], 403);
|
||||
}
|
||||
|
||||
try {
|
||||
$user = User::find($id);
|
||||
|
||||
if($user->role === 1) return response()->json(["message" => "Can't delete this user"], 403);
|
||||
|
||||
$user->delete();
|
||||
return response()->json(['message' => 'User deleted successfully']);
|
||||
} catch(\Exception $e) {
|
||||
@@ -116,7 +114,7 @@ class UserController extends Controller
|
||||
|
||||
public function validate(Request $request, int $id): JsonResponse {
|
||||
|
||||
if($request->user()->role != 1 && $request->user()->role != 2 || $request->user()->role == null){
|
||||
if(Gate::denies('validate', $request->user())){
|
||||
return response()->json(["message" => "Can't validate this user"], 403);
|
||||
}
|
||||
|
||||
@@ -145,7 +143,7 @@ class UserController extends Controller
|
||||
|
||||
public function addRole(Request $request, int $id): JsonResponse {
|
||||
|
||||
if(!$this->isAdmin($request->user()->role)){
|
||||
if(Gate::denies('addRole', $request->user())){
|
||||
return response()->json(["message" => "Can't add role to this user"], 403);
|
||||
}
|
||||
|
||||
@@ -187,7 +185,6 @@ class UserController extends Controller
|
||||
public function getUserTasks(Request $request): JsonResponse {
|
||||
|
||||
try {
|
||||
$this->authorize('getUserTasks');
|
||||
return response()->json(['data' => $request->user()->tasks]);
|
||||
} catch (\Exception $e) {
|
||||
Log::info($e->getMessage());
|
||||
|
||||
Reference in New Issue
Block a user