From 14b2e80774cebaf5aee20717c49786e0de834599 Mon Sep 17 00:00:00 2001 From: Vikram Chand Date: Sat, 6 Jan 2024 15:28:05 +0530 Subject: [PATCH 01/57] Updated: permission denied response --- Helpers/backend.php | 9 ++++++++- Http/Controllers/Backend/UsersController.php | 8 ++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Helpers/backend.php b/Helpers/backend.php index 638a2751f..58ab1f275 100644 --- a/Helpers/backend.php +++ b/Helpers/backend.php @@ -112,5 +112,12 @@ function vh_get_backend_file($file_path) return vh_get_backend_theme_url()."/".$file_path; } //----------------------------------------------------------------------------------- - +function vh_get_permission_denied_response($permission_slug){ + $response['success'] = false; + $response['errors'][] = trans("vaahcms::messages.permission_denied"); + if(env('APP_DEBUG')){ + $response['hint'][] = 'You don\'t have "'.$permission_slug.'" permission.'; + } + return $response; +} //----------------------------------------------------------------------------------- diff --git a/Http/Controllers/Backend/UsersController.php b/Http/Controllers/Backend/UsersController.php index 65a424c86..888ab9a63 100644 --- a/Http/Controllers/Backend/UsersController.php +++ b/Http/Controllers/Backend/UsersController.php @@ -203,11 +203,11 @@ public function deleteList(Request $request): JsonResponse //---------------------------------------------------------- public function createItem(Request $request): JsonResponse { - if(!Auth::user()->hasPermission('can-create-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); - return response()->json($response); + $permission_slug = 'can-create-user'; + + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response($permission_slug)); } try { From 66185ead1eed8a4e001df5e57cf6f26f4018182e Mon Sep 17 00:00:00 2001 From: Alam Date: Sat, 6 Jan 2024 16:26:35 +0530 Subject: [PATCH 02/57] Updated: registrations permission denied response --- .../Backend/RegistrationsController.php | 97 ++++++++----------- 1 file changed, 40 insertions(+), 57 deletions(-) diff --git a/Http/Controllers/Backend/RegistrationsController.php b/Http/Controllers/Backend/RegistrationsController.php index d4503412a..4a3eccf6e 100644 --- a/Http/Controllers/Backend/RegistrationsController.php +++ b/Http/Controllers/Backend/RegistrationsController.php @@ -20,11 +20,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-registrations-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-registrations-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response($permission_slug)); } try { @@ -93,11 +92,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-registrations-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-registrations-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response($permission_slug)); } try { @@ -119,11 +117,11 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function updateList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-registrations')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - return response()->json($response); + $permission_slug = 'can-update-registrations'; + + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response($permission_slug)); } try { @@ -145,13 +143,11 @@ public function updateList(Request $request): JsonResponse //---------------------------------------------------------- public function listAction(Request $request, $type): JsonResponse { - if (!Auth::user()->hasPermission('can-update-registrations') || - !Auth::user()->hasPermission('can-manage-registrations') - ) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - return response()->json($response); + if(!Auth::user()->hasPermission('can-update-registrations')) { + return response()->json(vh_get_permission_denied_response('can-update-registrations')); + } elseif(!Auth::user()->hasPermission('can-manage-registrations')) { + return response()->json(vh_get_permission_denied_response('can-manage-registrations')); } try { @@ -173,13 +169,11 @@ public function listAction(Request $request, $type): JsonResponse //---------------------------------------------------------- public function deleteList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-registrations') || - !Auth::user()->hasPermission('can-delete-registrations')) - { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - return response()->json($response); + if(!Auth::user()->hasPermission('can-update-registrations')) { + return response()->json(vh_get_permission_denied_response('can-update-registrations')); + } elseif(!Auth::user()->hasPermission('can-delete-registrations')) { + return response()->json(vh_get_permission_denied_response('can-delete-registrations')); } try { @@ -201,12 +195,11 @@ public function deleteList(Request $request): JsonResponse //---------------------------------------------------------- public function createItem(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-create-registrations')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-create-registrations'; - return response()->json($response); - } + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response($permission_slug)); + } try { $response = Registration::createItem($request); @@ -227,12 +220,11 @@ public function createItem(Request $request): JsonResponse //---------------------------------------------------------- public function getItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-read-registrations')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-read-registrations'; - return response()->json($response); - } + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response($permission_slug)); + } try { $response = Registration::getItem($id); @@ -253,12 +245,10 @@ public function getItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function updateItem(Request $request ,$id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-registrations')) - { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-registrations'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response($permission_slug)); } try { @@ -280,13 +270,10 @@ public function updateItem(Request $request ,$id): JsonResponse //---------------------------------------------------------- public function deleteItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-registrations') || - !Auth::user()->hasPermission('can-delete-registrations') - ) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission('can-update-registrations')) { + return response()->json(vh_get_permission_denied_response('can-update-registrations')); + } elseif(!Auth::user()->hasPermission('can-delete-registrations')) { + return response()->json(vh_get_permission_denied_response('can-delete-registrations')); } try { @@ -308,13 +295,10 @@ public function deleteItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function itemAction(Request $request, $id, $action): JsonResponse { - if (!Auth::user()->hasPermission('can-update-registrations') || - !Auth::user()->hasPermission('can-manage-registrations') - ) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission('can-update-registrations')) { + return response()->json(vh_get_permission_denied_response('can-update-registrations')); + } elseif(!Auth::user()->hasPermission('can-manage-registrations')) { + return response()->json(vh_get_permission_denied_response('can-manage-registrations')); } try { @@ -355,11 +339,10 @@ public function sendVerificationEmail(Request $request,$id): JsonResponse //---------------------------------------------------------- public function createUser(Request $request,$id): JsonResponse { - if (!Auth::user()->hasPermission('can-create-users-from-registrations')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-create-users-from-registrations'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response($permission_slug)); } try { From 43bf19add56391d3380297cb1130fa8d1696c128 Mon Sep 17 00:00:00 2001 From: Vikram Chand Date: Sat, 6 Jan 2024 16:46:10 +0530 Subject: [PATCH 03/57] Updated: haspermission param --- Helpers/backend.php | 7 +++++-- Http/Controllers/Backend/RegistrationsController.php | 8 ++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Helpers/backend.php b/Helpers/backend.php index 58ab1f275..8ff9dfb99 100644 --- a/Helpers/backend.php +++ b/Helpers/backend.php @@ -112,11 +112,14 @@ function vh_get_backend_file($file_path) return vh_get_backend_theme_url()."/".$file_path; } //----------------------------------------------------------------------------------- -function vh_get_permission_denied_response($permission_slug){ +function vh_get_permission_denied_response($permission_slugs){ $response['success'] = false; + + $text = implode(', ',$permission_slugs); + $response['errors'][] = trans("vaahcms::messages.permission_denied"); if(env('APP_DEBUG')){ - $response['hint'][] = 'You don\'t have "'.$permission_slug.'" permission.'; + $response['hint'][] = 'You don\'t have "'.$text.'" permission.'; } return $response; } diff --git a/Http/Controllers/Backend/RegistrationsController.php b/Http/Controllers/Backend/RegistrationsController.php index 4a3eccf6e..8811a806e 100644 --- a/Http/Controllers/Backend/RegistrationsController.php +++ b/Http/Controllers/Backend/RegistrationsController.php @@ -143,11 +143,11 @@ public function updateList(Request $request): JsonResponse //---------------------------------------------------------- public function listAction(Request $request, $type): JsonResponse { + $permission_slugs = ['can-update-registrations','can-manage-registrations']; - if(!Auth::user()->hasPermission('can-update-registrations')) { - return response()->json(vh_get_permission_denied_response('can-update-registrations')); - } elseif(!Auth::user()->hasPermission('can-manage-registrations')) { - return response()->json(vh_get_permission_denied_response('can-manage-registrations')); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { From 2dcdd79e5d10f9eb1df31001ae9f1f31805381eb Mon Sep 17 00:00:00 2001 From: Alam Date: Sat, 6 Jan 2024 17:27:15 +0530 Subject: [PATCH 04/57] Updated: users permission denied response --- Http/Controllers/Backend/UsersController.php | 138 ++++++++----------- 1 file changed, 57 insertions(+), 81 deletions(-) diff --git a/Http/Controllers/Backend/UsersController.php b/Http/Controllers/Backend/UsersController.php index 888ab9a63..f18d3c08a 100644 --- a/Http/Controllers/Backend/UsersController.php +++ b/Http/Controllers/Backend/UsersController.php @@ -20,11 +20,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-users-section')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slug = 'has-access-of-users-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -107,11 +106,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-users-section')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slug = 'has-access-of-users-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -132,11 +130,10 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function updateList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slug = 'can-update-users'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -158,11 +155,10 @@ public function updateList(Request $request): JsonResponse //---------------------------------------------------------- public function listAction(Request $request, $type): JsonResponse { - if (!Auth::user()->hasPermission('can-update-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slug = 'can-update-users'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -207,7 +203,7 @@ public function createItem(Request $request): JsonResponse $permission_slug = 'can-create-user'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response($permission_slug)); + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -229,11 +225,10 @@ public function createItem(Request $request): JsonResponse //---------------------------------------------------------- public function getItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-read-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slug = 'can-read-users'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -255,11 +250,10 @@ public function getItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function updateItem(Request $request,$id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slug = 'can-update-users'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -291,13 +285,11 @@ public function updateItem(Request $request,$id): JsonResponse //---------------------------------------------------------- public function deleteItem(Request $request,$id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-users') || - !Auth::user()->hasPermission('can-delete-users') - ) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slugs = ['can-update-users','can-delete-users']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -319,13 +311,11 @@ public function deleteItem(Request $request,$id): JsonResponse //---------------------------------------------------------- public function itemAction(Request $request,$id,$action): JsonResponse { - if(!Auth::user()->hasPermission('can-manage-users') && - !Auth::user()->hasPermission('can-update-users') - ) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slugs = ['can-manage-users','can-update-users']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) && + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -356,11 +346,10 @@ public function itemAction(Request $request,$id,$action): JsonResponse //---------------------------------------------------------- public function getItemRoles(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-read-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slug = 'can-read-users'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -439,13 +428,11 @@ public function postActions(Request $request, $action) : JsonResponse //------------------------------------ case 'bulk-change-status': - if (!Auth::user()->hasPermission('can-manage-users') && - !Auth::user()->hasPermission('can-update-users') - ) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slugs = ['can-manage-users','can-update-users']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) && + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } $response = User::bulkStatusChange($request); @@ -454,11 +441,10 @@ public function postActions(Request $request, $action) : JsonResponse //------------------------------------ case 'bulk-trash': - if (!Auth::user()->hasPermission('can-update-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slug = 'can-update-users'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = User::bulkTrash($request); @@ -467,11 +453,10 @@ public function postActions(Request $request, $action) : JsonResponse //------------------------------------ case 'bulk-restore': - if (!Auth::user()->hasPermission('can-update-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slug = 'can-update-users'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = User::bulkRestore($request); @@ -480,13 +465,11 @@ public function postActions(Request $request, $action) : JsonResponse //------------------------------------ case 'bulk-delete': - if (!Auth::user()->hasPermission('can-update-users') || - !Auth::user()->hasPermission('can-delete-users') - ) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slugs = ['can-update-users','can-delete-users']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } $response = User::bulkDelete($request); @@ -495,13 +478,11 @@ public function postActions(Request $request, $action) : JsonResponse //------------------------------------ case 'toggle-role-active-status': - if (!Auth::user()->hasPermission('can-manage-users') && - !Auth::user()->hasPermission('can-update-users') - ) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slugs = ['can-manage-users','can-update-users']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) && + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } $response = User::bulkChangeRoleStatus($request); @@ -550,11 +531,10 @@ public function getProfile(Request $request): JsonResponse //---------------------------------------------------------- public function storeAvatar(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slug = 'can-update-users'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -591,12 +571,10 @@ public function storeAvatar(Request $request): JsonResponse //---------------------------------------------------------- public function removeAvatar(Request $request) { + $permission_slug = 'can-update-users'; - if (!Auth::user()->hasPermission('can-update-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -714,12 +692,10 @@ public function removeProfileAvatar(Request $request): JsonResponse //---------------------------------------------------------- public function impersonate(Request $request, $uuid): JsonResponse { + $permission_slug = 'can-impersonate-users'; - if (!Auth::user()->hasPermission('can-impersonate-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { From 5389ad070408c69a2f3abcda48c051b3efbe7766 Mon Sep 17 00:00:00 2001 From: Alam Date: Sat, 6 Jan 2024 17:36:02 +0530 Subject: [PATCH 05/57] Updated: all haspermission param --- .../Backend/RegistrationsController.php | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/Http/Controllers/Backend/RegistrationsController.php b/Http/Controllers/Backend/RegistrationsController.php index 8811a806e..5a3364537 100644 --- a/Http/Controllers/Backend/RegistrationsController.php +++ b/Http/Controllers/Backend/RegistrationsController.php @@ -23,7 +23,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-registrations-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response($permission_slug)); + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -95,7 +95,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-registrations-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response($permission_slug)); + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -121,7 +121,7 @@ public function updateList(Request $request): JsonResponse $permission_slug = 'can-update-registrations'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response($permission_slug)); + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -169,11 +169,11 @@ public function listAction(Request $request, $type): JsonResponse //---------------------------------------------------------- public function deleteList(Request $request): JsonResponse { + $permission_slugs = ['can-update-registrations','can-delete-registrations']; - if(!Auth::user()->hasPermission('can-update-registrations')) { - return response()->json(vh_get_permission_denied_response('can-update-registrations')); - } elseif(!Auth::user()->hasPermission('can-delete-registrations')) { - return response()->json(vh_get_permission_denied_response('can-delete-registrations')); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -198,7 +198,7 @@ public function createItem(Request $request): JsonResponse $permission_slug = 'can-create-registrations'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response($permission_slug)); + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -223,7 +223,7 @@ public function getItem(Request $request, $id): JsonResponse $permission_slug = 'can-read-registrations'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response($permission_slug)); + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -248,7 +248,7 @@ public function updateItem(Request $request ,$id): JsonResponse $permission_slug = 'can-update-registrations'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response($permission_slug)); + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -270,10 +270,11 @@ public function updateItem(Request $request ,$id): JsonResponse //---------------------------------------------------------- public function deleteItem(Request $request, $id): JsonResponse { - if(!Auth::user()->hasPermission('can-update-registrations')) { - return response()->json(vh_get_permission_denied_response('can-update-registrations')); - } elseif(!Auth::user()->hasPermission('can-delete-registrations')) { - return response()->json(vh_get_permission_denied_response('can-delete-registrations')); + $permission_slugs = ['can-update-registrations','can-delete-registrations']; + + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -295,10 +296,11 @@ public function deleteItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function itemAction(Request $request, $id, $action): JsonResponse { - if(!Auth::user()->hasPermission('can-update-registrations')) { - return response()->json(vh_get_permission_denied_response('can-update-registrations')); - } elseif(!Auth::user()->hasPermission('can-manage-registrations')) { - return response()->json(vh_get_permission_denied_response('can-manage-registrations')); + $permission_slugs = ['can-update-registrations','can-manage-registrations']; + + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -342,7 +344,7 @@ public function createUser(Request $request,$id): JsonResponse $permission_slug = 'can-create-users-from-registrations'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response($permission_slug)); + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { From 8446f869195d2d511297772b9628cd9ebf0d806e Mon Sep 17 00:00:00 2001 From: Alam Date: Sat, 6 Jan 2024 17:56:11 +0530 Subject: [PATCH 06/57] Updated: permission denied response in roles --- Http/Controllers/Backend/RolesController.php | 90 +++++++++----------- 1 file changed, 38 insertions(+), 52 deletions(-) diff --git a/Http/Controllers/Backend/RolesController.php b/Http/Controllers/Backend/RolesController.php index 7b450c21f..7004ebf54 100644 --- a/Http/Controllers/Backend/RolesController.php +++ b/Http/Controllers/Backend/RolesController.php @@ -17,11 +17,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-roles-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-roles-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -76,11 +75,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-roles-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-roles-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -102,11 +100,10 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function updateList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-roles')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-roles'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -128,13 +125,11 @@ public function updateList(Request $request): JsonResponse //---------------------------------------------------------- public function listAction(Request $request, $type): JsonResponse { - if (!Auth::user()->hasPermission('can-update-roles') || - !Auth::user()->hasPermission('can-manage-roles') - ) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slugs = ['can-update-roles','can-manage-roles']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -156,11 +151,10 @@ public function listAction(Request $request, $type): JsonResponse //---------------------------------------------------------- public function deleteList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-delete-roles')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-delete-roles'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -182,11 +176,10 @@ public function deleteList(Request $request): JsonResponse //---------------------------------------------------------- public function createItem(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-create-roles')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-create-roles'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -208,11 +201,10 @@ public function createItem(Request $request): JsonResponse //---------------------------------------------------------- public function getItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-read-roles')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-read-roles'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -234,11 +226,10 @@ public function getItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function updateItem(Request $request,$id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-roles')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-roles'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -260,11 +251,10 @@ public function updateItem(Request $request,$id): JsonResponse //---------------------------------------------------------- public function deleteItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-delete-roles')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-delete-roles'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -286,13 +276,11 @@ public function deleteItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function itemAction(Request $request, $id, $action): JsonResponse { - if (!Auth::user()->hasPermission('can-manage-roles') || - !Auth::user()->hasPermission('can-update-roles') - ) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slugs = ['can-manage-roles','can-update-roles']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -314,11 +302,10 @@ public function itemAction(Request $request, $id, $action): JsonResponse //---------------------------------------------------------- public function getItemPermission(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-read-roles')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-read-roles'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -340,11 +327,10 @@ public function getItemPermission(Request $request, $id): JsonResponse //---------------------------------------------------------- public function getItemUser(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-read-roles')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-read-roles'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { From db9e9277a202389b6cef9cd3b5cb569360ed6de8 Mon Sep 17 00:00:00 2001 From: Alam Date: Sat, 6 Jan 2024 18:09:10 +0530 Subject: [PATCH 07/57] Updated: permission denied response in permissions --- .../Backend/PermissionsController.php | 72 ++++++++----------- 1 file changed, 31 insertions(+), 41 deletions(-) diff --git a/Http/Controllers/Backend/PermissionsController.php b/Http/Controllers/Backend/PermissionsController.php index d3b3ee926..4e744928d 100644 --- a/Http/Controllers/Backend/PermissionsController.php +++ b/Http/Controllers/Backend/PermissionsController.php @@ -18,12 +18,12 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-permissions-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-permissions-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } + try { $data = []; @@ -69,13 +69,11 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-permissions-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-permissions-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } - try { $response = Permission::getList($request); } catch (\Exception $e) { @@ -95,11 +93,10 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function updateList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-permissions')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-permissions'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -121,11 +118,10 @@ public function updateList(Request $request): JsonResponse //---------------------------------------------------------- public function listAction(Request $request, $type): JsonResponse { - if (!Auth::user()->hasPermission('can-update-permissions')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-permissions'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -147,11 +143,10 @@ public function listAction(Request $request, $type): JsonResponse //---------------------------------------------------------- public function deleteList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-permissions')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-permissions'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -173,11 +168,10 @@ public function deleteList(Request $request): JsonResponse //---------------------------------------------------------- public function getItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-permissions')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-permissions'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -199,11 +193,10 @@ public function getItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function updateItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-permissions')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-permissions'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -225,11 +218,10 @@ public function updateItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function deleteItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-permissions')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-permissions'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -251,11 +243,10 @@ public function deleteItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function itemAction(Request $request, $id, $action): JsonResponse { - if (!Auth::user()->hasPermission('can-update-permissions')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-permissions'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -277,11 +268,10 @@ public function itemAction(Request $request, $id, $action): JsonResponse //---------------------------------------------------------- public function getItemRoles(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-permissions')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-permissions'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { From 83634ef99320470e74ad6c30cae249e5b5e862c5 Mon Sep 17 00:00:00 2001 From: Alam Date: Sat, 6 Jan 2024 18:52:28 +0530 Subject: [PATCH 08/57] Updated: permission denied response in modules --- Helpers/backend.php | 2 +- .../Controllers/Backend/ModulesController.php | 99 ++++++++----------- 2 files changed, 44 insertions(+), 57 deletions(-) diff --git a/Helpers/backend.php b/Helpers/backend.php index 8ff9dfb99..7fd9efa90 100644 --- a/Helpers/backend.php +++ b/Helpers/backend.php @@ -117,7 +117,7 @@ function vh_get_permission_denied_response($permission_slugs){ $text = implode(', ',$permission_slugs); - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $response['errors'][] = trans("vaahcms-general.permission_denied"); if(env('APP_DEBUG')){ $response['hint'][] = 'You don\'t have "'.$text.'" permission.'; } diff --git a/Http/Controllers/Backend/ModulesController.php b/Http/Controllers/Backend/ModulesController.php index 749314567..89154f114 100644 --- a/Http/Controllers/Backend/ModulesController.php +++ b/Http/Controllers/Backend/ModulesController.php @@ -21,11 +21,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-module-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-module-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -54,11 +53,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-module-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-module-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -126,11 +124,10 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function getItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-read-module')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-read-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -152,11 +149,10 @@ public function getItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function download(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-install-module')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-install-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -192,11 +188,10 @@ public function download(Request $request): JsonResponse //---------------------------------------------------------- public function installUpdates(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-module')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -276,74 +271,68 @@ public function actions(Request $request, $id, $action): JsonResponse { //--------------------------------------- case 'activate': - if (!Auth::user()->hasPermission('can-activate-module')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-activate-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Module::activateItem($module->slug); break; //--------------------------------------- case 'deactivate': - if (!\Auth::user()->hasPermission('can-deactivate-module')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-deactivate-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Module::deactivateItem($module->slug); break; //--------------------------------------- case 'refresh_migrations': - if (!Auth::user()->hasPermission('can-activate-module')) { - $response['success'] = false; - $response['messages'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-activate-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Module::refreshMigrations($module->slug); break; //--------------------------------------- case 'run_migrations': - if (!Auth::user()->hasPermission('can-activate-module')) { - $response['success'] = false; - $response['messages'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-activate-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Module::runMigrations($module->slug); break; //--------------------------------------- case 'run_seeds': - if (!Auth::user()->hasPermission('can-activate-module')) { - $response['success'] = false; - $response['messages'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-activate-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Module::runSeeds($module->slug); break; //--------------------------------------- case 'import_sample_data': - if (!\Auth::user()->hasPermission('can-import-sample-data-in-module')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-import-sample-data-in-module'; - return response()->json($response); + if(!\Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Module::importSampleData($module->slug); break; //--------------------------------------- case 'delete': - if (!Auth::user()->hasPermission('can-delete-module')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-delete-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } + $response = Module::deleteItem($module->slug); break; //--------------------------------------- @@ -416,11 +405,10 @@ public function getModulesSlugs(Request $request): JsonResponse //---------------------------------------------------------- public function updateModuleVersions(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-module')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -457,11 +445,10 @@ public function updateModuleVersions(Request $request): JsonResponse //---------------------------------------------------------- public function storeUpdates(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-module')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { From 94f05fbb0aeb35a8edcedbb147a40cd46a5f3290 Mon Sep 17 00:00:00 2001 From: Alam Date: Mon, 8 Jan 2024 10:55:05 +0530 Subject: [PATCH 09/57] Updated: media permission denied response --- Http/Controllers/Backend/MediaController.php | 77 +++++++++----------- 1 file changed, 33 insertions(+), 44 deletions(-) diff --git a/Http/Controllers/Backend/MediaController.php b/Http/Controllers/Backend/MediaController.php index a7202ca5a..e40489696 100644 --- a/Http/Controllers/Backend/MediaController.php +++ b/Http/Controllers/Backend/MediaController.php @@ -19,11 +19,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-media-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-media-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -83,11 +82,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-media-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-media-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -109,11 +107,10 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function updateList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-media')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-media'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -135,15 +132,14 @@ public function updateList(Request $request): JsonResponse //---------------------------------------------------------- public function listAction(Request $request, $type): JsonResponse { - if (!Auth::user()->hasPermission('can-update-media') || - !Auth::user()->hasPermission('can-manage-media') - ) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slugs = ['can-update-media','can-manage-media']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } + try { $response = Media::listAction($request, $type); } catch (\Exception $e) { @@ -163,11 +159,10 @@ public function listAction(Request $request, $type): JsonResponse //---------------------------------------------------------- public function deleteList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-delete-media')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-delete-media'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -189,11 +184,10 @@ public function deleteList(Request $request): JsonResponse //---------------------------------------------------------- public function getItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-read-media')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-read-media'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -215,11 +209,10 @@ public function getItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function updateItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-media')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-media'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -241,11 +234,10 @@ public function updateItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function deleteItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-media')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-media'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -267,13 +259,11 @@ public function deleteItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function itemAction(Request $request, $id, $action): JsonResponse { - if (!Auth::user()->hasPermission('can-update-media') || - !Auth::user()->hasPermission('can-manage-media') - ) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slugs = ['can-update-media','can-manage-media']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -426,11 +416,10 @@ public function upload(Request $request): JsonResponse //---------------------------------------------------------- public function postCreate(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-create-media')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-create-media'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { From 76a0fd8807689c7f20288410cc41c848f10705eb Mon Sep 17 00:00:00 2001 From: Alam Date: Mon, 8 Jan 2024 11:23:21 +0530 Subject: [PATCH 10/57] Updated: taxonomies permission denied response --- .../Backend/TaxonomiesController.php | 108 ++++++++---------- 1 file changed, 46 insertions(+), 62 deletions(-) diff --git a/Http/Controllers/Backend/TaxonomiesController.php b/Http/Controllers/Backend/TaxonomiesController.php index 0ada84d6b..a4c9415ba 100644 --- a/Http/Controllers/Backend/TaxonomiesController.php +++ b/Http/Controllers/Backend/TaxonomiesController.php @@ -18,11 +18,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-taxonomies-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-taxonomies-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -82,11 +81,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-taxonomies-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-taxonomies-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -108,13 +106,11 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function updateList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-taxonomies') || - !Auth::user()->hasPermission('can-manage-taxonomies') - ) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slugs = ['can-update-taxonomies','can-manage-taxonomies']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -136,13 +132,11 @@ public function updateList(Request $request): JsonResponse //---------------------------------------------------------- public function listAction(Request $request, $type): JsonResponse { - if (!Auth::user()->hasPermission('can-update-taxonomies') || - !Auth::user()->hasPermission('can-manage-taxonomies') - ) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slugs = ['can-update-taxonomies','can-manage-taxonomies']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -164,11 +158,10 @@ public function listAction(Request $request, $type): JsonResponse //---------------------------------------------------------- public function deleteList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-delete-taxonomies')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-delete-taxonomies'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -190,11 +183,10 @@ public function deleteList(Request $request): JsonResponse //---------------------------------------------------------- public function createItem(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-create-taxonomies')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-create-taxonomies'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -216,11 +208,10 @@ public function createItem(Request $request): JsonResponse //---------------------------------------------------------- public function getItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-read-taxonomies')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-read-taxonomies'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -266,11 +257,10 @@ public function getListByTypeId(Request $request, $id): JsonResponse //---------------------------------------------------------- public function updateItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-taxonomies')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-taxonomies'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -292,11 +282,10 @@ public function updateItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function deleteItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-delete-taxonomies')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-delete-taxonomies'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -318,13 +307,11 @@ public function deleteItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function itemAction(Request $request, $id, $action): JsonResponse { - if (!Auth::user()->hasPermission('can-update-taxonomies') || - !Auth::user()->hasPermission('can-manage-taxonomies') - ) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slugs = ['can-update-taxonomies','can-manage-taxonomies']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -346,11 +333,10 @@ public function itemAction(Request $request, $id, $action): JsonResponse //---------------------------------------------------------- public function createTaxonomyType(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-manage-taxonomy-type')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-manage-taxonomy-type'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -395,11 +381,10 @@ public function createTaxonomyType(Request $request): JsonResponse //---------------------------------------------------------- public function deleteTaxonomyType(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-manage-taxonomy-type')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-manage-taxonomy-type'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -449,11 +434,10 @@ public function deletechildrens($types) //---------------------------------------------------------- public function updateTaxonomyType(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-manage-taxonomy-type')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-manage-taxonomy-type'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -513,13 +497,13 @@ public function updateTaxonomyType(Request $request): JsonResponse //---------------------------------------------------------- public function updateTaxonomyTypePosition(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-manage-taxonomy-type')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-manage-taxonomy-type'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } + try { $parent_id = null; From fe7a98c45c67ddfbaa799cfc3bb06c2d0113937d Mon Sep 17 00:00:00 2001 From: Alam Date: Mon, 8 Jan 2024 11:40:20 +0530 Subject: [PATCH 11/57] Updated: themes permission denied response --- Http/Controllers/Backend/ThemesController.php | 99 ++++++++----------- 1 file changed, 42 insertions(+), 57 deletions(-) diff --git a/Http/Controllers/Backend/ThemesController.php b/Http/Controllers/Backend/ThemesController.php index 5ce591621..616d16f66 100644 --- a/Http/Controllers/Backend/ThemesController.php +++ b/Http/Controllers/Backend/ThemesController.php @@ -21,12 +21,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { + $permission_slug = 'has-access-of-theme-section'; - if (!Auth::user()->hasPermission('has-access-of-theme-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -55,11 +53,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-theme-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-theme-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -123,11 +120,10 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function download(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-install-theme')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-install-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -163,11 +159,10 @@ public function download(Request $request): JsonResponse //---------------------------------------------------------- public function installUpdates(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-theme')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -245,81 +240,73 @@ public function actions(Request $request,$id,$action): JsonResponse { //--------------------------------------- case 'activate': - if (!Auth::user()->hasPermission('can-activate-theme')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-activate-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Theme::activateItem($theme->slug); break; //--------------------------------------- case 'make_default': - if (!Auth::user()->hasPermission('can-activate-theme')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-activate-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Theme::makeItemAsDefault($theme->slug); break; //--------------------------------------- case 'refresh_migrations': - if (!Auth::user()->hasPermission('can-activate-theme')) { - $response['success'] = false; - $response['messages'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-activate-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Theme::refreshMigrations($theme->slug); break; //--------------------------------------- case 'run_migrations': - if (!Auth::user()->hasPermission('can-activate-theme')) { - $response['success'] = false; - $response['messages'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-activate-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Theme::runMigrations($theme->slug); break; //--------------------------------------- case 'run_seeds': - if (!Auth::user()->hasPermission('can-activate-theme')) { - $response['success'] = false; - $response['messages'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-activate-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Theme::runSeeds($theme->slug); break; //--------------------------------------- case 'deactivate': - if (!Auth::user()->hasPermission('can-deactivate-theme')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-deactivate-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Theme::deactivateItem($theme->slug); break; //--------------------------------------- case 'import_sample_data': - if (!Auth::user()->hasPermission('can-import-sample-data-in-theme')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-import-sample-data-in-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Theme::importSampleData($theme->slug); break; //--------------------------------------- case 'delete': - if (!Auth::user()->hasPermission('can-delete-theme')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-delete-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Theme::deleteItem($theme->slug); break; @@ -344,11 +331,10 @@ public function actions(Request $request,$id,$action): JsonResponse //---------------------------------------------------------- public function storeUpdates(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-theme')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -384,11 +370,10 @@ public function storeUpdates(Request $request): JsonResponse //---------------------------------------------------------- public function deleteItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-delete-theme')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-delete-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { From df57e6fee2a0ce5c3fbf5c1e81ffae4cd2dbb233 Mon Sep 17 00:00:00 2001 From: Alam Date: Mon, 8 Jan 2024 11:50:10 +0530 Subject: [PATCH 12/57] Updated: advanced permission denied response --- .../Backend/Advanced/BatchesController.php | 14 ++++---- .../Backend/Advanced/FailedJobsController.php | 15 ++++---- .../Backend/Advanced/JobsController.php | 14 ++++---- .../Backend/Advanced/LogsController.php | 36 ++++++++----------- 4 files changed, 34 insertions(+), 45 deletions(-) diff --git a/Http/Controllers/Backend/Advanced/BatchesController.php b/Http/Controllers/Backend/Advanced/BatchesController.php index ee34dd8d7..76b7530c9 100644 --- a/Http/Controllers/Backend/Advanced/BatchesController.php +++ b/Http/Controllers/Backend/Advanced/BatchesController.php @@ -15,11 +15,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-advanced-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-advanced-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -68,11 +67,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-batches-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-batches-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { diff --git a/Http/Controllers/Backend/Advanced/FailedJobsController.php b/Http/Controllers/Backend/Advanced/FailedJobsController.php index 4d9e9816d..1fd5b6df9 100644 --- a/Http/Controllers/Backend/Advanced/FailedJobsController.php +++ b/Http/Controllers/Backend/Advanced/FailedJobsController.php @@ -16,11 +16,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-advanced-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-advanced-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -68,12 +67,12 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-failed-jobs-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-failed-jobs-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } + try { $response = FailedJob::getList($request); } catch (\Exception $e) { diff --git a/Http/Controllers/Backend/Advanced/JobsController.php b/Http/Controllers/Backend/Advanced/JobsController.php index b9ef40133..999b9fd58 100644 --- a/Http/Controllers/Backend/Advanced/JobsController.php +++ b/Http/Controllers/Backend/Advanced/JobsController.php @@ -15,11 +15,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-advanced-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-advanced-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -67,11 +66,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-jobs-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-jobs-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { diff --git a/Http/Controllers/Backend/Advanced/LogsController.php b/Http/Controllers/Backend/Advanced/LogsController.php index 2a88cc8c5..24528fb94 100644 --- a/Http/Controllers/Backend/Advanced/LogsController.php +++ b/Http/Controllers/Backend/Advanced/LogsController.php @@ -18,11 +18,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-advanced-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-advanced-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -69,11 +68,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-logs-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-logs-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -164,11 +162,10 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function getItem(Request $request, $name): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-advanced-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-advanced-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -230,11 +227,10 @@ public function getItem(Request $request, $name): JsonResponse //---------------------------------------------------------- public function downloadFile(Request $request, $file_name): BinaryFileResponse | string | JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-advanced-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-advanced-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -262,12 +258,10 @@ public function downloadFile(Request $request, $file_name): BinaryFileResponse | //---------------------------------------------------------- public function postActions(Request $request, $action): JsonResponse { + $permission_slug = 'has-access-of-advanced-section'; - if (!Auth::user()->hasPermission('has-access-of-advanced-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { From a5e522489ca318f8d3f75ad30448d60865a4f33b Mon Sep 17 00:00:00 2001 From: Alam Date: Mon, 8 Jan 2024 12:08:38 +0530 Subject: [PATCH 13/57] Updated settings permission denied response --- .../Backend/Settings/EnvController.php | 30 ++++----- .../Backend/Settings/GeneralController.php | 42 +++++------- .../Settings/LocalizationController.php | 50 ++++++-------- .../Settings/NotificationsController.php | 67 +++++++++---------- .../Backend/Settings/UpdateController.php | 38 +++++------ .../Settings/UserSettingController.php | 30 ++++----- 6 files changed, 108 insertions(+), 149 deletions(-) diff --git a/Http/Controllers/Backend/Settings/EnvController.php b/Http/Controllers/Backend/Settings/EnvController.php index 0103c809f..d6bce300f 100644 --- a/Http/Controllers/Backend/Settings/EnvController.php +++ b/Http/Controllers/Backend/Settings/EnvController.php @@ -21,11 +21,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!\Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -57,12 +56,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { + $permission_slug = 'has-access-of-setting-section'; - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -90,12 +87,10 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function downloadFile(Request $request, $file_name): BinaryFileResponse | string { + $permission_slug = 'has-access-of-setting-section'; - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -121,11 +116,10 @@ public function downloadFile(Request $request, $file_name): BinaryFileResponse | //---------------------------------------------------------- public function store(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { diff --git a/Http/Controllers/Backend/Settings/GeneralController.php b/Http/Controllers/Backend/Settings/GeneralController.php index 839e66be6..71399be06 100644 --- a/Http/Controllers/Backend/Settings/GeneralController.php +++ b/Http/Controllers/Backend/Settings/GeneralController.php @@ -22,11 +22,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -63,11 +62,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -99,11 +97,10 @@ public function getList(Request $request): JsonResponse // ---------------------------------------------------------- public function storeSiteSettings(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -149,11 +146,10 @@ public function storeSiteSettings(Request $request): JsonResponse //---------------------------------------------------------- public function storeLinks(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -227,11 +223,10 @@ public function storeLinks(Request $request): JsonResponse //---------------------------------------------------------- public function storeMetaTags(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -288,11 +283,10 @@ public function storeMetaTags(Request $request): JsonResponse //---------------------------------------------------------- public function deleteMetaTags(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { diff --git a/Http/Controllers/Backend/Settings/LocalizationController.php b/Http/Controllers/Backend/Settings/LocalizationController.php index e92aa6963..a14231238 100644 --- a/Http/Controllers/Backend/Settings/LocalizationController.php +++ b/Http/Controllers/Backend/Settings/LocalizationController.php @@ -22,11 +22,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -62,12 +61,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { + $permission_slug = 'has-access-of-setting-section'; - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -89,11 +86,10 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function generateLanguage(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -118,11 +114,10 @@ public function generateLanguage(Request $request): JsonResponse //---------------------------------------------------------- public function postStore(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -144,11 +139,10 @@ public function postStore(Request $request): JsonResponse //---------------------------------------------------------- public function storeLanguage(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -171,11 +165,10 @@ public function storeLanguage(Request $request): JsonResponse //---------------------------------------------------------- public function storeCategory(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -198,11 +191,10 @@ public function storeCategory(Request $request): JsonResponse //---------------------------------------------------------- public function postActions(Request $request, $action): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { diff --git a/Http/Controllers/Backend/Settings/NotificationsController.php b/Http/Controllers/Backend/Settings/NotificationsController.php index 982d90d37..1b5ac8386 100644 --- a/Http/Controllers/Backend/Settings/NotificationsController.php +++ b/Http/Controllers/Backend/Settings/NotificationsController.php @@ -20,11 +20,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -57,12 +56,12 @@ public function getAssets(Request $request): JsonResponse public function getList(Request $request) { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } + try{ return Notification::getList($request); }catch (\Exception $e){ @@ -79,11 +78,10 @@ public function getList(Request $request) } public function getItemData(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -112,12 +110,12 @@ public function getItemData(Request $request): JsonResponse public function createItem(Request $request) { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; + + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); + } - return response()->json($response); - } try{ return Notification::createItem($request); }catch (\Exception $e){ @@ -135,11 +133,10 @@ public function createItem(Request $request) public function itemAction(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -161,11 +158,10 @@ public function itemAction(Request $request): JsonResponse //---------------------------------------------------------- public function listAction(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -187,11 +183,10 @@ public function listAction(Request $request): JsonResponse //---------------------------------------------------------- public function store(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -228,11 +223,10 @@ public function store(Request $request): JsonResponse //---------------------------------------------------------- public function send(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -271,11 +265,10 @@ public function send(Request $request): JsonResponse //---------------------------------------------------------- public function markAsRead(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { diff --git a/Http/Controllers/Backend/Settings/UpdateController.php b/Http/Controllers/Backend/Settings/UpdateController.php index 7a6f75fd4..3bb1023a0 100644 --- a/Http/Controllers/Backend/Settings/UpdateController.php +++ b/Http/Controllers/Backend/Settings/UpdateController.php @@ -24,11 +24,10 @@ public function __construct() //---------------------------------------------------------- public function storeUpdate(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -87,11 +86,10 @@ public function storeUpdate(Request $request): JsonResponse //---------------------------------------------------------- public function upgrade(): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -112,12 +110,10 @@ public function upgrade(): JsonResponse //---------------------------------------------------------- public function publish() { + $permission_slug = 'has-access-of-setting-section'; - if(!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -158,12 +154,10 @@ public function publish() //---------------------------------------------------------- public function runMigrations(): JsonResponse { + $permission_slug = 'has-access-of-setting-section'; - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try{ @@ -198,12 +192,10 @@ public function runMigrations(): JsonResponse //---------------------------------------------------------- public function clearCache(): JsonResponse { + $permission_slug = 'has-access-of-setting-section'; - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { diff --git a/Http/Controllers/Backend/Settings/UserSettingController.php b/Http/Controllers/Backend/Settings/UserSettingController.php index e874d7dc9..cd874d517 100644 --- a/Http/Controllers/Backend/Settings/UserSettingController.php +++ b/Http/Controllers/Backend/Settings/UserSettingController.php @@ -18,11 +18,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -48,12 +47,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { + $permission_slug = 'has-access-of-setting-section'; - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -89,11 +86,10 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function storeCustomField(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -144,12 +140,10 @@ public function storeCustomField(Request $request): JsonResponse //---------------------------------------------------------- public function storeField(Request $request): JsonResponse { + $permission_slug = 'has-access-of-setting-section'; - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { From 6c6de551ef8f23bb2e1504770c16ed6cf7fa689f Mon Sep 17 00:00:00 2001 From: Alam Date: Mon, 8 Jan 2024 12:12:58 +0530 Subject: [PATCH 14/57] Updated: permission denied response --- .../Controllers/Settings/BackupsController.php | 18 ++++++------------ .../Settings/SettingsController.php | 9 +++------ 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/Http/Controllers/Settings/BackupsController.php b/Http/Controllers/Settings/BackupsController.php index 9a32404eb..0e280ebe8 100644 --- a/Http/Controllers/Settings/BackupsController.php +++ b/Http/Controllers/Settings/BackupsController.php @@ -24,13 +24,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request) { + $permission_slug = 'has-access-of-setting-section'; - if(!\Auth::user()->hasPermission('has-access-of-setting-section')) - { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!\Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response['success'] = true; @@ -41,13 +38,10 @@ public function getAssets(Request $request) //---------------------------------------------------------- public function getList(Request $request) { + $permission_slug = 'has-access-of-setting-section'; - if(!\Auth::user()->hasPermission('has-access-of-setting-section')) - { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!\Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = VaahBackup::create($request); diff --git a/Http/Controllers/Settings/SettingsController.php b/Http/Controllers/Settings/SettingsController.php index b0de6c371..aac6fd95a 100644 --- a/Http/Controllers/Settings/SettingsController.php +++ b/Http/Controllers/Settings/SettingsController.php @@ -21,13 +21,10 @@ public function __construct() //---------------------------------------------------------- public function index() { + $permission_slug = 'has-access-of-setting-section'; - if(!\Auth::user()->hasPermission('has-access-of-setting-section')) - { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!\Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } return view($this->theme.'.pages.dashboard'); From 233c580297bcfa8fa1389a57bbff56cdefe7fd8a Mon Sep 17 00:00:00 2001 From: Alam Date: Mon, 8 Jan 2024 13:08:51 +0530 Subject: [PATCH 15/57] Updated: theme controller --- Http/Controllers/Backend/ThemesController.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Http/Controllers/Backend/ThemesController.php b/Http/Controllers/Backend/ThemesController.php index 616d16f66..7b821bcd5 100644 --- a/Http/Controllers/Backend/ThemesController.php +++ b/Http/Controllers/Backend/ThemesController.php @@ -427,11 +427,10 @@ public function publishAssets(Request $request) //---------------------------------------------------------- public function getItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-read-module')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-read-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { From d3ea9f734ffda70fa36eba6ce47ac373561712d3 Mon Sep 17 00:00:00 2001 From: Alam Date: Mon, 8 Jan 2024 14:30:56 +0530 Subject: [PATCH 16/57] Updated: permission denied response Updated: registrations permission denied response Updated: haspermission param Updated: users permission denied response Updated: all haspermission param Updated: permission denied response in roles Updated: permission denied response in permissions Updated: permission denied response in modules Updated: media permission denied response Updated: taxonomies permission denied response Updated: themes permission denied response Updated: advanced permission denied response Updated settings permission denied response Updated: permission denied response Updated: theme controller --- Helpers/backend.php | 10 ++ .../Backend/Advanced/BatchesController.php | 14 +- .../Backend/Advanced/FailedJobsController.php | 15 +- .../Backend/Advanced/JobsController.php | 14 +- .../Backend/Advanced/LogsController.php | 36 ++--- Http/Controllers/Backend/MediaController.php | 77 ++++------ .../Controllers/Backend/ModulesController.php | 99 ++++++------ .../Backend/PermissionsController.php | 72 ++++----- .../Backend/RegistrationsController.php | 95 +++++------- Http/Controllers/Backend/RolesController.php | 90 +++++------ .../Backend/Settings/EnvController.php | 30 ++-- .../Backend/Settings/GeneralController.php | 42 +++-- .../Settings/LocalizationController.php | 50 +++--- .../Settings/NotificationsController.php | 67 ++++---- .../Backend/Settings/UpdateController.php | 38 ++--- .../Settings/UserSettingController.php | 30 ++-- .../Backend/TaxonomiesController.php | 108 ++++++------- Http/Controllers/Backend/ThemesController.php | 106 ++++++------- Http/Controllers/Backend/UsersController.php | 144 ++++++++---------- .../Settings/BackupsController.php | 18 +-- .../Settings/SettingsController.php | 9 +- 21 files changed, 497 insertions(+), 667 deletions(-) diff --git a/Helpers/backend.php b/Helpers/backend.php index 638a2751f..7fd9efa90 100644 --- a/Helpers/backend.php +++ b/Helpers/backend.php @@ -112,5 +112,15 @@ function vh_get_backend_file($file_path) return vh_get_backend_theme_url()."/".$file_path; } //----------------------------------------------------------------------------------- +function vh_get_permission_denied_response($permission_slugs){ + $response['success'] = false; + $text = implode(', ',$permission_slugs); + + $response['errors'][] = trans("vaahcms-general.permission_denied"); + if(env('APP_DEBUG')){ + $response['hint'][] = 'You don\'t have "'.$text.'" permission.'; + } + return $response; +} //----------------------------------------------------------------------------------- diff --git a/Http/Controllers/Backend/Advanced/BatchesController.php b/Http/Controllers/Backend/Advanced/BatchesController.php index ee34dd8d7..76b7530c9 100644 --- a/Http/Controllers/Backend/Advanced/BatchesController.php +++ b/Http/Controllers/Backend/Advanced/BatchesController.php @@ -15,11 +15,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-advanced-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-advanced-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -68,11 +67,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-batches-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-batches-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { diff --git a/Http/Controllers/Backend/Advanced/FailedJobsController.php b/Http/Controllers/Backend/Advanced/FailedJobsController.php index 4d9e9816d..1fd5b6df9 100644 --- a/Http/Controllers/Backend/Advanced/FailedJobsController.php +++ b/Http/Controllers/Backend/Advanced/FailedJobsController.php @@ -16,11 +16,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-advanced-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-advanced-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -68,12 +67,12 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-failed-jobs-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-failed-jobs-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } + try { $response = FailedJob::getList($request); } catch (\Exception $e) { diff --git a/Http/Controllers/Backend/Advanced/JobsController.php b/Http/Controllers/Backend/Advanced/JobsController.php index b9ef40133..999b9fd58 100644 --- a/Http/Controllers/Backend/Advanced/JobsController.php +++ b/Http/Controllers/Backend/Advanced/JobsController.php @@ -15,11 +15,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-advanced-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-advanced-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -67,11 +66,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-jobs-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-jobs-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { diff --git a/Http/Controllers/Backend/Advanced/LogsController.php b/Http/Controllers/Backend/Advanced/LogsController.php index 2a88cc8c5..24528fb94 100644 --- a/Http/Controllers/Backend/Advanced/LogsController.php +++ b/Http/Controllers/Backend/Advanced/LogsController.php @@ -18,11 +18,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-advanced-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-advanced-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -69,11 +68,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-logs-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-logs-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -164,11 +162,10 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function getItem(Request $request, $name): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-advanced-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-advanced-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -230,11 +227,10 @@ public function getItem(Request $request, $name): JsonResponse //---------------------------------------------------------- public function downloadFile(Request $request, $file_name): BinaryFileResponse | string | JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-advanced-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-advanced-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -262,12 +258,10 @@ public function downloadFile(Request $request, $file_name): BinaryFileResponse | //---------------------------------------------------------- public function postActions(Request $request, $action): JsonResponse { + $permission_slug = 'has-access-of-advanced-section'; - if (!Auth::user()->hasPermission('has-access-of-advanced-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { diff --git a/Http/Controllers/Backend/MediaController.php b/Http/Controllers/Backend/MediaController.php index a7202ca5a..e40489696 100644 --- a/Http/Controllers/Backend/MediaController.php +++ b/Http/Controllers/Backend/MediaController.php @@ -19,11 +19,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-media-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-media-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -83,11 +82,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-media-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-media-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -109,11 +107,10 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function updateList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-media')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-media'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -135,15 +132,14 @@ public function updateList(Request $request): JsonResponse //---------------------------------------------------------- public function listAction(Request $request, $type): JsonResponse { - if (!Auth::user()->hasPermission('can-update-media') || - !Auth::user()->hasPermission('can-manage-media') - ) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slugs = ['can-update-media','can-manage-media']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } + try { $response = Media::listAction($request, $type); } catch (\Exception $e) { @@ -163,11 +159,10 @@ public function listAction(Request $request, $type): JsonResponse //---------------------------------------------------------- public function deleteList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-delete-media')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-delete-media'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -189,11 +184,10 @@ public function deleteList(Request $request): JsonResponse //---------------------------------------------------------- public function getItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-read-media')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-read-media'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -215,11 +209,10 @@ public function getItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function updateItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-media')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-media'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -241,11 +234,10 @@ public function updateItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function deleteItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-media')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-media'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -267,13 +259,11 @@ public function deleteItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function itemAction(Request $request, $id, $action): JsonResponse { - if (!Auth::user()->hasPermission('can-update-media') || - !Auth::user()->hasPermission('can-manage-media') - ) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slugs = ['can-update-media','can-manage-media']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -426,11 +416,10 @@ public function upload(Request $request): JsonResponse //---------------------------------------------------------- public function postCreate(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-create-media')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-create-media'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { diff --git a/Http/Controllers/Backend/ModulesController.php b/Http/Controllers/Backend/ModulesController.php index 749314567..89154f114 100644 --- a/Http/Controllers/Backend/ModulesController.php +++ b/Http/Controllers/Backend/ModulesController.php @@ -21,11 +21,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-module-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-module-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -54,11 +53,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-module-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-module-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -126,11 +124,10 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function getItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-read-module')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-read-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -152,11 +149,10 @@ public function getItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function download(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-install-module')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-install-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -192,11 +188,10 @@ public function download(Request $request): JsonResponse //---------------------------------------------------------- public function installUpdates(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-module')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -276,74 +271,68 @@ public function actions(Request $request, $id, $action): JsonResponse { //--------------------------------------- case 'activate': - if (!Auth::user()->hasPermission('can-activate-module')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-activate-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Module::activateItem($module->slug); break; //--------------------------------------- case 'deactivate': - if (!\Auth::user()->hasPermission('can-deactivate-module')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-deactivate-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Module::deactivateItem($module->slug); break; //--------------------------------------- case 'refresh_migrations': - if (!Auth::user()->hasPermission('can-activate-module')) { - $response['success'] = false; - $response['messages'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-activate-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Module::refreshMigrations($module->slug); break; //--------------------------------------- case 'run_migrations': - if (!Auth::user()->hasPermission('can-activate-module')) { - $response['success'] = false; - $response['messages'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-activate-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Module::runMigrations($module->slug); break; //--------------------------------------- case 'run_seeds': - if (!Auth::user()->hasPermission('can-activate-module')) { - $response['success'] = false; - $response['messages'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-activate-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Module::runSeeds($module->slug); break; //--------------------------------------- case 'import_sample_data': - if (!\Auth::user()->hasPermission('can-import-sample-data-in-module')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-import-sample-data-in-module'; - return response()->json($response); + if(!\Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Module::importSampleData($module->slug); break; //--------------------------------------- case 'delete': - if (!Auth::user()->hasPermission('can-delete-module')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-delete-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } + $response = Module::deleteItem($module->slug); break; //--------------------------------------- @@ -416,11 +405,10 @@ public function getModulesSlugs(Request $request): JsonResponse //---------------------------------------------------------- public function updateModuleVersions(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-module')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -457,11 +445,10 @@ public function updateModuleVersions(Request $request): JsonResponse //---------------------------------------------------------- public function storeUpdates(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-module')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { diff --git a/Http/Controllers/Backend/PermissionsController.php b/Http/Controllers/Backend/PermissionsController.php index d3b3ee926..4e744928d 100644 --- a/Http/Controllers/Backend/PermissionsController.php +++ b/Http/Controllers/Backend/PermissionsController.php @@ -18,12 +18,12 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-permissions-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-permissions-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } + try { $data = []; @@ -69,13 +69,11 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-permissions-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-permissions-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } - try { $response = Permission::getList($request); } catch (\Exception $e) { @@ -95,11 +93,10 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function updateList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-permissions')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-permissions'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -121,11 +118,10 @@ public function updateList(Request $request): JsonResponse //---------------------------------------------------------- public function listAction(Request $request, $type): JsonResponse { - if (!Auth::user()->hasPermission('can-update-permissions')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-permissions'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -147,11 +143,10 @@ public function listAction(Request $request, $type): JsonResponse //---------------------------------------------------------- public function deleteList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-permissions')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-permissions'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -173,11 +168,10 @@ public function deleteList(Request $request): JsonResponse //---------------------------------------------------------- public function getItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-permissions')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-permissions'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -199,11 +193,10 @@ public function getItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function updateItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-permissions')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-permissions'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -225,11 +218,10 @@ public function updateItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function deleteItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-permissions')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-permissions'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -251,11 +243,10 @@ public function deleteItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function itemAction(Request $request, $id, $action): JsonResponse { - if (!Auth::user()->hasPermission('can-update-permissions')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-permissions'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -277,11 +268,10 @@ public function itemAction(Request $request, $id, $action): JsonResponse //---------------------------------------------------------- public function getItemRoles(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-permissions')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-permissions'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { diff --git a/Http/Controllers/Backend/RegistrationsController.php b/Http/Controllers/Backend/RegistrationsController.php index d4503412a..5a3364537 100644 --- a/Http/Controllers/Backend/RegistrationsController.php +++ b/Http/Controllers/Backend/RegistrationsController.php @@ -20,11 +20,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-registrations-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-registrations-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -93,11 +92,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-registrations-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-registrations-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -119,11 +117,11 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function updateList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-registrations')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - return response()->json($response); + $permission_slug = 'can-update-registrations'; + + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -145,13 +143,11 @@ public function updateList(Request $request): JsonResponse //---------------------------------------------------------- public function listAction(Request $request, $type): JsonResponse { - if (!Auth::user()->hasPermission('can-update-registrations') || - !Auth::user()->hasPermission('can-manage-registrations') - ) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slugs = ['can-update-registrations','can-manage-registrations']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -173,13 +169,11 @@ public function listAction(Request $request, $type): JsonResponse //---------------------------------------------------------- public function deleteList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-registrations') || - !Auth::user()->hasPermission('can-delete-registrations')) - { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slugs = ['can-update-registrations','can-delete-registrations']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -201,12 +195,11 @@ public function deleteList(Request $request): JsonResponse //---------------------------------------------------------- public function createItem(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-create-registrations')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-create-registrations'; - return response()->json($response); - } + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); + } try { $response = Registration::createItem($request); @@ -227,12 +220,11 @@ public function createItem(Request $request): JsonResponse //---------------------------------------------------------- public function getItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-read-registrations')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-read-registrations'; - return response()->json($response); - } + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); + } try { $response = Registration::getItem($id); @@ -253,12 +245,10 @@ public function getItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function updateItem(Request $request ,$id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-registrations')) - { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-registrations'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -280,13 +270,11 @@ public function updateItem(Request $request ,$id): JsonResponse //---------------------------------------------------------- public function deleteItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-registrations') || - !Auth::user()->hasPermission('can-delete-registrations') - ) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slugs = ['can-update-registrations','can-delete-registrations']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -308,13 +296,11 @@ public function deleteItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function itemAction(Request $request, $id, $action): JsonResponse { - if (!Auth::user()->hasPermission('can-update-registrations') || - !Auth::user()->hasPermission('can-manage-registrations') - ) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slugs = ['can-update-registrations','can-manage-registrations']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -355,11 +341,10 @@ public function sendVerificationEmail(Request $request,$id): JsonResponse //---------------------------------------------------------- public function createUser(Request $request,$id): JsonResponse { - if (!Auth::user()->hasPermission('can-create-users-from-registrations')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-create-users-from-registrations'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { diff --git a/Http/Controllers/Backend/RolesController.php b/Http/Controllers/Backend/RolesController.php index 7b450c21f..7004ebf54 100644 --- a/Http/Controllers/Backend/RolesController.php +++ b/Http/Controllers/Backend/RolesController.php @@ -17,11 +17,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-roles-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-roles-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -76,11 +75,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-roles-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-roles-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -102,11 +100,10 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function updateList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-roles')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-roles'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -128,13 +125,11 @@ public function updateList(Request $request): JsonResponse //---------------------------------------------------------- public function listAction(Request $request, $type): JsonResponse { - if (!Auth::user()->hasPermission('can-update-roles') || - !Auth::user()->hasPermission('can-manage-roles') - ) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slugs = ['can-update-roles','can-manage-roles']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -156,11 +151,10 @@ public function listAction(Request $request, $type): JsonResponse //---------------------------------------------------------- public function deleteList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-delete-roles')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-delete-roles'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -182,11 +176,10 @@ public function deleteList(Request $request): JsonResponse //---------------------------------------------------------- public function createItem(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-create-roles')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-create-roles'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -208,11 +201,10 @@ public function createItem(Request $request): JsonResponse //---------------------------------------------------------- public function getItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-read-roles')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-read-roles'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -234,11 +226,10 @@ public function getItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function updateItem(Request $request,$id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-roles')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-roles'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -260,11 +251,10 @@ public function updateItem(Request $request,$id): JsonResponse //---------------------------------------------------------- public function deleteItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-delete-roles')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-delete-roles'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -286,13 +276,11 @@ public function deleteItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function itemAction(Request $request, $id, $action): JsonResponse { - if (!Auth::user()->hasPermission('can-manage-roles') || - !Auth::user()->hasPermission('can-update-roles') - ) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slugs = ['can-manage-roles','can-update-roles']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -314,11 +302,10 @@ public function itemAction(Request $request, $id, $action): JsonResponse //---------------------------------------------------------- public function getItemPermission(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-read-roles')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-read-roles'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -340,11 +327,10 @@ public function getItemPermission(Request $request, $id): JsonResponse //---------------------------------------------------------- public function getItemUser(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-read-roles')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-read-roles'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { diff --git a/Http/Controllers/Backend/Settings/EnvController.php b/Http/Controllers/Backend/Settings/EnvController.php index 0103c809f..d6bce300f 100644 --- a/Http/Controllers/Backend/Settings/EnvController.php +++ b/Http/Controllers/Backend/Settings/EnvController.php @@ -21,11 +21,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!\Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -57,12 +56,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { + $permission_slug = 'has-access-of-setting-section'; - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -90,12 +87,10 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function downloadFile(Request $request, $file_name): BinaryFileResponse | string { + $permission_slug = 'has-access-of-setting-section'; - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -121,11 +116,10 @@ public function downloadFile(Request $request, $file_name): BinaryFileResponse | //---------------------------------------------------------- public function store(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { diff --git a/Http/Controllers/Backend/Settings/GeneralController.php b/Http/Controllers/Backend/Settings/GeneralController.php index 839e66be6..71399be06 100644 --- a/Http/Controllers/Backend/Settings/GeneralController.php +++ b/Http/Controllers/Backend/Settings/GeneralController.php @@ -22,11 +22,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -63,11 +62,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -99,11 +97,10 @@ public function getList(Request $request): JsonResponse // ---------------------------------------------------------- public function storeSiteSettings(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -149,11 +146,10 @@ public function storeSiteSettings(Request $request): JsonResponse //---------------------------------------------------------- public function storeLinks(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -227,11 +223,10 @@ public function storeLinks(Request $request): JsonResponse //---------------------------------------------------------- public function storeMetaTags(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -288,11 +283,10 @@ public function storeMetaTags(Request $request): JsonResponse //---------------------------------------------------------- public function deleteMetaTags(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { diff --git a/Http/Controllers/Backend/Settings/LocalizationController.php b/Http/Controllers/Backend/Settings/LocalizationController.php index e92aa6963..a14231238 100644 --- a/Http/Controllers/Backend/Settings/LocalizationController.php +++ b/Http/Controllers/Backend/Settings/LocalizationController.php @@ -22,11 +22,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -62,12 +61,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { + $permission_slug = 'has-access-of-setting-section'; - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -89,11 +86,10 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function generateLanguage(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -118,11 +114,10 @@ public function generateLanguage(Request $request): JsonResponse //---------------------------------------------------------- public function postStore(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -144,11 +139,10 @@ public function postStore(Request $request): JsonResponse //---------------------------------------------------------- public function storeLanguage(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -171,11 +165,10 @@ public function storeLanguage(Request $request): JsonResponse //---------------------------------------------------------- public function storeCategory(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -198,11 +191,10 @@ public function storeCategory(Request $request): JsonResponse //---------------------------------------------------------- public function postActions(Request $request, $action): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { diff --git a/Http/Controllers/Backend/Settings/NotificationsController.php b/Http/Controllers/Backend/Settings/NotificationsController.php index 982d90d37..1b5ac8386 100644 --- a/Http/Controllers/Backend/Settings/NotificationsController.php +++ b/Http/Controllers/Backend/Settings/NotificationsController.php @@ -20,11 +20,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -57,12 +56,12 @@ public function getAssets(Request $request): JsonResponse public function getList(Request $request) { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } + try{ return Notification::getList($request); }catch (\Exception $e){ @@ -79,11 +78,10 @@ public function getList(Request $request) } public function getItemData(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -112,12 +110,12 @@ public function getItemData(Request $request): JsonResponse public function createItem(Request $request) { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; + + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); + } - return response()->json($response); - } try{ return Notification::createItem($request); }catch (\Exception $e){ @@ -135,11 +133,10 @@ public function createItem(Request $request) public function itemAction(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -161,11 +158,10 @@ public function itemAction(Request $request): JsonResponse //---------------------------------------------------------- public function listAction(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -187,11 +183,10 @@ public function listAction(Request $request): JsonResponse //---------------------------------------------------------- public function store(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -228,11 +223,10 @@ public function store(Request $request): JsonResponse //---------------------------------------------------------- public function send(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -271,11 +265,10 @@ public function send(Request $request): JsonResponse //---------------------------------------------------------- public function markAsRead(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { diff --git a/Http/Controllers/Backend/Settings/UpdateController.php b/Http/Controllers/Backend/Settings/UpdateController.php index 7a6f75fd4..3bb1023a0 100644 --- a/Http/Controllers/Backend/Settings/UpdateController.php +++ b/Http/Controllers/Backend/Settings/UpdateController.php @@ -24,11 +24,10 @@ public function __construct() //---------------------------------------------------------- public function storeUpdate(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -87,11 +86,10 @@ public function storeUpdate(Request $request): JsonResponse //---------------------------------------------------------- public function upgrade(): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -112,12 +110,10 @@ public function upgrade(): JsonResponse //---------------------------------------------------------- public function publish() { + $permission_slug = 'has-access-of-setting-section'; - if(!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -158,12 +154,10 @@ public function publish() //---------------------------------------------------------- public function runMigrations(): JsonResponse { + $permission_slug = 'has-access-of-setting-section'; - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try{ @@ -198,12 +192,10 @@ public function runMigrations(): JsonResponse //---------------------------------------------------------- public function clearCache(): JsonResponse { + $permission_slug = 'has-access-of-setting-section'; - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { diff --git a/Http/Controllers/Backend/Settings/UserSettingController.php b/Http/Controllers/Backend/Settings/UserSettingController.php index e874d7dc9..cd874d517 100644 --- a/Http/Controllers/Backend/Settings/UserSettingController.php +++ b/Http/Controllers/Backend/Settings/UserSettingController.php @@ -18,11 +18,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -48,12 +47,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { + $permission_slug = 'has-access-of-setting-section'; - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -89,11 +86,10 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function storeCustomField(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -144,12 +140,10 @@ public function storeCustomField(Request $request): JsonResponse //---------------------------------------------------------- public function storeField(Request $request): JsonResponse { + $permission_slug = 'has-access-of-setting-section'; - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { diff --git a/Http/Controllers/Backend/TaxonomiesController.php b/Http/Controllers/Backend/TaxonomiesController.php index 0ada84d6b..a4c9415ba 100644 --- a/Http/Controllers/Backend/TaxonomiesController.php +++ b/Http/Controllers/Backend/TaxonomiesController.php @@ -18,11 +18,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-taxonomies-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-taxonomies-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -82,11 +81,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-taxonomies-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-taxonomies-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -108,13 +106,11 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function updateList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-taxonomies') || - !Auth::user()->hasPermission('can-manage-taxonomies') - ) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slugs = ['can-update-taxonomies','can-manage-taxonomies']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -136,13 +132,11 @@ public function updateList(Request $request): JsonResponse //---------------------------------------------------------- public function listAction(Request $request, $type): JsonResponse { - if (!Auth::user()->hasPermission('can-update-taxonomies') || - !Auth::user()->hasPermission('can-manage-taxonomies') - ) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slugs = ['can-update-taxonomies','can-manage-taxonomies']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -164,11 +158,10 @@ public function listAction(Request $request, $type): JsonResponse //---------------------------------------------------------- public function deleteList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-delete-taxonomies')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-delete-taxonomies'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -190,11 +183,10 @@ public function deleteList(Request $request): JsonResponse //---------------------------------------------------------- public function createItem(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-create-taxonomies')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-create-taxonomies'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -216,11 +208,10 @@ public function createItem(Request $request): JsonResponse //---------------------------------------------------------- public function getItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-read-taxonomies')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-read-taxonomies'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -266,11 +257,10 @@ public function getListByTypeId(Request $request, $id): JsonResponse //---------------------------------------------------------- public function updateItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-taxonomies')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-taxonomies'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -292,11 +282,10 @@ public function updateItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function deleteItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-delete-taxonomies')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-delete-taxonomies'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -318,13 +307,11 @@ public function deleteItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function itemAction(Request $request, $id, $action): JsonResponse { - if (!Auth::user()->hasPermission('can-update-taxonomies') || - !Auth::user()->hasPermission('can-manage-taxonomies') - ) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slugs = ['can-update-taxonomies','can-manage-taxonomies']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -346,11 +333,10 @@ public function itemAction(Request $request, $id, $action): JsonResponse //---------------------------------------------------------- public function createTaxonomyType(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-manage-taxonomy-type')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-manage-taxonomy-type'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -395,11 +381,10 @@ public function createTaxonomyType(Request $request): JsonResponse //---------------------------------------------------------- public function deleteTaxonomyType(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-manage-taxonomy-type')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-manage-taxonomy-type'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -449,11 +434,10 @@ public function deletechildrens($types) //---------------------------------------------------------- public function updateTaxonomyType(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-manage-taxonomy-type')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-manage-taxonomy-type'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -513,13 +497,13 @@ public function updateTaxonomyType(Request $request): JsonResponse //---------------------------------------------------------- public function updateTaxonomyTypePosition(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-manage-taxonomy-type')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-manage-taxonomy-type'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } + try { $parent_id = null; diff --git a/Http/Controllers/Backend/ThemesController.php b/Http/Controllers/Backend/ThemesController.php index 5ce591621..7b821bcd5 100644 --- a/Http/Controllers/Backend/ThemesController.php +++ b/Http/Controllers/Backend/ThemesController.php @@ -21,12 +21,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { + $permission_slug = 'has-access-of-theme-section'; - if (!Auth::user()->hasPermission('has-access-of-theme-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -55,11 +53,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-theme-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-theme-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -123,11 +120,10 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function download(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-install-theme')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-install-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -163,11 +159,10 @@ public function download(Request $request): JsonResponse //---------------------------------------------------------- public function installUpdates(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-theme')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -245,81 +240,73 @@ public function actions(Request $request,$id,$action): JsonResponse { //--------------------------------------- case 'activate': - if (!Auth::user()->hasPermission('can-activate-theme')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-activate-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Theme::activateItem($theme->slug); break; //--------------------------------------- case 'make_default': - if (!Auth::user()->hasPermission('can-activate-theme')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-activate-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Theme::makeItemAsDefault($theme->slug); break; //--------------------------------------- case 'refresh_migrations': - if (!Auth::user()->hasPermission('can-activate-theme')) { - $response['success'] = false; - $response['messages'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-activate-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Theme::refreshMigrations($theme->slug); break; //--------------------------------------- case 'run_migrations': - if (!Auth::user()->hasPermission('can-activate-theme')) { - $response['success'] = false; - $response['messages'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-activate-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Theme::runMigrations($theme->slug); break; //--------------------------------------- case 'run_seeds': - if (!Auth::user()->hasPermission('can-activate-theme')) { - $response['success'] = false; - $response['messages'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-activate-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Theme::runSeeds($theme->slug); break; //--------------------------------------- case 'deactivate': - if (!Auth::user()->hasPermission('can-deactivate-theme')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-deactivate-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Theme::deactivateItem($theme->slug); break; //--------------------------------------- case 'import_sample_data': - if (!Auth::user()->hasPermission('can-import-sample-data-in-theme')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-import-sample-data-in-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Theme::importSampleData($theme->slug); break; //--------------------------------------- case 'delete': - if (!Auth::user()->hasPermission('can-delete-theme')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-delete-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Theme::deleteItem($theme->slug); break; @@ -344,11 +331,10 @@ public function actions(Request $request,$id,$action): JsonResponse //---------------------------------------------------------- public function storeUpdates(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-theme')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -384,11 +370,10 @@ public function storeUpdates(Request $request): JsonResponse //---------------------------------------------------------- public function deleteItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-delete-theme')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-delete-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -442,11 +427,10 @@ public function publishAssets(Request $request) //---------------------------------------------------------- public function getItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-read-module')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-read-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { diff --git a/Http/Controllers/Backend/UsersController.php b/Http/Controllers/Backend/UsersController.php index 65a424c86..f18d3c08a 100644 --- a/Http/Controllers/Backend/UsersController.php +++ b/Http/Controllers/Backend/UsersController.php @@ -20,11 +20,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-users-section')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slug = 'has-access-of-users-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -107,11 +106,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-users-section')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slug = 'has-access-of-users-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -132,11 +130,10 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function updateList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slug = 'can-update-users'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -158,11 +155,10 @@ public function updateList(Request $request): JsonResponse //---------------------------------------------------------- public function listAction(Request $request, $type): JsonResponse { - if (!Auth::user()->hasPermission('can-update-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slug = 'can-update-users'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -203,11 +199,11 @@ public function deleteList(Request $request): JsonResponse //---------------------------------------------------------- public function createItem(Request $request): JsonResponse { - if(!Auth::user()->hasPermission('can-create-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); - return response()->json($response); + $permission_slug = 'can-create-user'; + + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -229,11 +225,10 @@ public function createItem(Request $request): JsonResponse //---------------------------------------------------------- public function getItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-read-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slug = 'can-read-users'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -255,11 +250,10 @@ public function getItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function updateItem(Request $request,$id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slug = 'can-update-users'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -291,13 +285,11 @@ public function updateItem(Request $request,$id): JsonResponse //---------------------------------------------------------- public function deleteItem(Request $request,$id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-users') || - !Auth::user()->hasPermission('can-delete-users') - ) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slugs = ['can-update-users','can-delete-users']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -319,13 +311,11 @@ public function deleteItem(Request $request,$id): JsonResponse //---------------------------------------------------------- public function itemAction(Request $request,$id,$action): JsonResponse { - if(!Auth::user()->hasPermission('can-manage-users') && - !Auth::user()->hasPermission('can-update-users') - ) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slugs = ['can-manage-users','can-update-users']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) && + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -356,11 +346,10 @@ public function itemAction(Request $request,$id,$action): JsonResponse //---------------------------------------------------------- public function getItemRoles(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-read-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slug = 'can-read-users'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -439,13 +428,11 @@ public function postActions(Request $request, $action) : JsonResponse //------------------------------------ case 'bulk-change-status': - if (!Auth::user()->hasPermission('can-manage-users') && - !Auth::user()->hasPermission('can-update-users') - ) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slugs = ['can-manage-users','can-update-users']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) && + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } $response = User::bulkStatusChange($request); @@ -454,11 +441,10 @@ public function postActions(Request $request, $action) : JsonResponse //------------------------------------ case 'bulk-trash': - if (!Auth::user()->hasPermission('can-update-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slug = 'can-update-users'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = User::bulkTrash($request); @@ -467,11 +453,10 @@ public function postActions(Request $request, $action) : JsonResponse //------------------------------------ case 'bulk-restore': - if (!Auth::user()->hasPermission('can-update-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slug = 'can-update-users'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = User::bulkRestore($request); @@ -480,13 +465,11 @@ public function postActions(Request $request, $action) : JsonResponse //------------------------------------ case 'bulk-delete': - if (!Auth::user()->hasPermission('can-update-users') || - !Auth::user()->hasPermission('can-delete-users') - ) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slugs = ['can-update-users','can-delete-users']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } $response = User::bulkDelete($request); @@ -495,13 +478,11 @@ public function postActions(Request $request, $action) : JsonResponse //------------------------------------ case 'toggle-role-active-status': - if (!Auth::user()->hasPermission('can-manage-users') && - !Auth::user()->hasPermission('can-update-users') - ) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slugs = ['can-manage-users','can-update-users']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) && + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } $response = User::bulkChangeRoleStatus($request); @@ -550,11 +531,10 @@ public function getProfile(Request $request): JsonResponse //---------------------------------------------------------- public function storeAvatar(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slug = 'can-update-users'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -591,12 +571,10 @@ public function storeAvatar(Request $request): JsonResponse //---------------------------------------------------------- public function removeAvatar(Request $request) { + $permission_slug = 'can-update-users'; - if (!Auth::user()->hasPermission('can-update-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -714,12 +692,10 @@ public function removeProfileAvatar(Request $request): JsonResponse //---------------------------------------------------------- public function impersonate(Request $request, $uuid): JsonResponse { + $permission_slug = 'can-impersonate-users'; - if (!Auth::user()->hasPermission('can-impersonate-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { diff --git a/Http/Controllers/Settings/BackupsController.php b/Http/Controllers/Settings/BackupsController.php index 9a32404eb..0e280ebe8 100644 --- a/Http/Controllers/Settings/BackupsController.php +++ b/Http/Controllers/Settings/BackupsController.php @@ -24,13 +24,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request) { + $permission_slug = 'has-access-of-setting-section'; - if(!\Auth::user()->hasPermission('has-access-of-setting-section')) - { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!\Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response['success'] = true; @@ -41,13 +38,10 @@ public function getAssets(Request $request) //---------------------------------------------------------- public function getList(Request $request) { + $permission_slug = 'has-access-of-setting-section'; - if(!\Auth::user()->hasPermission('has-access-of-setting-section')) - { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!\Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = VaahBackup::create($request); diff --git a/Http/Controllers/Settings/SettingsController.php b/Http/Controllers/Settings/SettingsController.php index b0de6c371..aac6fd95a 100644 --- a/Http/Controllers/Settings/SettingsController.php +++ b/Http/Controllers/Settings/SettingsController.php @@ -21,13 +21,10 @@ public function __construct() //---------------------------------------------------------- public function index() { + $permission_slug = 'has-access-of-setting-section'; - if(!\Auth::user()->hasPermission('has-access-of-setting-section')) - { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!\Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } return view($this->theme.'.pages.dashboard'); From 115e5d1c5561c4007181f9ce4d000d7c80489ec1 Mon Sep 17 00:00:00 2001 From: Vikram Chand Date: Wed, 10 Jan 2024 14:02:42 +0530 Subject: [PATCH 17/57] Updated: permission denied response --- Helpers/backend.php | 5 +++-- .../Backend/RegistrationsController.php | 9 ++++----- Models/UserBase.php | 17 +++++++++++++++++ 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/Helpers/backend.php b/Helpers/backend.php index 7fd9efa90..5aff07011 100644 --- a/Helpers/backend.php +++ b/Helpers/backend.php @@ -112,7 +112,8 @@ function vh_get_backend_file($file_path) return vh_get_backend_theme_url()."/".$file_path; } //----------------------------------------------------------------------------------- -function vh_get_permission_denied_response($permission_slugs){ +function vh_get_permission_denied_json_response($permission_slugs){ + $response = []; $response['success'] = false; $text = implode(', ',$permission_slugs); @@ -121,6 +122,6 @@ function vh_get_permission_denied_response($permission_slugs){ if(env('APP_DEBUG')){ $response['hint'][] = 'You don\'t have "'.$text.'" permission.'; } - return $response; + return response()->json($response); } //----------------------------------------------------------------------------------- diff --git a/Http/Controllers/Backend/RegistrationsController.php b/Http/Controllers/Backend/RegistrationsController.php index 5a3364537..9f9812c50 100644 --- a/Http/Controllers/Backend/RegistrationsController.php +++ b/Http/Controllers/Backend/RegistrationsController.php @@ -23,7 +23,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-registrations-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -144,10 +144,9 @@ public function updateList(Request $request): JsonResponse public function listAction(Request $request, $type): JsonResponse { $permission_slugs = ['can-update-registrations','can-manage-registrations']; - - if(!Auth::user()->hasPermission($permission_slugs[0]) || - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return $permission_response; } try { diff --git a/Models/UserBase.php b/Models/UserBase.php index 97f13e5d6..5af056e3f 100644 --- a/Models/UserBase.php +++ b/Models/UserBase.php @@ -1139,6 +1139,23 @@ public function hasPermission($permission_slug, $details=false) } + //------------------------------------------------- + public function hasPermissions($permission_slugs) + { + $permission_slugs_string = implode(', ',$permission_slugs); + + foreach($permission_slugs as $permission_slug){ + if(!Auth::user()->hasPermission($permission_slug)){ + return vh_get_permission_denied_json_response($permission_slugs_string); + } + } + + $response = []; + $response['success'] = true; + return $response; + + } + //------------------------------------------------- From bf55e0e657743b141771f91f87d326180ed46c94 Mon Sep 17 00:00:00 2001 From: Alam Date: Wed, 10 Jan 2024 17:33:18 +0530 Subject: [PATCH 18/57] Updated: permission denied response --- Helpers/backend.php | 11 +++++++---- Models/UserBase.php | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Helpers/backend.php b/Helpers/backend.php index 5aff07011..eb209aed8 100644 --- a/Helpers/backend.php +++ b/Helpers/backend.php @@ -113,15 +113,18 @@ function vh_get_backend_file($file_path) } //----------------------------------------------------------------------------------- function vh_get_permission_denied_json_response($permission_slugs){ + $response = vh_get_permission_denied_response($permission_slugs); + return response()->json($response); +} +//----------------------------------------------------------------------------------- +function vh_get_permission_denied_response($permission_slugs){ $response = []; $response['success'] = false; - $text = implode(', ',$permission_slugs); - $response['errors'][] = trans("vaahcms-general.permission_denied"); if(env('APP_DEBUG')){ - $response['hint'][] = 'You don\'t have "'.$text.'" permission.'; + $response['hint'][] = 'You don\'t have "'.$permission_slugs.'" permission.'; } - return response()->json($response); + return $response; } //----------------------------------------------------------------------------------- diff --git a/Models/UserBase.php b/Models/UserBase.php index 5af056e3f..ed120c709 100644 --- a/Models/UserBase.php +++ b/Models/UserBase.php @@ -1146,7 +1146,7 @@ public function hasPermissions($permission_slugs) foreach($permission_slugs as $permission_slug){ if(!Auth::user()->hasPermission($permission_slug)){ - return vh_get_permission_denied_json_response($permission_slugs_string); + return vh_get_permission_denied_response($permission_slugs_string); } } From 2771bf9f66c3fda9a25594828980faee031e02cb Mon Sep 17 00:00:00 2001 From: Alam Date: Wed, 10 Jan 2024 18:05:58 +0530 Subject: [PATCH 19/57] Updated: registrations permission response --- .../Backend/RegistrationsController.php | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/Http/Controllers/Backend/RegistrationsController.php b/Http/Controllers/Backend/RegistrationsController.php index 9f9812c50..b19d30b3e 100644 --- a/Http/Controllers/Backend/RegistrationsController.php +++ b/Http/Controllers/Backend/RegistrationsController.php @@ -95,7 +95,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-registrations-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -121,7 +121,7 @@ public function updateList(Request $request): JsonResponse $permission_slug = 'can-update-registrations'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -145,8 +145,9 @@ public function listAction(Request $request, $type): JsonResponse { $permission_slugs = ['can-update-registrations','can-manage-registrations']; $permission_response = Auth::user()->hasPermissions($permission_slugs); + if(isset($permission_response['success']) && $permission_response['success'] == false) { - return $permission_response; + return response()->json($permission_response); } try { @@ -170,9 +171,10 @@ public function deleteList(Request $request): JsonResponse { $permission_slugs = ['can-update-registrations','can-delete-registrations']; - if(!Auth::user()->hasPermission($permission_slugs[0]) || - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -197,7 +199,7 @@ public function createItem(Request $request): JsonResponse $permission_slug = 'can-create-registrations'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -222,7 +224,7 @@ public function getItem(Request $request, $id): JsonResponse $permission_slug = 'can-read-registrations'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -247,7 +249,7 @@ public function updateItem(Request $request ,$id): JsonResponse $permission_slug = 'can-update-registrations'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -271,9 +273,10 @@ public function deleteItem(Request $request, $id): JsonResponse { $permission_slugs = ['can-update-registrations','can-delete-registrations']; - if(!Auth::user()->hasPermission($permission_slugs[0]) || - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -297,9 +300,10 @@ public function itemAction(Request $request, $id, $action): JsonResponse { $permission_slugs = ['can-update-registrations','can-manage-registrations']; - if(!Auth::user()->hasPermission($permission_slugs[0]) || - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -343,7 +347,7 @@ public function createUser(Request $request,$id): JsonResponse $permission_slug = 'can-create-users-from-registrations'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { From 5e543502dd48418b6d6b90a826720df64853fd9e Mon Sep 17 00:00:00 2001 From: Alam Date: Wed, 10 Jan 2024 18:20:48 +0530 Subject: [PATCH 20/57] Updated: users permission response --- Http/Controllers/Backend/UsersController.php | 61 +++++++++++--------- 1 file changed, 33 insertions(+), 28 deletions(-) diff --git a/Http/Controllers/Backend/UsersController.php b/Http/Controllers/Backend/UsersController.php index f18d3c08a..f0457fff1 100644 --- a/Http/Controllers/Backend/UsersController.php +++ b/Http/Controllers/Backend/UsersController.php @@ -23,7 +23,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-users-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -109,7 +109,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-users-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -133,7 +133,7 @@ public function updateList(Request $request): JsonResponse $permission_slug = 'can-update-users'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -158,7 +158,7 @@ public function listAction(Request $request, $type): JsonResponse $permission_slug = 'can-update-users'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -203,7 +203,7 @@ public function createItem(Request $request): JsonResponse $permission_slug = 'can-create-user'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -228,7 +228,7 @@ public function getItem(Request $request, $id): JsonResponse $permission_slug = 'can-read-users'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -253,7 +253,7 @@ public function updateItem(Request $request,$id): JsonResponse $permission_slug = 'can-update-users'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -287,9 +287,10 @@ public function deleteItem(Request $request,$id): JsonResponse { $permission_slugs = ['can-update-users','can-delete-users']; - if(!Auth::user()->hasPermission($permission_slugs[0]) || - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -313,9 +314,10 @@ public function itemAction(Request $request,$id,$action): JsonResponse { $permission_slugs = ['can-manage-users','can-update-users']; - if(!Auth::user()->hasPermission($permission_slugs[0]) && - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -349,7 +351,7 @@ public function getItemRoles(Request $request, $id): JsonResponse $permission_slug = 'can-read-users'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -430,9 +432,10 @@ public function postActions(Request $request, $action) : JsonResponse $permission_slugs = ['can-manage-users','can-update-users']; - if(!Auth::user()->hasPermission($permission_slugs[0]) && - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } $response = User::bulkStatusChange($request); @@ -444,7 +447,7 @@ public function postActions(Request $request, $action) : JsonResponse $permission_slug = 'can-update-users'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = User::bulkTrash($request); @@ -456,7 +459,7 @@ public function postActions(Request $request, $action) : JsonResponse $permission_slug = 'can-update-users'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = User::bulkRestore($request); @@ -467,9 +470,10 @@ public function postActions(Request $request, $action) : JsonResponse $permission_slugs = ['can-update-users','can-delete-users']; - if(!Auth::user()->hasPermission($permission_slugs[0]) || - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } $response = User::bulkDelete($request); @@ -480,9 +484,10 @@ public function postActions(Request $request, $action) : JsonResponse $permission_slugs = ['can-manage-users','can-update-users']; - if(!Auth::user()->hasPermission($permission_slugs[0]) && - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } $response = User::bulkChangeRoleStatus($request); @@ -534,7 +539,7 @@ public function storeAvatar(Request $request): JsonResponse $permission_slug = 'can-update-users'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -574,7 +579,7 @@ public function removeAvatar(Request $request) $permission_slug = 'can-update-users'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -695,7 +700,7 @@ public function impersonate(Request $request, $uuid): JsonResponse $permission_slug = 'can-impersonate-users'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { From c667cb2aed551e3ab59ac123c128e928bbf87e20 Mon Sep 17 00:00:00 2001 From: Alam Date: Wed, 10 Jan 2024 18:34:09 +0530 Subject: [PATCH 21/57] Updated: themes permission response --- Http/Controllers/Backend/ThemesController.php | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Http/Controllers/Backend/ThemesController.php b/Http/Controllers/Backend/ThemesController.php index 7b821bcd5..2f661f79c 100644 --- a/Http/Controllers/Backend/ThemesController.php +++ b/Http/Controllers/Backend/ThemesController.php @@ -24,7 +24,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-theme-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -56,7 +56,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-theme-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -123,7 +123,7 @@ public function download(Request $request): JsonResponse $permission_slug = 'can-install-theme'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -162,7 +162,7 @@ public function installUpdates(Request $request): JsonResponse $permission_slug = 'can-update-theme'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -243,7 +243,7 @@ public function actions(Request $request,$id,$action): JsonResponse $permission_slug = 'can-activate-theme'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = Theme::activateItem($theme->slug); break; @@ -252,7 +252,7 @@ public function actions(Request $request,$id,$action): JsonResponse $permission_slug = 'can-activate-theme'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = Theme::makeItemAsDefault($theme->slug); break; @@ -261,7 +261,7 @@ public function actions(Request $request,$id,$action): JsonResponse $permission_slug = 'can-activate-theme'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = Theme::refreshMigrations($theme->slug); break; @@ -270,7 +270,7 @@ public function actions(Request $request,$id,$action): JsonResponse $permission_slug = 'can-activate-theme'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = Theme::runMigrations($theme->slug); break; @@ -279,7 +279,7 @@ public function actions(Request $request,$id,$action): JsonResponse $permission_slug = 'can-activate-theme'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = Theme::runSeeds($theme->slug); break; @@ -288,7 +288,7 @@ public function actions(Request $request,$id,$action): JsonResponse $permission_slug = 'can-deactivate-theme'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = Theme::deactivateItem($theme->slug); break; @@ -297,7 +297,7 @@ public function actions(Request $request,$id,$action): JsonResponse $permission_slug = 'can-import-sample-data-in-theme'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = Theme::importSampleData($theme->slug); break; @@ -306,7 +306,7 @@ public function actions(Request $request,$id,$action): JsonResponse $permission_slug = 'can-delete-theme'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = Theme::deleteItem($theme->slug); break; @@ -334,7 +334,7 @@ public function storeUpdates(Request $request): JsonResponse $permission_slug = 'can-update-theme'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -373,7 +373,7 @@ public function deleteItem(Request $request, $id): JsonResponse $permission_slug = 'can-delete-theme'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -430,7 +430,7 @@ public function getItem(Request $request, $id): JsonResponse $permission_slug = 'can-read-theme'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { From 39bf5c8d42bb9697332ffa2186565b9fb0ed31bd Mon Sep 17 00:00:00 2001 From: Alam Date: Wed, 10 Jan 2024 18:46:20 +0530 Subject: [PATCH 22/57] Updated: taxonomy permission response --- .../Backend/TaxonomiesController.php | 43 ++++++++++--------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/Http/Controllers/Backend/TaxonomiesController.php b/Http/Controllers/Backend/TaxonomiesController.php index a4c9415ba..2c9cefb5c 100644 --- a/Http/Controllers/Backend/TaxonomiesController.php +++ b/Http/Controllers/Backend/TaxonomiesController.php @@ -21,7 +21,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-taxonomies-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -84,7 +84,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-taxonomies-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -108,9 +108,10 @@ public function updateList(Request $request): JsonResponse { $permission_slugs = ['can-update-taxonomies','can-manage-taxonomies']; - if(!Auth::user()->hasPermission($permission_slugs[0]) || - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -134,9 +135,10 @@ public function listAction(Request $request, $type): JsonResponse { $permission_slugs = ['can-update-taxonomies','can-manage-taxonomies']; - if(!Auth::user()->hasPermission($permission_slugs[0]) || - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -161,7 +163,7 @@ public function deleteList(Request $request): JsonResponse $permission_slug = 'can-delete-taxonomies'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -186,7 +188,7 @@ public function createItem(Request $request): JsonResponse $permission_slug = 'can-create-taxonomies'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -211,7 +213,7 @@ public function getItem(Request $request, $id): JsonResponse $permission_slug = 'can-read-taxonomies'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -260,7 +262,7 @@ public function updateItem(Request $request, $id): JsonResponse $permission_slug = 'can-update-taxonomies'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -285,7 +287,7 @@ public function deleteItem(Request $request, $id): JsonResponse $permission_slug = 'can-delete-taxonomies'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -309,9 +311,10 @@ public function itemAction(Request $request, $id, $action): JsonResponse { $permission_slugs = ['can-update-taxonomies','can-manage-taxonomies']; - if(!Auth::user()->hasPermission($permission_slugs[0]) || - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -336,7 +339,7 @@ public function createTaxonomyType(Request $request): JsonResponse $permission_slug = 'can-manage-taxonomy-type'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -384,7 +387,7 @@ public function deleteTaxonomyType(Request $request): JsonResponse $permission_slug = 'can-manage-taxonomy-type'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -437,7 +440,7 @@ public function updateTaxonomyType(Request $request): JsonResponse $permission_slug = 'can-manage-taxonomy-type'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -500,7 +503,7 @@ public function updateTaxonomyTypePosition(Request $request): JsonResponse $permission_slug = 'can-manage-taxonomy-type'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } From 53723de7f348afc846545928da9d606ea796c693 Mon Sep 17 00:00:00 2001 From: Alam Date: Wed, 10 Jan 2024 18:55:23 +0530 Subject: [PATCH 23/57] Updated: roles permission response --- Http/Controllers/Backend/RolesController.php | 34 +++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/Http/Controllers/Backend/RolesController.php b/Http/Controllers/Backend/RolesController.php index 7004ebf54..aa3d417c9 100644 --- a/Http/Controllers/Backend/RolesController.php +++ b/Http/Controllers/Backend/RolesController.php @@ -20,7 +20,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-roles-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -78,7 +78,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-roles-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -103,7 +103,7 @@ public function updateList(Request $request): JsonResponse $permission_slug = 'can-update-roles'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -127,9 +127,10 @@ public function listAction(Request $request, $type): JsonResponse { $permission_slugs = ['can-update-roles','can-manage-roles']; - if(!Auth::user()->hasPermission($permission_slugs[0]) || - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -154,7 +155,7 @@ public function deleteList(Request $request): JsonResponse $permission_slug = 'can-delete-roles'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -179,7 +180,7 @@ public function createItem(Request $request): JsonResponse $permission_slug = 'can-create-roles'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -204,7 +205,7 @@ public function getItem(Request $request, $id): JsonResponse $permission_slug = 'can-read-roles'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -229,7 +230,7 @@ public function updateItem(Request $request,$id): JsonResponse $permission_slug = 'can-update-roles'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -254,7 +255,7 @@ public function deleteItem(Request $request, $id): JsonResponse $permission_slug = 'can-delete-roles'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -278,9 +279,10 @@ public function itemAction(Request $request, $id, $action): JsonResponse { $permission_slugs = ['can-manage-roles','can-update-roles']; - if(!Auth::user()->hasPermission($permission_slugs[0]) || - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -305,7 +307,7 @@ public function getItemPermission(Request $request, $id): JsonResponse $permission_slug = 'can-read-roles'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -330,7 +332,7 @@ public function getItemUser(Request $request, $id): JsonResponse $permission_slug = 'can-read-roles'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { From d261d533cedf17e42e2918e479d51b5ddb1ddd3e Mon Sep 17 00:00:00 2001 From: Alam Date: Wed, 10 Jan 2024 18:58:30 +0530 Subject: [PATCH 24/57] Updated: permission denied response of permission --- .../Backend/PermissionsController.php | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Http/Controllers/Backend/PermissionsController.php b/Http/Controllers/Backend/PermissionsController.php index 4e744928d..556d1ccd9 100644 --- a/Http/Controllers/Backend/PermissionsController.php +++ b/Http/Controllers/Backend/PermissionsController.php @@ -21,7 +21,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-permissions-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -72,7 +72,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-permissions-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { $response = Permission::getList($request); @@ -96,7 +96,7 @@ public function updateList(Request $request): JsonResponse $permission_slug = 'can-update-permissions'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -121,7 +121,7 @@ public function listAction(Request $request, $type): JsonResponse $permission_slug = 'can-update-permissions'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -146,7 +146,7 @@ public function deleteList(Request $request): JsonResponse $permission_slug = 'can-update-permissions'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -171,7 +171,7 @@ public function getItem(Request $request, $id): JsonResponse $permission_slug = 'can-update-permissions'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -196,7 +196,7 @@ public function updateItem(Request $request, $id): JsonResponse $permission_slug = 'can-update-permissions'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -221,7 +221,7 @@ public function deleteItem(Request $request, $id): JsonResponse $permission_slug = 'can-update-permissions'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -246,7 +246,7 @@ public function itemAction(Request $request, $id, $action): JsonResponse $permission_slug = 'can-update-permissions'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -271,7 +271,7 @@ public function getItemRoles(Request $request, $id): JsonResponse $permission_slug = 'can-update-permissions'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { From 097e5d87b6972243c6e77eb009888d828962e70c Mon Sep 17 00:00:00 2001 From: Alam Date: Wed, 10 Jan 2024 19:01:25 +0530 Subject: [PATCH 25/57] Updated: modules permission response --- .../Controllers/Backend/ModulesController.php | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Http/Controllers/Backend/ModulesController.php b/Http/Controllers/Backend/ModulesController.php index 89154f114..046e92ba3 100644 --- a/Http/Controllers/Backend/ModulesController.php +++ b/Http/Controllers/Backend/ModulesController.php @@ -24,7 +24,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-module-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -56,7 +56,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-module-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -127,7 +127,7 @@ public function getItem(Request $request, $id): JsonResponse $permission_slug = 'can-read-module'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -152,7 +152,7 @@ public function download(Request $request): JsonResponse $permission_slug = 'can-install-module'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -191,7 +191,7 @@ public function installUpdates(Request $request): JsonResponse $permission_slug = 'can-update-module'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -274,7 +274,7 @@ public function actions(Request $request, $id, $action): JsonResponse $permission_slug = 'can-activate-module'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = Module::activateItem($module->slug); break; @@ -283,7 +283,7 @@ public function actions(Request $request, $id, $action): JsonResponse $permission_slug = 'can-deactivate-module'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = Module::deactivateItem($module->slug); @@ -293,7 +293,7 @@ public function actions(Request $request, $id, $action): JsonResponse $permission_slug = 'can-activate-module'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = Module::refreshMigrations($module->slug); break; @@ -302,7 +302,7 @@ public function actions(Request $request, $id, $action): JsonResponse $permission_slug = 'can-activate-module'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = Module::runMigrations($module->slug); break; @@ -311,7 +311,7 @@ public function actions(Request $request, $id, $action): JsonResponse $permission_slug = 'can-activate-module'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = Module::runSeeds($module->slug); break; @@ -320,7 +320,7 @@ public function actions(Request $request, $id, $action): JsonResponse $permission_slug = 'can-import-sample-data-in-module'; if(!\Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = Module::importSampleData($module->slug); @@ -330,7 +330,7 @@ public function actions(Request $request, $id, $action): JsonResponse $permission_slug = 'can-delete-module'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = Module::deleteItem($module->slug); @@ -408,7 +408,7 @@ public function updateModuleVersions(Request $request): JsonResponse $permission_slug = 'can-update-module'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -448,7 +448,7 @@ public function storeUpdates(Request $request): JsonResponse $permission_slug = 'can-update-module'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { From 264972eab3c6e15af84801d01a33b6c335c5ffa2 Mon Sep 17 00:00:00 2001 From: Alam Date: Wed, 10 Jan 2024 19:05:17 +0530 Subject: [PATCH 26/57] Updated: media permission response --- Http/Controllers/Backend/MediaController.php | 30 +++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/Http/Controllers/Backend/MediaController.php b/Http/Controllers/Backend/MediaController.php index e40489696..64be9450a 100644 --- a/Http/Controllers/Backend/MediaController.php +++ b/Http/Controllers/Backend/MediaController.php @@ -22,7 +22,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-media-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -85,7 +85,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-media-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -110,7 +110,7 @@ public function updateList(Request $request): JsonResponse $permission_slug = 'can-update-media'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -134,9 +134,10 @@ public function listAction(Request $request, $type): JsonResponse { $permission_slugs = ['can-update-media','can-manage-media']; - if(!Auth::user()->hasPermission($permission_slugs[0]) || - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } @@ -162,7 +163,7 @@ public function deleteList(Request $request): JsonResponse $permission_slug = 'can-delete-media'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -187,7 +188,7 @@ public function getItem(Request $request, $id): JsonResponse $permission_slug = 'can-read-media'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -212,7 +213,7 @@ public function updateItem(Request $request, $id): JsonResponse $permission_slug = 'can-update-media'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -237,7 +238,7 @@ public function deleteItem(Request $request, $id): JsonResponse $permission_slug = 'can-update-media'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -261,9 +262,10 @@ public function itemAction(Request $request, $id, $action): JsonResponse { $permission_slugs = ['can-update-media','can-manage-media']; - if(!Auth::user()->hasPermission($permission_slugs[0]) || - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -419,7 +421,7 @@ public function postCreate(Request $request): JsonResponse $permission_slug = 'can-create-media'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { From 84e35e5552125169a82a34ca4293e7f575781109 Mon Sep 17 00:00:00 2001 From: Alam Date: Wed, 10 Jan 2024 19:12:06 +0530 Subject: [PATCH 27/57] Updated: settings permission response --- .../Backend/Settings/EnvController.php | 8 ++++---- .../Backend/Settings/GeneralController.php | 12 ++++++------ .../Settings/LocalizationController.php | 14 +++++++------- .../Settings/NotificationsController.php | 18 +++++++++--------- .../Backend/Settings/UpdateController.php | 10 +++++----- .../Backend/Settings/UserSettingController.php | 8 ++++---- 6 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Http/Controllers/Backend/Settings/EnvController.php b/Http/Controllers/Backend/Settings/EnvController.php index d6bce300f..be164f767 100644 --- a/Http/Controllers/Backend/Settings/EnvController.php +++ b/Http/Controllers/Backend/Settings/EnvController.php @@ -24,7 +24,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -59,7 +59,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -90,7 +90,7 @@ public function downloadFile(Request $request, $file_name): BinaryFileResponse | $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -119,7 +119,7 @@ public function store(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { diff --git a/Http/Controllers/Backend/Settings/GeneralController.php b/Http/Controllers/Backend/Settings/GeneralController.php index 71399be06..5934c3e5b 100644 --- a/Http/Controllers/Backend/Settings/GeneralController.php +++ b/Http/Controllers/Backend/Settings/GeneralController.php @@ -25,7 +25,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -65,7 +65,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -100,7 +100,7 @@ public function storeSiteSettings(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -149,7 +149,7 @@ public function storeLinks(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -226,7 +226,7 @@ public function storeMetaTags(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -286,7 +286,7 @@ public function deleteMetaTags(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { diff --git a/Http/Controllers/Backend/Settings/LocalizationController.php b/Http/Controllers/Backend/Settings/LocalizationController.php index a14231238..a31f8024a 100644 --- a/Http/Controllers/Backend/Settings/LocalizationController.php +++ b/Http/Controllers/Backend/Settings/LocalizationController.php @@ -25,7 +25,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -64,7 +64,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -89,7 +89,7 @@ public function generateLanguage(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -117,7 +117,7 @@ public function postStore(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -142,7 +142,7 @@ public function storeLanguage(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -168,7 +168,7 @@ public function storeCategory(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -194,7 +194,7 @@ public function postActions(Request $request, $action): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { diff --git a/Http/Controllers/Backend/Settings/NotificationsController.php b/Http/Controllers/Backend/Settings/NotificationsController.php index 1b5ac8386..821b97d53 100644 --- a/Http/Controllers/Backend/Settings/NotificationsController.php +++ b/Http/Controllers/Backend/Settings/NotificationsController.php @@ -23,7 +23,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -59,7 +59,7 @@ public function getList(Request $request) $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try{ @@ -81,7 +81,7 @@ public function getItemData(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -113,7 +113,7 @@ public function createItem(Request $request) $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try{ @@ -136,7 +136,7 @@ public function itemAction(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -161,7 +161,7 @@ public function listAction(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -186,7 +186,7 @@ public function store(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -226,7 +226,7 @@ public function send(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -268,7 +268,7 @@ public function markAsRead(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { diff --git a/Http/Controllers/Backend/Settings/UpdateController.php b/Http/Controllers/Backend/Settings/UpdateController.php index 3bb1023a0..ae09aa998 100644 --- a/Http/Controllers/Backend/Settings/UpdateController.php +++ b/Http/Controllers/Backend/Settings/UpdateController.php @@ -27,7 +27,7 @@ public function storeUpdate(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -89,7 +89,7 @@ public function upgrade(): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -113,7 +113,7 @@ public function publish() $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -157,7 +157,7 @@ public function runMigrations(): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try{ @@ -195,7 +195,7 @@ public function clearCache(): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { diff --git a/Http/Controllers/Backend/Settings/UserSettingController.php b/Http/Controllers/Backend/Settings/UserSettingController.php index cd874d517..2b0b4c4e5 100644 --- a/Http/Controllers/Backend/Settings/UserSettingController.php +++ b/Http/Controllers/Backend/Settings/UserSettingController.php @@ -21,7 +21,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -50,7 +50,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -89,7 +89,7 @@ public function storeCustomField(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -143,7 +143,7 @@ public function storeField(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { From fd92d3191112304a53596db52788f1f84470060b Mon Sep 17 00:00:00 2001 From: Alam Date: Thu, 11 Jan 2024 10:33:38 +0530 Subject: [PATCH 28/57] Updated: permission response in backup and settings --- Http/Controllers/Settings/BackupsController.php | 4 ++-- Http/Controllers/Settings/SettingsController.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Http/Controllers/Settings/BackupsController.php b/Http/Controllers/Settings/BackupsController.php index 0e280ebe8..69df1ce8a 100644 --- a/Http/Controllers/Settings/BackupsController.php +++ b/Http/Controllers/Settings/BackupsController.php @@ -27,7 +27,7 @@ public function getAssets(Request $request) $permission_slug = 'has-access-of-setting-section'; if(!\Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response['success'] = true; @@ -41,7 +41,7 @@ public function getList(Request $request) $permission_slug = 'has-access-of-setting-section'; if(!\Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = VaahBackup::create($request); diff --git a/Http/Controllers/Settings/SettingsController.php b/Http/Controllers/Settings/SettingsController.php index aac6fd95a..9b60ffd8c 100644 --- a/Http/Controllers/Settings/SettingsController.php +++ b/Http/Controllers/Settings/SettingsController.php @@ -24,7 +24,7 @@ public function index() $permission_slug = 'has-access-of-setting-section'; if(!\Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } return view($this->theme.'.pages.dashboard'); From 0b10c6c9050d1f75e1eedadde0e64acf79119ff2 Mon Sep 17 00:00:00 2001 From: Alam Date: Thu, 11 Jan 2024 10:39:35 +0530 Subject: [PATCH 29/57] Updated: advanced permission response --- .../Controllers/Backend/Advanced/BatchesController.php | 4 ++-- .../Backend/Advanced/FailedJobsController.php | 4 ++-- Http/Controllers/Backend/Advanced/JobsController.php | 4 ++-- Http/Controllers/Backend/Advanced/LogsController.php | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Http/Controllers/Backend/Advanced/BatchesController.php b/Http/Controllers/Backend/Advanced/BatchesController.php index 76b7530c9..53044ae8c 100644 --- a/Http/Controllers/Backend/Advanced/BatchesController.php +++ b/Http/Controllers/Backend/Advanced/BatchesController.php @@ -18,7 +18,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-advanced-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -70,7 +70,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-batches-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { diff --git a/Http/Controllers/Backend/Advanced/FailedJobsController.php b/Http/Controllers/Backend/Advanced/FailedJobsController.php index 1fd5b6df9..020e39867 100644 --- a/Http/Controllers/Backend/Advanced/FailedJobsController.php +++ b/Http/Controllers/Backend/Advanced/FailedJobsController.php @@ -19,7 +19,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-advanced-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -70,7 +70,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-failed-jobs-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { diff --git a/Http/Controllers/Backend/Advanced/JobsController.php b/Http/Controllers/Backend/Advanced/JobsController.php index 999b9fd58..f6a744d9c 100644 --- a/Http/Controllers/Backend/Advanced/JobsController.php +++ b/Http/Controllers/Backend/Advanced/JobsController.php @@ -18,7 +18,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-advanced-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -69,7 +69,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-jobs-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { diff --git a/Http/Controllers/Backend/Advanced/LogsController.php b/Http/Controllers/Backend/Advanced/LogsController.php index 24528fb94..7bfe10f34 100644 --- a/Http/Controllers/Backend/Advanced/LogsController.php +++ b/Http/Controllers/Backend/Advanced/LogsController.php @@ -21,7 +21,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-advanced-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -71,7 +71,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-logs-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -165,7 +165,7 @@ public function getItem(Request $request, $name): JsonResponse $permission_slug = 'has-access-of-advanced-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -230,7 +230,7 @@ public function downloadFile(Request $request, $file_name): BinaryFileResponse | $permission_slug = 'has-access-of-advanced-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -261,7 +261,7 @@ public function postActions(Request $request, $action): JsonResponse $permission_slug = 'has-access-of-advanced-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { From d62c411c0e0f495e9de200b89654b63102aad965 Mon Sep 17 00:00:00 2001 From: Vikram Chand Date: Sat, 6 Jan 2024 15:28:05 +0530 Subject: [PATCH 30/57] Updated: permission denied response --- Helpers/backend.php | 9 ++++++++- Http/Controllers/Backend/UsersController.php | 8 ++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Helpers/backend.php b/Helpers/backend.php index 638a2751f..58ab1f275 100644 --- a/Helpers/backend.php +++ b/Helpers/backend.php @@ -112,5 +112,12 @@ function vh_get_backend_file($file_path) return vh_get_backend_theme_url()."/".$file_path; } //----------------------------------------------------------------------------------- - +function vh_get_permission_denied_response($permission_slug){ + $response['success'] = false; + $response['errors'][] = trans("vaahcms::messages.permission_denied"); + if(env('APP_DEBUG')){ + $response['hint'][] = 'You don\'t have "'.$permission_slug.'" permission.'; + } + return $response; +} //----------------------------------------------------------------------------------- diff --git a/Http/Controllers/Backend/UsersController.php b/Http/Controllers/Backend/UsersController.php index 10318f27b..d413cdfc8 100644 --- a/Http/Controllers/Backend/UsersController.php +++ b/Http/Controllers/Backend/UsersController.php @@ -203,11 +203,11 @@ public function deleteList(Request $request): JsonResponse //---------------------------------------------------------- public function createItem(Request $request): JsonResponse { - if(!Auth::user()->hasPermission('can-create-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); - return response()->json($response); + $permission_slug = 'can-create-user'; + + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response($permission_slug)); } try { From af70ec4ac1639ac5a7559da5cdac83298520b410 Mon Sep 17 00:00:00 2001 From: Alam Date: Sat, 6 Jan 2024 16:26:35 +0530 Subject: [PATCH 31/57] Updated: registrations permission denied response --- .../Backend/RegistrationsController.php | 97 ++++++++----------- 1 file changed, 40 insertions(+), 57 deletions(-) diff --git a/Http/Controllers/Backend/RegistrationsController.php b/Http/Controllers/Backend/RegistrationsController.php index d4503412a..4a3eccf6e 100644 --- a/Http/Controllers/Backend/RegistrationsController.php +++ b/Http/Controllers/Backend/RegistrationsController.php @@ -20,11 +20,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-registrations-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-registrations-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response($permission_slug)); } try { @@ -93,11 +92,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-registrations-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-registrations-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response($permission_slug)); } try { @@ -119,11 +117,11 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function updateList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-registrations')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - return response()->json($response); + $permission_slug = 'can-update-registrations'; + + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response($permission_slug)); } try { @@ -145,13 +143,11 @@ public function updateList(Request $request): JsonResponse //---------------------------------------------------------- public function listAction(Request $request, $type): JsonResponse { - if (!Auth::user()->hasPermission('can-update-registrations') || - !Auth::user()->hasPermission('can-manage-registrations') - ) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - return response()->json($response); + if(!Auth::user()->hasPermission('can-update-registrations')) { + return response()->json(vh_get_permission_denied_response('can-update-registrations')); + } elseif(!Auth::user()->hasPermission('can-manage-registrations')) { + return response()->json(vh_get_permission_denied_response('can-manage-registrations')); } try { @@ -173,13 +169,11 @@ public function listAction(Request $request, $type): JsonResponse //---------------------------------------------------------- public function deleteList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-registrations') || - !Auth::user()->hasPermission('can-delete-registrations')) - { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - return response()->json($response); + if(!Auth::user()->hasPermission('can-update-registrations')) { + return response()->json(vh_get_permission_denied_response('can-update-registrations')); + } elseif(!Auth::user()->hasPermission('can-delete-registrations')) { + return response()->json(vh_get_permission_denied_response('can-delete-registrations')); } try { @@ -201,12 +195,11 @@ public function deleteList(Request $request): JsonResponse //---------------------------------------------------------- public function createItem(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-create-registrations')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-create-registrations'; - return response()->json($response); - } + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response($permission_slug)); + } try { $response = Registration::createItem($request); @@ -227,12 +220,11 @@ public function createItem(Request $request): JsonResponse //---------------------------------------------------------- public function getItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-read-registrations')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-read-registrations'; - return response()->json($response); - } + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response($permission_slug)); + } try { $response = Registration::getItem($id); @@ -253,12 +245,10 @@ public function getItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function updateItem(Request $request ,$id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-registrations')) - { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-registrations'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response($permission_slug)); } try { @@ -280,13 +270,10 @@ public function updateItem(Request $request ,$id): JsonResponse //---------------------------------------------------------- public function deleteItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-registrations') || - !Auth::user()->hasPermission('can-delete-registrations') - ) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission('can-update-registrations')) { + return response()->json(vh_get_permission_denied_response('can-update-registrations')); + } elseif(!Auth::user()->hasPermission('can-delete-registrations')) { + return response()->json(vh_get_permission_denied_response('can-delete-registrations')); } try { @@ -308,13 +295,10 @@ public function deleteItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function itemAction(Request $request, $id, $action): JsonResponse { - if (!Auth::user()->hasPermission('can-update-registrations') || - !Auth::user()->hasPermission('can-manage-registrations') - ) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission('can-update-registrations')) { + return response()->json(vh_get_permission_denied_response('can-update-registrations')); + } elseif(!Auth::user()->hasPermission('can-manage-registrations')) { + return response()->json(vh_get_permission_denied_response('can-manage-registrations')); } try { @@ -355,11 +339,10 @@ public function sendVerificationEmail(Request $request,$id): JsonResponse //---------------------------------------------------------- public function createUser(Request $request,$id): JsonResponse { - if (!Auth::user()->hasPermission('can-create-users-from-registrations')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-create-users-from-registrations'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response($permission_slug)); } try { From 5990e45f9b40ab4457889e1534f3ee7225b16fb3 Mon Sep 17 00:00:00 2001 From: Vikram Chand Date: Sat, 6 Jan 2024 16:46:10 +0530 Subject: [PATCH 32/57] Updated: haspermission param --- Helpers/backend.php | 7 +++++-- Http/Controllers/Backend/RegistrationsController.php | 8 ++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Helpers/backend.php b/Helpers/backend.php index 58ab1f275..8ff9dfb99 100644 --- a/Helpers/backend.php +++ b/Helpers/backend.php @@ -112,11 +112,14 @@ function vh_get_backend_file($file_path) return vh_get_backend_theme_url()."/".$file_path; } //----------------------------------------------------------------------------------- -function vh_get_permission_denied_response($permission_slug){ +function vh_get_permission_denied_response($permission_slugs){ $response['success'] = false; + + $text = implode(', ',$permission_slugs); + $response['errors'][] = trans("vaahcms::messages.permission_denied"); if(env('APP_DEBUG')){ - $response['hint'][] = 'You don\'t have "'.$permission_slug.'" permission.'; + $response['hint'][] = 'You don\'t have "'.$text.'" permission.'; } return $response; } diff --git a/Http/Controllers/Backend/RegistrationsController.php b/Http/Controllers/Backend/RegistrationsController.php index 4a3eccf6e..8811a806e 100644 --- a/Http/Controllers/Backend/RegistrationsController.php +++ b/Http/Controllers/Backend/RegistrationsController.php @@ -143,11 +143,11 @@ public function updateList(Request $request): JsonResponse //---------------------------------------------------------- public function listAction(Request $request, $type): JsonResponse { + $permission_slugs = ['can-update-registrations','can-manage-registrations']; - if(!Auth::user()->hasPermission('can-update-registrations')) { - return response()->json(vh_get_permission_denied_response('can-update-registrations')); - } elseif(!Auth::user()->hasPermission('can-manage-registrations')) { - return response()->json(vh_get_permission_denied_response('can-manage-registrations')); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { From cd2e02131aaaff987e6ce4b5912d35c84cb399d5 Mon Sep 17 00:00:00 2001 From: Alam Date: Sat, 6 Jan 2024 17:27:15 +0530 Subject: [PATCH 33/57] Updated: users permission denied response --- Http/Controllers/Backend/UsersController.php | 138 ++++++++----------- 1 file changed, 57 insertions(+), 81 deletions(-) diff --git a/Http/Controllers/Backend/UsersController.php b/Http/Controllers/Backend/UsersController.php index d413cdfc8..5669914ed 100644 --- a/Http/Controllers/Backend/UsersController.php +++ b/Http/Controllers/Backend/UsersController.php @@ -20,11 +20,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-users-section')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slug = 'has-access-of-users-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -107,11 +106,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-users-section')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slug = 'has-access-of-users-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -132,11 +130,10 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function updateList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slug = 'can-update-users'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -158,11 +155,10 @@ public function updateList(Request $request): JsonResponse //---------------------------------------------------------- public function listAction(Request $request, $type): JsonResponse { - if (!Auth::user()->hasPermission('can-update-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slug = 'can-update-users'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -207,7 +203,7 @@ public function createItem(Request $request): JsonResponse $permission_slug = 'can-create-user'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response($permission_slug)); + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -229,11 +225,10 @@ public function createItem(Request $request): JsonResponse //---------------------------------------------------------- public function getItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-read-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slug = 'can-read-users'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -255,11 +250,10 @@ public function getItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function updateItem(Request $request,$id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slug = 'can-update-users'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -291,13 +285,11 @@ public function updateItem(Request $request,$id): JsonResponse //---------------------------------------------------------- public function deleteItem(Request $request,$id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-users') || - !Auth::user()->hasPermission('can-delete-users') - ) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slugs = ['can-update-users','can-delete-users']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -327,13 +319,11 @@ public function deleteItem(Request $request,$id): JsonResponse //---------------------------------------------------------- public function itemAction(Request $request,$id,$action): JsonResponse { - if(!Auth::user()->hasPermission('can-manage-users') && - !Auth::user()->hasPermission('can-update-users') - ) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slugs = ['can-manage-users','can-update-users']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) && + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -365,11 +355,10 @@ public function itemAction(Request $request,$id,$action): JsonResponse //---------------------------------------------------------- public function getItemRoles(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-read-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slug = 'can-read-users'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -448,13 +437,11 @@ public function postActions(Request $request, $action) : JsonResponse //------------------------------------ case 'bulk-change-status': - if (!Auth::user()->hasPermission('can-manage-users') && - !Auth::user()->hasPermission('can-update-users') - ) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slugs = ['can-manage-users','can-update-users']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) && + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } $response = User::bulkStatusChange($request); @@ -463,11 +450,10 @@ public function postActions(Request $request, $action) : JsonResponse //------------------------------------ case 'bulk-trash': - if (!Auth::user()->hasPermission('can-update-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slug = 'can-update-users'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = User::bulkTrash($request); @@ -476,11 +462,10 @@ public function postActions(Request $request, $action) : JsonResponse //------------------------------------ case 'bulk-restore': - if (!Auth::user()->hasPermission('can-update-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slug = 'can-update-users'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = User::bulkRestore($request); @@ -489,13 +474,11 @@ public function postActions(Request $request, $action) : JsonResponse //------------------------------------ case 'bulk-delete': - if (!Auth::user()->hasPermission('can-update-users') || - !Auth::user()->hasPermission('can-delete-users') - ) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slugs = ['can-update-users','can-delete-users']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } $response = User::bulkDelete($request); @@ -504,13 +487,11 @@ public function postActions(Request $request, $action) : JsonResponse //------------------------------------ case 'toggle-role-active-status': - if (!Auth::user()->hasPermission('can-manage-users') && - !Auth::user()->hasPermission('can-update-users') - ) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slugs = ['can-manage-users','can-update-users']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) && + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } $response = User::bulkChangeRoleStatus($request); @@ -559,11 +540,10 @@ public function getProfile(Request $request): JsonResponse //---------------------------------------------------------- public function storeAvatar(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); + $permission_slug = 'can-update-users'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -600,12 +580,10 @@ public function storeAvatar(Request $request): JsonResponse //---------------------------------------------------------- public function removeAvatar(Request $request) { + $permission_slug = 'can-update-users'; - if (!Auth::user()->hasPermission('can-update-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -723,12 +701,10 @@ public function removeProfileAvatar(Request $request): JsonResponse //---------------------------------------------------------- public function impersonate(Request $request, $uuid): JsonResponse { + $permission_slug = 'can-impersonate-users'; - if (!Auth::user()->hasPermission('can-impersonate-users')) { - $response['success'] = false; - $response['errors'][] = trans('vaahcms-general.permission_denied'); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { From 5f2915092b9691f007732261223150a6eb12a8f6 Mon Sep 17 00:00:00 2001 From: Alam Date: Sat, 6 Jan 2024 17:36:02 +0530 Subject: [PATCH 34/57] Updated: all haspermission param --- .../Backend/RegistrationsController.php | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/Http/Controllers/Backend/RegistrationsController.php b/Http/Controllers/Backend/RegistrationsController.php index 8811a806e..5a3364537 100644 --- a/Http/Controllers/Backend/RegistrationsController.php +++ b/Http/Controllers/Backend/RegistrationsController.php @@ -23,7 +23,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-registrations-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response($permission_slug)); + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -95,7 +95,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-registrations-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response($permission_slug)); + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -121,7 +121,7 @@ public function updateList(Request $request): JsonResponse $permission_slug = 'can-update-registrations'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response($permission_slug)); + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -169,11 +169,11 @@ public function listAction(Request $request, $type): JsonResponse //---------------------------------------------------------- public function deleteList(Request $request): JsonResponse { + $permission_slugs = ['can-update-registrations','can-delete-registrations']; - if(!Auth::user()->hasPermission('can-update-registrations')) { - return response()->json(vh_get_permission_denied_response('can-update-registrations')); - } elseif(!Auth::user()->hasPermission('can-delete-registrations')) { - return response()->json(vh_get_permission_denied_response('can-delete-registrations')); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -198,7 +198,7 @@ public function createItem(Request $request): JsonResponse $permission_slug = 'can-create-registrations'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response($permission_slug)); + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -223,7 +223,7 @@ public function getItem(Request $request, $id): JsonResponse $permission_slug = 'can-read-registrations'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response($permission_slug)); + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -248,7 +248,7 @@ public function updateItem(Request $request ,$id): JsonResponse $permission_slug = 'can-update-registrations'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response($permission_slug)); + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -270,10 +270,11 @@ public function updateItem(Request $request ,$id): JsonResponse //---------------------------------------------------------- public function deleteItem(Request $request, $id): JsonResponse { - if(!Auth::user()->hasPermission('can-update-registrations')) { - return response()->json(vh_get_permission_denied_response('can-update-registrations')); - } elseif(!Auth::user()->hasPermission('can-delete-registrations')) { - return response()->json(vh_get_permission_denied_response('can-delete-registrations')); + $permission_slugs = ['can-update-registrations','can-delete-registrations']; + + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -295,10 +296,11 @@ public function deleteItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function itemAction(Request $request, $id, $action): JsonResponse { - if(!Auth::user()->hasPermission('can-update-registrations')) { - return response()->json(vh_get_permission_denied_response('can-update-registrations')); - } elseif(!Auth::user()->hasPermission('can-manage-registrations')) { - return response()->json(vh_get_permission_denied_response('can-manage-registrations')); + $permission_slugs = ['can-update-registrations','can-manage-registrations']; + + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -342,7 +344,7 @@ public function createUser(Request $request,$id): JsonResponse $permission_slug = 'can-create-users-from-registrations'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response($permission_slug)); + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { From d9ede0d0fb4640db48e964a78d2ad7bbdb9d050d Mon Sep 17 00:00:00 2001 From: Alam Date: Sat, 6 Jan 2024 17:56:11 +0530 Subject: [PATCH 35/57] Updated: permission denied response in roles --- Http/Controllers/Backend/RolesController.php | 90 +++++++++----------- 1 file changed, 38 insertions(+), 52 deletions(-) diff --git a/Http/Controllers/Backend/RolesController.php b/Http/Controllers/Backend/RolesController.php index 7b450c21f..7004ebf54 100644 --- a/Http/Controllers/Backend/RolesController.php +++ b/Http/Controllers/Backend/RolesController.php @@ -17,11 +17,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-roles-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-roles-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -76,11 +75,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-roles-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-roles-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -102,11 +100,10 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function updateList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-roles')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-roles'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -128,13 +125,11 @@ public function updateList(Request $request): JsonResponse //---------------------------------------------------------- public function listAction(Request $request, $type): JsonResponse { - if (!Auth::user()->hasPermission('can-update-roles') || - !Auth::user()->hasPermission('can-manage-roles') - ) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slugs = ['can-update-roles','can-manage-roles']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -156,11 +151,10 @@ public function listAction(Request $request, $type): JsonResponse //---------------------------------------------------------- public function deleteList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-delete-roles')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-delete-roles'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -182,11 +176,10 @@ public function deleteList(Request $request): JsonResponse //---------------------------------------------------------- public function createItem(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-create-roles')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-create-roles'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -208,11 +201,10 @@ public function createItem(Request $request): JsonResponse //---------------------------------------------------------- public function getItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-read-roles')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-read-roles'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -234,11 +226,10 @@ public function getItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function updateItem(Request $request,$id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-roles')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-roles'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -260,11 +251,10 @@ public function updateItem(Request $request,$id): JsonResponse //---------------------------------------------------------- public function deleteItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-delete-roles')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-delete-roles'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -286,13 +276,11 @@ public function deleteItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function itemAction(Request $request, $id, $action): JsonResponse { - if (!Auth::user()->hasPermission('can-manage-roles') || - !Auth::user()->hasPermission('can-update-roles') - ) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slugs = ['can-manage-roles','can-update-roles']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -314,11 +302,10 @@ public function itemAction(Request $request, $id, $action): JsonResponse //---------------------------------------------------------- public function getItemPermission(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-read-roles')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-read-roles'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -340,11 +327,10 @@ public function getItemPermission(Request $request, $id): JsonResponse //---------------------------------------------------------- public function getItemUser(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-read-roles')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-read-roles'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { From d1807fb37635773ba8c7fb4ea2daae10051e4098 Mon Sep 17 00:00:00 2001 From: Alam Date: Sat, 6 Jan 2024 18:09:10 +0530 Subject: [PATCH 36/57] Updated: permission denied response in permissions --- .../Backend/PermissionsController.php | 72 ++++++++----------- 1 file changed, 31 insertions(+), 41 deletions(-) diff --git a/Http/Controllers/Backend/PermissionsController.php b/Http/Controllers/Backend/PermissionsController.php index d3b3ee926..4e744928d 100644 --- a/Http/Controllers/Backend/PermissionsController.php +++ b/Http/Controllers/Backend/PermissionsController.php @@ -18,12 +18,12 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-permissions-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-permissions-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } + try { $data = []; @@ -69,13 +69,11 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-permissions-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-permissions-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } - try { $response = Permission::getList($request); } catch (\Exception $e) { @@ -95,11 +93,10 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function updateList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-permissions')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-permissions'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -121,11 +118,10 @@ public function updateList(Request $request): JsonResponse //---------------------------------------------------------- public function listAction(Request $request, $type): JsonResponse { - if (!Auth::user()->hasPermission('can-update-permissions')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-permissions'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -147,11 +143,10 @@ public function listAction(Request $request, $type): JsonResponse //---------------------------------------------------------- public function deleteList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-permissions')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-permissions'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -173,11 +168,10 @@ public function deleteList(Request $request): JsonResponse //---------------------------------------------------------- public function getItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-permissions')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-permissions'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -199,11 +193,10 @@ public function getItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function updateItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-permissions')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-permissions'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -225,11 +218,10 @@ public function updateItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function deleteItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-permissions')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-permissions'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -251,11 +243,10 @@ public function deleteItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function itemAction(Request $request, $id, $action): JsonResponse { - if (!Auth::user()->hasPermission('can-update-permissions')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-permissions'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -277,11 +268,10 @@ public function itemAction(Request $request, $id, $action): JsonResponse //---------------------------------------------------------- public function getItemRoles(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-permissions')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-permissions'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { From c8ce3b0232ee57cc212beb18b24a83e721b7061c Mon Sep 17 00:00:00 2001 From: Alam Date: Sat, 6 Jan 2024 18:52:28 +0530 Subject: [PATCH 37/57] Updated: permission denied response in modules --- Helpers/backend.php | 2 +- .../Controllers/Backend/ModulesController.php | 99 ++++++++----------- 2 files changed, 44 insertions(+), 57 deletions(-) diff --git a/Helpers/backend.php b/Helpers/backend.php index 8ff9dfb99..7fd9efa90 100644 --- a/Helpers/backend.php +++ b/Helpers/backend.php @@ -117,7 +117,7 @@ function vh_get_permission_denied_response($permission_slugs){ $text = implode(', ',$permission_slugs); - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $response['errors'][] = trans("vaahcms-general.permission_denied"); if(env('APP_DEBUG')){ $response['hint'][] = 'You don\'t have "'.$text.'" permission.'; } diff --git a/Http/Controllers/Backend/ModulesController.php b/Http/Controllers/Backend/ModulesController.php index 749314567..89154f114 100644 --- a/Http/Controllers/Backend/ModulesController.php +++ b/Http/Controllers/Backend/ModulesController.php @@ -21,11 +21,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-module-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-module-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -54,11 +53,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-module-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-module-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -126,11 +124,10 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function getItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-read-module')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-read-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -152,11 +149,10 @@ public function getItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function download(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-install-module')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-install-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -192,11 +188,10 @@ public function download(Request $request): JsonResponse //---------------------------------------------------------- public function installUpdates(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-module')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -276,74 +271,68 @@ public function actions(Request $request, $id, $action): JsonResponse { //--------------------------------------- case 'activate': - if (!Auth::user()->hasPermission('can-activate-module')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-activate-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Module::activateItem($module->slug); break; //--------------------------------------- case 'deactivate': - if (!\Auth::user()->hasPermission('can-deactivate-module')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-deactivate-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Module::deactivateItem($module->slug); break; //--------------------------------------- case 'refresh_migrations': - if (!Auth::user()->hasPermission('can-activate-module')) { - $response['success'] = false; - $response['messages'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-activate-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Module::refreshMigrations($module->slug); break; //--------------------------------------- case 'run_migrations': - if (!Auth::user()->hasPermission('can-activate-module')) { - $response['success'] = false; - $response['messages'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-activate-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Module::runMigrations($module->slug); break; //--------------------------------------- case 'run_seeds': - if (!Auth::user()->hasPermission('can-activate-module')) { - $response['success'] = false; - $response['messages'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-activate-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Module::runSeeds($module->slug); break; //--------------------------------------- case 'import_sample_data': - if (!\Auth::user()->hasPermission('can-import-sample-data-in-module')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-import-sample-data-in-module'; - return response()->json($response); + if(!\Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Module::importSampleData($module->slug); break; //--------------------------------------- case 'delete': - if (!Auth::user()->hasPermission('can-delete-module')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-delete-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } + $response = Module::deleteItem($module->slug); break; //--------------------------------------- @@ -416,11 +405,10 @@ public function getModulesSlugs(Request $request): JsonResponse //---------------------------------------------------------- public function updateModuleVersions(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-module')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -457,11 +445,10 @@ public function updateModuleVersions(Request $request): JsonResponse //---------------------------------------------------------- public function storeUpdates(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-module')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-module'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { From 53c0ed5fe5c48cbf42592408d223e4fe626bdcea Mon Sep 17 00:00:00 2001 From: Alam Date: Mon, 8 Jan 2024 10:55:05 +0530 Subject: [PATCH 38/57] Updated: media permission denied response --- Http/Controllers/Backend/MediaController.php | 77 +++++++++----------- 1 file changed, 33 insertions(+), 44 deletions(-) diff --git a/Http/Controllers/Backend/MediaController.php b/Http/Controllers/Backend/MediaController.php index a7202ca5a..e40489696 100644 --- a/Http/Controllers/Backend/MediaController.php +++ b/Http/Controllers/Backend/MediaController.php @@ -19,11 +19,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-media-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-media-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -83,11 +82,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-media-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-media-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -109,11 +107,10 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function updateList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-media')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-media'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -135,15 +132,14 @@ public function updateList(Request $request): JsonResponse //---------------------------------------------------------- public function listAction(Request $request, $type): JsonResponse { - if (!Auth::user()->hasPermission('can-update-media') || - !Auth::user()->hasPermission('can-manage-media') - ) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slugs = ['can-update-media','can-manage-media']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } + try { $response = Media::listAction($request, $type); } catch (\Exception $e) { @@ -163,11 +159,10 @@ public function listAction(Request $request, $type): JsonResponse //---------------------------------------------------------- public function deleteList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-delete-media')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-delete-media'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -189,11 +184,10 @@ public function deleteList(Request $request): JsonResponse //---------------------------------------------------------- public function getItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-read-media')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-read-media'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -215,11 +209,10 @@ public function getItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function updateItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-media')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-media'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -241,11 +234,10 @@ public function updateItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function deleteItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-media')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-media'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -267,13 +259,11 @@ public function deleteItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function itemAction(Request $request, $id, $action): JsonResponse { - if (!Auth::user()->hasPermission('can-update-media') || - !Auth::user()->hasPermission('can-manage-media') - ) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slugs = ['can-update-media','can-manage-media']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -426,11 +416,10 @@ public function upload(Request $request): JsonResponse //---------------------------------------------------------- public function postCreate(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-create-media')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-create-media'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { From db1143a8d4909a94cc53e1cb35e39100a7bb3218 Mon Sep 17 00:00:00 2001 From: Alam Date: Mon, 8 Jan 2024 11:23:21 +0530 Subject: [PATCH 39/57] Updated: taxonomies permission denied response --- .../Backend/TaxonomiesController.php | 108 ++++++++---------- 1 file changed, 46 insertions(+), 62 deletions(-) diff --git a/Http/Controllers/Backend/TaxonomiesController.php b/Http/Controllers/Backend/TaxonomiesController.php index 0ada84d6b..a4c9415ba 100644 --- a/Http/Controllers/Backend/TaxonomiesController.php +++ b/Http/Controllers/Backend/TaxonomiesController.php @@ -18,11 +18,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-taxonomies-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-taxonomies-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -82,11 +81,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-taxonomies-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-taxonomies-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -108,13 +106,11 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function updateList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-taxonomies') || - !Auth::user()->hasPermission('can-manage-taxonomies') - ) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slugs = ['can-update-taxonomies','can-manage-taxonomies']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -136,13 +132,11 @@ public function updateList(Request $request): JsonResponse //---------------------------------------------------------- public function listAction(Request $request, $type): JsonResponse { - if (!Auth::user()->hasPermission('can-update-taxonomies') || - !Auth::user()->hasPermission('can-manage-taxonomies') - ) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slugs = ['can-update-taxonomies','can-manage-taxonomies']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -164,11 +158,10 @@ public function listAction(Request $request, $type): JsonResponse //---------------------------------------------------------- public function deleteList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-delete-taxonomies')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-delete-taxonomies'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -190,11 +183,10 @@ public function deleteList(Request $request): JsonResponse //---------------------------------------------------------- public function createItem(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-create-taxonomies')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-create-taxonomies'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -216,11 +208,10 @@ public function createItem(Request $request): JsonResponse //---------------------------------------------------------- public function getItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-read-taxonomies')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-read-taxonomies'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -266,11 +257,10 @@ public function getListByTypeId(Request $request, $id): JsonResponse //---------------------------------------------------------- public function updateItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-update-taxonomies')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-taxonomies'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -292,11 +282,10 @@ public function updateItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function deleteItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-delete-taxonomies')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-delete-taxonomies'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -318,13 +307,11 @@ public function deleteItem(Request $request, $id): JsonResponse //---------------------------------------------------------- public function itemAction(Request $request, $id, $action): JsonResponse { - if (!Auth::user()->hasPermission('can-update-taxonomies') || - !Auth::user()->hasPermission('can-manage-taxonomies') - ) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slugs = ['can-update-taxonomies','can-manage-taxonomies']; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slugs[0]) || + !Auth::user()->hasPermission($permission_slugs[1])) { + return response()->json(vh_get_permission_denied_response($permission_slugs)); } try { @@ -346,11 +333,10 @@ public function itemAction(Request $request, $id, $action): JsonResponse //---------------------------------------------------------- public function createTaxonomyType(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-manage-taxonomy-type')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-manage-taxonomy-type'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -395,11 +381,10 @@ public function createTaxonomyType(Request $request): JsonResponse //---------------------------------------------------------- public function deleteTaxonomyType(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-manage-taxonomy-type')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-manage-taxonomy-type'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -449,11 +434,10 @@ public function deletechildrens($types) //---------------------------------------------------------- public function updateTaxonomyType(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-manage-taxonomy-type')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-manage-taxonomy-type'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -513,13 +497,13 @@ public function updateTaxonomyType(Request $request): JsonResponse //---------------------------------------------------------- public function updateTaxonomyTypePosition(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-manage-taxonomy-type')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-manage-taxonomy-type'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } + try { $parent_id = null; From 7a75fdab6222caf4be3e7afd7749cc7e430f7ad8 Mon Sep 17 00:00:00 2001 From: Alam Date: Mon, 8 Jan 2024 11:40:20 +0530 Subject: [PATCH 40/57] Updated: themes permission denied response --- Http/Controllers/Backend/ThemesController.php | 99 ++++++++----------- 1 file changed, 42 insertions(+), 57 deletions(-) diff --git a/Http/Controllers/Backend/ThemesController.php b/Http/Controllers/Backend/ThemesController.php index 5ce591621..616d16f66 100644 --- a/Http/Controllers/Backend/ThemesController.php +++ b/Http/Controllers/Backend/ThemesController.php @@ -21,12 +21,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { + $permission_slug = 'has-access-of-theme-section'; - if (!Auth::user()->hasPermission('has-access-of-theme-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -55,11 +53,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-theme-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-theme-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -123,11 +120,10 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function download(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-install-theme')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-install-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -163,11 +159,10 @@ public function download(Request $request): JsonResponse //---------------------------------------------------------- public function installUpdates(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-theme')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -245,81 +240,73 @@ public function actions(Request $request,$id,$action): JsonResponse { //--------------------------------------- case 'activate': - if (!Auth::user()->hasPermission('can-activate-theme')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-activate-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Theme::activateItem($theme->slug); break; //--------------------------------------- case 'make_default': - if (!Auth::user()->hasPermission('can-activate-theme')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-activate-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Theme::makeItemAsDefault($theme->slug); break; //--------------------------------------- case 'refresh_migrations': - if (!Auth::user()->hasPermission('can-activate-theme')) { - $response['success'] = false; - $response['messages'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-activate-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Theme::refreshMigrations($theme->slug); break; //--------------------------------------- case 'run_migrations': - if (!Auth::user()->hasPermission('can-activate-theme')) { - $response['success'] = false; - $response['messages'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-activate-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Theme::runMigrations($theme->slug); break; //--------------------------------------- case 'run_seeds': - if (!Auth::user()->hasPermission('can-activate-theme')) { - $response['success'] = false; - $response['messages'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-activate-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Theme::runSeeds($theme->slug); break; //--------------------------------------- case 'deactivate': - if (!Auth::user()->hasPermission('can-deactivate-theme')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-deactivate-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Theme::deactivateItem($theme->slug); break; //--------------------------------------- case 'import_sample_data': - if (!Auth::user()->hasPermission('can-import-sample-data-in-theme')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-import-sample-data-in-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Theme::importSampleData($theme->slug); break; //--------------------------------------- case 'delete': - if (!Auth::user()->hasPermission('can-delete-theme')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-delete-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = Theme::deleteItem($theme->slug); break; @@ -344,11 +331,10 @@ public function actions(Request $request,$id,$action): JsonResponse //---------------------------------------------------------- public function storeUpdates(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('can-update-theme')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-update-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -384,11 +370,10 @@ public function storeUpdates(Request $request): JsonResponse //---------------------------------------------------------- public function deleteItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-delete-theme')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-delete-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { From cf3fc2e6468eb6fdd36cd4a8bc3a778f0b999c25 Mon Sep 17 00:00:00 2001 From: Alam Date: Mon, 8 Jan 2024 11:50:10 +0530 Subject: [PATCH 41/57] Updated: advanced permission denied response --- .../Backend/Advanced/BatchesController.php | 14 ++++---- .../Backend/Advanced/FailedJobsController.php | 15 ++++---- .../Backend/Advanced/JobsController.php | 14 ++++---- .../Backend/Advanced/LogsController.php | 36 ++++++++----------- 4 files changed, 34 insertions(+), 45 deletions(-) diff --git a/Http/Controllers/Backend/Advanced/BatchesController.php b/Http/Controllers/Backend/Advanced/BatchesController.php index ee34dd8d7..76b7530c9 100644 --- a/Http/Controllers/Backend/Advanced/BatchesController.php +++ b/Http/Controllers/Backend/Advanced/BatchesController.php @@ -15,11 +15,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-advanced-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-advanced-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -68,11 +67,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-batches-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-batches-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { diff --git a/Http/Controllers/Backend/Advanced/FailedJobsController.php b/Http/Controllers/Backend/Advanced/FailedJobsController.php index 4d9e9816d..1fd5b6df9 100644 --- a/Http/Controllers/Backend/Advanced/FailedJobsController.php +++ b/Http/Controllers/Backend/Advanced/FailedJobsController.php @@ -16,11 +16,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-advanced-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-advanced-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -68,12 +67,12 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-failed-jobs-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-failed-jobs-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } + try { $response = FailedJob::getList($request); } catch (\Exception $e) { diff --git a/Http/Controllers/Backend/Advanced/JobsController.php b/Http/Controllers/Backend/Advanced/JobsController.php index b9ef40133..999b9fd58 100644 --- a/Http/Controllers/Backend/Advanced/JobsController.php +++ b/Http/Controllers/Backend/Advanced/JobsController.php @@ -15,11 +15,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-advanced-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-advanced-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -67,11 +66,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-jobs-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-jobs-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { diff --git a/Http/Controllers/Backend/Advanced/LogsController.php b/Http/Controllers/Backend/Advanced/LogsController.php index 2a88cc8c5..24528fb94 100644 --- a/Http/Controllers/Backend/Advanced/LogsController.php +++ b/Http/Controllers/Backend/Advanced/LogsController.php @@ -18,11 +18,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-advanced-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-advanced-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -69,11 +68,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-logs-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-logs-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -164,11 +162,10 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function getItem(Request $request, $name): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-advanced-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-advanced-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -230,11 +227,10 @@ public function getItem(Request $request, $name): JsonResponse //---------------------------------------------------------- public function downloadFile(Request $request, $file_name): BinaryFileResponse | string | JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-advanced-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-advanced-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -262,12 +258,10 @@ public function downloadFile(Request $request, $file_name): BinaryFileResponse | //---------------------------------------------------------- public function postActions(Request $request, $action): JsonResponse { + $permission_slug = 'has-access-of-advanced-section'; - if (!Auth::user()->hasPermission('has-access-of-advanced-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { From 9ca07d99fce5d3c3df07cd03672de0f01089a62e Mon Sep 17 00:00:00 2001 From: Alam Date: Mon, 8 Jan 2024 12:08:38 +0530 Subject: [PATCH 42/57] Updated settings permission denied response --- .../Backend/Settings/EnvController.php | 30 ++++----- .../Backend/Settings/GeneralController.php | 42 +++++------- .../Settings/LocalizationController.php | 50 ++++++-------- .../Settings/NotificationsController.php | 67 +++++++++---------- .../Backend/Settings/UpdateController.php | 38 +++++------ .../Settings/UserSettingController.php | 30 ++++----- 6 files changed, 108 insertions(+), 149 deletions(-) diff --git a/Http/Controllers/Backend/Settings/EnvController.php b/Http/Controllers/Backend/Settings/EnvController.php index 0103c809f..d6bce300f 100644 --- a/Http/Controllers/Backend/Settings/EnvController.php +++ b/Http/Controllers/Backend/Settings/EnvController.php @@ -21,11 +21,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!\Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -57,12 +56,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { + $permission_slug = 'has-access-of-setting-section'; - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -90,12 +87,10 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function downloadFile(Request $request, $file_name): BinaryFileResponse | string { + $permission_slug = 'has-access-of-setting-section'; - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -121,11 +116,10 @@ public function downloadFile(Request $request, $file_name): BinaryFileResponse | //---------------------------------------------------------- public function store(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { diff --git a/Http/Controllers/Backend/Settings/GeneralController.php b/Http/Controllers/Backend/Settings/GeneralController.php index 839e66be6..71399be06 100644 --- a/Http/Controllers/Backend/Settings/GeneralController.php +++ b/Http/Controllers/Backend/Settings/GeneralController.php @@ -22,11 +22,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -63,11 +62,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -99,11 +97,10 @@ public function getList(Request $request): JsonResponse // ---------------------------------------------------------- public function storeSiteSettings(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -149,11 +146,10 @@ public function storeSiteSettings(Request $request): JsonResponse //---------------------------------------------------------- public function storeLinks(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -227,11 +223,10 @@ public function storeLinks(Request $request): JsonResponse //---------------------------------------------------------- public function storeMetaTags(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -288,11 +283,10 @@ public function storeMetaTags(Request $request): JsonResponse //---------------------------------------------------------- public function deleteMetaTags(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { diff --git a/Http/Controllers/Backend/Settings/LocalizationController.php b/Http/Controllers/Backend/Settings/LocalizationController.php index bda0821a1..71d6007ee 100644 --- a/Http/Controllers/Backend/Settings/LocalizationController.php +++ b/Http/Controllers/Backend/Settings/LocalizationController.php @@ -23,11 +23,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -63,12 +62,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { + $permission_slug = 'has-access-of-setting-section'; - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -90,11 +87,10 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function generateLanguage(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -119,11 +115,10 @@ public function generateLanguage(Request $request): JsonResponse //---------------------------------------------------------- public function postStore(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -145,11 +140,10 @@ public function postStore(Request $request): JsonResponse //---------------------------------------------------------- public function storeLanguage(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -172,11 +166,10 @@ public function storeLanguage(Request $request): JsonResponse //---------------------------------------------------------- public function storeCategory(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -199,11 +192,10 @@ public function storeCategory(Request $request): JsonResponse //---------------------------------------------------------- public function postActions(Request $request, $action): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { diff --git a/Http/Controllers/Backend/Settings/NotificationsController.php b/Http/Controllers/Backend/Settings/NotificationsController.php index 982d90d37..1b5ac8386 100644 --- a/Http/Controllers/Backend/Settings/NotificationsController.php +++ b/Http/Controllers/Backend/Settings/NotificationsController.php @@ -20,11 +20,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -57,12 +56,12 @@ public function getAssets(Request $request): JsonResponse public function getList(Request $request) { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } + try{ return Notification::getList($request); }catch (\Exception $e){ @@ -79,11 +78,10 @@ public function getList(Request $request) } public function getItemData(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -112,12 +110,12 @@ public function getItemData(Request $request): JsonResponse public function createItem(Request $request) { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; + + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); + } - return response()->json($response); - } try{ return Notification::createItem($request); }catch (\Exception $e){ @@ -135,11 +133,10 @@ public function createItem(Request $request) public function itemAction(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -161,11 +158,10 @@ public function itemAction(Request $request): JsonResponse //---------------------------------------------------------- public function listAction(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -187,11 +183,10 @@ public function listAction(Request $request): JsonResponse //---------------------------------------------------------- public function store(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -228,11 +223,10 @@ public function store(Request $request): JsonResponse //---------------------------------------------------------- public function send(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -271,11 +265,10 @@ public function send(Request $request): JsonResponse //---------------------------------------------------------- public function markAsRead(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { diff --git a/Http/Controllers/Backend/Settings/UpdateController.php b/Http/Controllers/Backend/Settings/UpdateController.php index 7a6f75fd4..3bb1023a0 100644 --- a/Http/Controllers/Backend/Settings/UpdateController.php +++ b/Http/Controllers/Backend/Settings/UpdateController.php @@ -24,11 +24,10 @@ public function __construct() //---------------------------------------------------------- public function storeUpdate(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -87,11 +86,10 @@ public function storeUpdate(Request $request): JsonResponse //---------------------------------------------------------- public function upgrade(): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -112,12 +110,10 @@ public function upgrade(): JsonResponse //---------------------------------------------------------- public function publish() { + $permission_slug = 'has-access-of-setting-section'; - if(!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -158,12 +154,10 @@ public function publish() //---------------------------------------------------------- public function runMigrations(): JsonResponse { + $permission_slug = 'has-access-of-setting-section'; - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try{ @@ -198,12 +192,10 @@ public function runMigrations(): JsonResponse //---------------------------------------------------------- public function clearCache(): JsonResponse { + $permission_slug = 'has-access-of-setting-section'; - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { diff --git a/Http/Controllers/Backend/Settings/UserSettingController.php b/Http/Controllers/Backend/Settings/UserSettingController.php index e874d7dc9..cd874d517 100644 --- a/Http/Controllers/Backend/Settings/UserSettingController.php +++ b/Http/Controllers/Backend/Settings/UserSettingController.php @@ -18,11 +18,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -48,12 +47,10 @@ public function getAssets(Request $request): JsonResponse //---------------------------------------------------------- public function getList(Request $request): JsonResponse { + $permission_slug = 'has-access-of-setting-section'; - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -89,11 +86,10 @@ public function getList(Request $request): JsonResponse //---------------------------------------------------------- public function storeCustomField(Request $request): JsonResponse { - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'has-access-of-setting-section'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { @@ -144,12 +140,10 @@ public function storeCustomField(Request $request): JsonResponse //---------------------------------------------------------- public function storeField(Request $request): JsonResponse { + $permission_slug = 'has-access-of-setting-section'; - if (!Auth::user()->hasPermission('has-access-of-setting-section')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { From 039e95fc972336d07c9b83f4cfe48cc263668ad8 Mon Sep 17 00:00:00 2001 From: Alam Date: Mon, 8 Jan 2024 12:12:58 +0530 Subject: [PATCH 43/57] Updated: permission denied response --- .../Controllers/Settings/BackupsController.php | 18 ++++++------------ .../Settings/SettingsController.php | 9 +++------ 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/Http/Controllers/Settings/BackupsController.php b/Http/Controllers/Settings/BackupsController.php index 9a32404eb..0e280ebe8 100644 --- a/Http/Controllers/Settings/BackupsController.php +++ b/Http/Controllers/Settings/BackupsController.php @@ -24,13 +24,10 @@ public function __construct() //---------------------------------------------------------- public function getAssets(Request $request) { + $permission_slug = 'has-access-of-setting-section'; - if(!\Auth::user()->hasPermission('has-access-of-setting-section')) - { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!\Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response['success'] = true; @@ -41,13 +38,10 @@ public function getAssets(Request $request) //---------------------------------------------------------- public function getList(Request $request) { + $permission_slug = 'has-access-of-setting-section'; - if(!\Auth::user()->hasPermission('has-access-of-setting-section')) - { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!\Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } $response = VaahBackup::create($request); diff --git a/Http/Controllers/Settings/SettingsController.php b/Http/Controllers/Settings/SettingsController.php index b0de6c371..aac6fd95a 100644 --- a/Http/Controllers/Settings/SettingsController.php +++ b/Http/Controllers/Settings/SettingsController.php @@ -21,13 +21,10 @@ public function __construct() //---------------------------------------------------------- public function index() { + $permission_slug = 'has-access-of-setting-section'; - if(!\Auth::user()->hasPermission('has-access-of-setting-section')) - { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); - - return response()->json($response); + if(!\Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } return view($this->theme.'.pages.dashboard'); From 07fd7408d61f9ea5aeeb92af77bf7e8e752cac3d Mon Sep 17 00:00:00 2001 From: Alam Date: Mon, 8 Jan 2024 13:08:51 +0530 Subject: [PATCH 44/57] Updated: theme controller --- Http/Controllers/Backend/ThemesController.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Http/Controllers/Backend/ThemesController.php b/Http/Controllers/Backend/ThemesController.php index 616d16f66..7b821bcd5 100644 --- a/Http/Controllers/Backend/ThemesController.php +++ b/Http/Controllers/Backend/ThemesController.php @@ -427,11 +427,10 @@ public function publishAssets(Request $request) //---------------------------------------------------------- public function getItem(Request $request, $id): JsonResponse { - if (!Auth::user()->hasPermission('can-read-module')) { - $response['success'] = false; - $response['errors'][] = trans("vaahcms::messages.permission_denied"); + $permission_slug = 'can-read-theme'; - return response()->json($response); + if(!Auth::user()->hasPermission($permission_slug)) { + return response()->json(vh_get_permission_denied_response([$permission_slug])); } try { From 88a3304aa4d3960c7cb90dc782c95053518babe7 Mon Sep 17 00:00:00 2001 From: Vikram Chand Date: Wed, 10 Jan 2024 14:02:42 +0530 Subject: [PATCH 45/57] Updated: permission denied response --- Helpers/backend.php | 5 +++-- .../Backend/RegistrationsController.php | 9 ++++----- Models/UserBase.php | 17 +++++++++++++++++ 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/Helpers/backend.php b/Helpers/backend.php index 7fd9efa90..5aff07011 100644 --- a/Helpers/backend.php +++ b/Helpers/backend.php @@ -112,7 +112,8 @@ function vh_get_backend_file($file_path) return vh_get_backend_theme_url()."/".$file_path; } //----------------------------------------------------------------------------------- -function vh_get_permission_denied_response($permission_slugs){ +function vh_get_permission_denied_json_response($permission_slugs){ + $response = []; $response['success'] = false; $text = implode(', ',$permission_slugs); @@ -121,6 +122,6 @@ function vh_get_permission_denied_response($permission_slugs){ if(env('APP_DEBUG')){ $response['hint'][] = 'You don\'t have "'.$text.'" permission.'; } - return $response; + return response()->json($response); } //----------------------------------------------------------------------------------- diff --git a/Http/Controllers/Backend/RegistrationsController.php b/Http/Controllers/Backend/RegistrationsController.php index 5a3364537..9f9812c50 100644 --- a/Http/Controllers/Backend/RegistrationsController.php +++ b/Http/Controllers/Backend/RegistrationsController.php @@ -23,7 +23,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-registrations-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -144,10 +144,9 @@ public function updateList(Request $request): JsonResponse public function listAction(Request $request, $type): JsonResponse { $permission_slugs = ['can-update-registrations','can-manage-registrations']; - - if(!Auth::user()->hasPermission($permission_slugs[0]) || - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return $permission_response; } try { diff --git a/Models/UserBase.php b/Models/UserBase.php index b14105b43..92dd5c4ca 100644 --- a/Models/UserBase.php +++ b/Models/UserBase.php @@ -1155,6 +1155,23 @@ public function hasPermission($permission_slug, $details=false) } + //------------------------------------------------- + public function hasPermissions($permission_slugs) + { + $permission_slugs_string = implode(', ',$permission_slugs); + + foreach($permission_slugs as $permission_slug){ + if(!Auth::user()->hasPermission($permission_slug)){ + return vh_get_permission_denied_json_response($permission_slugs_string); + } + } + + $response = []; + $response['success'] = true; + return $response; + + } + //------------------------------------------------- From abcad0f7d7d8f21e2eef18c3a82fda17eeddae53 Mon Sep 17 00:00:00 2001 From: Alam Date: Wed, 10 Jan 2024 17:33:18 +0530 Subject: [PATCH 46/57] Updated: permission denied response --- Helpers/backend.php | 11 +++++++---- Models/UserBase.php | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Helpers/backend.php b/Helpers/backend.php index 5aff07011..eb209aed8 100644 --- a/Helpers/backend.php +++ b/Helpers/backend.php @@ -113,15 +113,18 @@ function vh_get_backend_file($file_path) } //----------------------------------------------------------------------------------- function vh_get_permission_denied_json_response($permission_slugs){ + $response = vh_get_permission_denied_response($permission_slugs); + return response()->json($response); +} +//----------------------------------------------------------------------------------- +function vh_get_permission_denied_response($permission_slugs){ $response = []; $response['success'] = false; - $text = implode(', ',$permission_slugs); - $response['errors'][] = trans("vaahcms-general.permission_denied"); if(env('APP_DEBUG')){ - $response['hint'][] = 'You don\'t have "'.$text.'" permission.'; + $response['hint'][] = 'You don\'t have "'.$permission_slugs.'" permission.'; } - return response()->json($response); + return $response; } //----------------------------------------------------------------------------------- diff --git a/Models/UserBase.php b/Models/UserBase.php index 92dd5c4ca..d82a0e1c8 100644 --- a/Models/UserBase.php +++ b/Models/UserBase.php @@ -1162,7 +1162,7 @@ public function hasPermissions($permission_slugs) foreach($permission_slugs as $permission_slug){ if(!Auth::user()->hasPermission($permission_slug)){ - return vh_get_permission_denied_json_response($permission_slugs_string); + return vh_get_permission_denied_response($permission_slugs_string); } } From 62f8e846ef58b6060251c93ee9e256ee892aadc0 Mon Sep 17 00:00:00 2001 From: Alam Date: Wed, 10 Jan 2024 18:05:58 +0530 Subject: [PATCH 47/57] Updated: registrations permission response --- .../Backend/RegistrationsController.php | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/Http/Controllers/Backend/RegistrationsController.php b/Http/Controllers/Backend/RegistrationsController.php index 9f9812c50..b19d30b3e 100644 --- a/Http/Controllers/Backend/RegistrationsController.php +++ b/Http/Controllers/Backend/RegistrationsController.php @@ -95,7 +95,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-registrations-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -121,7 +121,7 @@ public function updateList(Request $request): JsonResponse $permission_slug = 'can-update-registrations'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -145,8 +145,9 @@ public function listAction(Request $request, $type): JsonResponse { $permission_slugs = ['can-update-registrations','can-manage-registrations']; $permission_response = Auth::user()->hasPermissions($permission_slugs); + if(isset($permission_response['success']) && $permission_response['success'] == false) { - return $permission_response; + return response()->json($permission_response); } try { @@ -170,9 +171,10 @@ public function deleteList(Request $request): JsonResponse { $permission_slugs = ['can-update-registrations','can-delete-registrations']; - if(!Auth::user()->hasPermission($permission_slugs[0]) || - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -197,7 +199,7 @@ public function createItem(Request $request): JsonResponse $permission_slug = 'can-create-registrations'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -222,7 +224,7 @@ public function getItem(Request $request, $id): JsonResponse $permission_slug = 'can-read-registrations'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -247,7 +249,7 @@ public function updateItem(Request $request ,$id): JsonResponse $permission_slug = 'can-update-registrations'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -271,9 +273,10 @@ public function deleteItem(Request $request, $id): JsonResponse { $permission_slugs = ['can-update-registrations','can-delete-registrations']; - if(!Auth::user()->hasPermission($permission_slugs[0]) || - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -297,9 +300,10 @@ public function itemAction(Request $request, $id, $action): JsonResponse { $permission_slugs = ['can-update-registrations','can-manage-registrations']; - if(!Auth::user()->hasPermission($permission_slugs[0]) || - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -343,7 +347,7 @@ public function createUser(Request $request,$id): JsonResponse $permission_slug = 'can-create-users-from-registrations'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { From 9444d8adfad09893785e4eb2de16dda704479f07 Mon Sep 17 00:00:00 2001 From: Alam Date: Wed, 10 Jan 2024 18:20:48 +0530 Subject: [PATCH 48/57] Updated: users permission response --- Http/Controllers/Backend/UsersController.php | 61 +++++++++++--------- 1 file changed, 33 insertions(+), 28 deletions(-) diff --git a/Http/Controllers/Backend/UsersController.php b/Http/Controllers/Backend/UsersController.php index 5669914ed..47df9744b 100644 --- a/Http/Controllers/Backend/UsersController.php +++ b/Http/Controllers/Backend/UsersController.php @@ -23,7 +23,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-users-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -109,7 +109,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-users-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -133,7 +133,7 @@ public function updateList(Request $request): JsonResponse $permission_slug = 'can-update-users'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -158,7 +158,7 @@ public function listAction(Request $request, $type): JsonResponse $permission_slug = 'can-update-users'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -203,7 +203,7 @@ public function createItem(Request $request): JsonResponse $permission_slug = 'can-create-user'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -228,7 +228,7 @@ public function getItem(Request $request, $id): JsonResponse $permission_slug = 'can-read-users'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -253,7 +253,7 @@ public function updateItem(Request $request,$id): JsonResponse $permission_slug = 'can-update-users'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -287,9 +287,10 @@ public function deleteItem(Request $request,$id): JsonResponse { $permission_slugs = ['can-update-users','can-delete-users']; - if(!Auth::user()->hasPermission($permission_slugs[0]) || - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -321,9 +322,10 @@ public function itemAction(Request $request,$id,$action): JsonResponse { $permission_slugs = ['can-manage-users','can-update-users']; - if(!Auth::user()->hasPermission($permission_slugs[0]) && - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -358,7 +360,7 @@ public function getItemRoles(Request $request, $id): JsonResponse $permission_slug = 'can-read-users'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -439,9 +441,10 @@ public function postActions(Request $request, $action) : JsonResponse $permission_slugs = ['can-manage-users','can-update-users']; - if(!Auth::user()->hasPermission($permission_slugs[0]) && - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } $response = User::bulkStatusChange($request); @@ -453,7 +456,7 @@ public function postActions(Request $request, $action) : JsonResponse $permission_slug = 'can-update-users'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = User::bulkTrash($request); @@ -465,7 +468,7 @@ public function postActions(Request $request, $action) : JsonResponse $permission_slug = 'can-update-users'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = User::bulkRestore($request); @@ -476,9 +479,10 @@ public function postActions(Request $request, $action) : JsonResponse $permission_slugs = ['can-update-users','can-delete-users']; - if(!Auth::user()->hasPermission($permission_slugs[0]) || - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } $response = User::bulkDelete($request); @@ -489,9 +493,10 @@ public function postActions(Request $request, $action) : JsonResponse $permission_slugs = ['can-manage-users','can-update-users']; - if(!Auth::user()->hasPermission($permission_slugs[0]) && - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } $response = User::bulkChangeRoleStatus($request); @@ -543,7 +548,7 @@ public function storeAvatar(Request $request): JsonResponse $permission_slug = 'can-update-users'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -583,7 +588,7 @@ public function removeAvatar(Request $request) $permission_slug = 'can-update-users'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -704,7 +709,7 @@ public function impersonate(Request $request, $uuid): JsonResponse $permission_slug = 'can-impersonate-users'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { From ad8a72f4f390104e32df8d9825bafea73656fa28 Mon Sep 17 00:00:00 2001 From: Alam Date: Wed, 10 Jan 2024 18:34:09 +0530 Subject: [PATCH 49/57] Updated: themes permission response --- Http/Controllers/Backend/ThemesController.php | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Http/Controllers/Backend/ThemesController.php b/Http/Controllers/Backend/ThemesController.php index 7b821bcd5..2f661f79c 100644 --- a/Http/Controllers/Backend/ThemesController.php +++ b/Http/Controllers/Backend/ThemesController.php @@ -24,7 +24,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-theme-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -56,7 +56,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-theme-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -123,7 +123,7 @@ public function download(Request $request): JsonResponse $permission_slug = 'can-install-theme'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -162,7 +162,7 @@ public function installUpdates(Request $request): JsonResponse $permission_slug = 'can-update-theme'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -243,7 +243,7 @@ public function actions(Request $request,$id,$action): JsonResponse $permission_slug = 'can-activate-theme'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = Theme::activateItem($theme->slug); break; @@ -252,7 +252,7 @@ public function actions(Request $request,$id,$action): JsonResponse $permission_slug = 'can-activate-theme'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = Theme::makeItemAsDefault($theme->slug); break; @@ -261,7 +261,7 @@ public function actions(Request $request,$id,$action): JsonResponse $permission_slug = 'can-activate-theme'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = Theme::refreshMigrations($theme->slug); break; @@ -270,7 +270,7 @@ public function actions(Request $request,$id,$action): JsonResponse $permission_slug = 'can-activate-theme'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = Theme::runMigrations($theme->slug); break; @@ -279,7 +279,7 @@ public function actions(Request $request,$id,$action): JsonResponse $permission_slug = 'can-activate-theme'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = Theme::runSeeds($theme->slug); break; @@ -288,7 +288,7 @@ public function actions(Request $request,$id,$action): JsonResponse $permission_slug = 'can-deactivate-theme'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = Theme::deactivateItem($theme->slug); break; @@ -297,7 +297,7 @@ public function actions(Request $request,$id,$action): JsonResponse $permission_slug = 'can-import-sample-data-in-theme'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = Theme::importSampleData($theme->slug); break; @@ -306,7 +306,7 @@ public function actions(Request $request,$id,$action): JsonResponse $permission_slug = 'can-delete-theme'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = Theme::deleteItem($theme->slug); break; @@ -334,7 +334,7 @@ public function storeUpdates(Request $request): JsonResponse $permission_slug = 'can-update-theme'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -373,7 +373,7 @@ public function deleteItem(Request $request, $id): JsonResponse $permission_slug = 'can-delete-theme'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -430,7 +430,7 @@ public function getItem(Request $request, $id): JsonResponse $permission_slug = 'can-read-theme'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { From f7b8fa8feccaeafd3495660f66e1f769c075576b Mon Sep 17 00:00:00 2001 From: Alam Date: Wed, 10 Jan 2024 18:46:20 +0530 Subject: [PATCH 50/57] Updated: taxonomy permission response --- .../Backend/TaxonomiesController.php | 43 ++++++++++--------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/Http/Controllers/Backend/TaxonomiesController.php b/Http/Controllers/Backend/TaxonomiesController.php index a4c9415ba..2c9cefb5c 100644 --- a/Http/Controllers/Backend/TaxonomiesController.php +++ b/Http/Controllers/Backend/TaxonomiesController.php @@ -21,7 +21,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-taxonomies-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -84,7 +84,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-taxonomies-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -108,9 +108,10 @@ public function updateList(Request $request): JsonResponse { $permission_slugs = ['can-update-taxonomies','can-manage-taxonomies']; - if(!Auth::user()->hasPermission($permission_slugs[0]) || - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -134,9 +135,10 @@ public function listAction(Request $request, $type): JsonResponse { $permission_slugs = ['can-update-taxonomies','can-manage-taxonomies']; - if(!Auth::user()->hasPermission($permission_slugs[0]) || - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -161,7 +163,7 @@ public function deleteList(Request $request): JsonResponse $permission_slug = 'can-delete-taxonomies'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -186,7 +188,7 @@ public function createItem(Request $request): JsonResponse $permission_slug = 'can-create-taxonomies'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -211,7 +213,7 @@ public function getItem(Request $request, $id): JsonResponse $permission_slug = 'can-read-taxonomies'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -260,7 +262,7 @@ public function updateItem(Request $request, $id): JsonResponse $permission_slug = 'can-update-taxonomies'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -285,7 +287,7 @@ public function deleteItem(Request $request, $id): JsonResponse $permission_slug = 'can-delete-taxonomies'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -309,9 +311,10 @@ public function itemAction(Request $request, $id, $action): JsonResponse { $permission_slugs = ['can-update-taxonomies','can-manage-taxonomies']; - if(!Auth::user()->hasPermission($permission_slugs[0]) || - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -336,7 +339,7 @@ public function createTaxonomyType(Request $request): JsonResponse $permission_slug = 'can-manage-taxonomy-type'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -384,7 +387,7 @@ public function deleteTaxonomyType(Request $request): JsonResponse $permission_slug = 'can-manage-taxonomy-type'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -437,7 +440,7 @@ public function updateTaxonomyType(Request $request): JsonResponse $permission_slug = 'can-manage-taxonomy-type'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -500,7 +503,7 @@ public function updateTaxonomyTypePosition(Request $request): JsonResponse $permission_slug = 'can-manage-taxonomy-type'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } From ca53dacf53a88a3a8d32806403d037ef85422446 Mon Sep 17 00:00:00 2001 From: Alam Date: Wed, 10 Jan 2024 18:55:23 +0530 Subject: [PATCH 51/57] Updated: roles permission response --- Http/Controllers/Backend/RolesController.php | 34 +++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/Http/Controllers/Backend/RolesController.php b/Http/Controllers/Backend/RolesController.php index 7004ebf54..aa3d417c9 100644 --- a/Http/Controllers/Backend/RolesController.php +++ b/Http/Controllers/Backend/RolesController.php @@ -20,7 +20,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-roles-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -78,7 +78,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-roles-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -103,7 +103,7 @@ public function updateList(Request $request): JsonResponse $permission_slug = 'can-update-roles'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -127,9 +127,10 @@ public function listAction(Request $request, $type): JsonResponse { $permission_slugs = ['can-update-roles','can-manage-roles']; - if(!Auth::user()->hasPermission($permission_slugs[0]) || - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -154,7 +155,7 @@ public function deleteList(Request $request): JsonResponse $permission_slug = 'can-delete-roles'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -179,7 +180,7 @@ public function createItem(Request $request): JsonResponse $permission_slug = 'can-create-roles'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -204,7 +205,7 @@ public function getItem(Request $request, $id): JsonResponse $permission_slug = 'can-read-roles'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -229,7 +230,7 @@ public function updateItem(Request $request,$id): JsonResponse $permission_slug = 'can-update-roles'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -254,7 +255,7 @@ public function deleteItem(Request $request, $id): JsonResponse $permission_slug = 'can-delete-roles'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -278,9 +279,10 @@ public function itemAction(Request $request, $id, $action): JsonResponse { $permission_slugs = ['can-manage-roles','can-update-roles']; - if(!Auth::user()->hasPermission($permission_slugs[0]) || - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -305,7 +307,7 @@ public function getItemPermission(Request $request, $id): JsonResponse $permission_slug = 'can-read-roles'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -330,7 +332,7 @@ public function getItemUser(Request $request, $id): JsonResponse $permission_slug = 'can-read-roles'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { From 2e0507f008329ce38d40adee6fab6b7e49bc7181 Mon Sep 17 00:00:00 2001 From: Alam Date: Wed, 10 Jan 2024 18:58:30 +0530 Subject: [PATCH 52/57] Updated: permission denied response of permission --- .../Backend/PermissionsController.php | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Http/Controllers/Backend/PermissionsController.php b/Http/Controllers/Backend/PermissionsController.php index 4e744928d..556d1ccd9 100644 --- a/Http/Controllers/Backend/PermissionsController.php +++ b/Http/Controllers/Backend/PermissionsController.php @@ -21,7 +21,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-permissions-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -72,7 +72,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-permissions-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { $response = Permission::getList($request); @@ -96,7 +96,7 @@ public function updateList(Request $request): JsonResponse $permission_slug = 'can-update-permissions'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -121,7 +121,7 @@ public function listAction(Request $request, $type): JsonResponse $permission_slug = 'can-update-permissions'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -146,7 +146,7 @@ public function deleteList(Request $request): JsonResponse $permission_slug = 'can-update-permissions'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -171,7 +171,7 @@ public function getItem(Request $request, $id): JsonResponse $permission_slug = 'can-update-permissions'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -196,7 +196,7 @@ public function updateItem(Request $request, $id): JsonResponse $permission_slug = 'can-update-permissions'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -221,7 +221,7 @@ public function deleteItem(Request $request, $id): JsonResponse $permission_slug = 'can-update-permissions'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -246,7 +246,7 @@ public function itemAction(Request $request, $id, $action): JsonResponse $permission_slug = 'can-update-permissions'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -271,7 +271,7 @@ public function getItemRoles(Request $request, $id): JsonResponse $permission_slug = 'can-update-permissions'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { From 2787739d6d201f45ce26b9523b0ff008b4a4960f Mon Sep 17 00:00:00 2001 From: Alam Date: Wed, 10 Jan 2024 19:01:25 +0530 Subject: [PATCH 53/57] Updated: modules permission response --- .../Controllers/Backend/ModulesController.php | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Http/Controllers/Backend/ModulesController.php b/Http/Controllers/Backend/ModulesController.php index 89154f114..046e92ba3 100644 --- a/Http/Controllers/Backend/ModulesController.php +++ b/Http/Controllers/Backend/ModulesController.php @@ -24,7 +24,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-module-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -56,7 +56,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-module-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -127,7 +127,7 @@ public function getItem(Request $request, $id): JsonResponse $permission_slug = 'can-read-module'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -152,7 +152,7 @@ public function download(Request $request): JsonResponse $permission_slug = 'can-install-module'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -191,7 +191,7 @@ public function installUpdates(Request $request): JsonResponse $permission_slug = 'can-update-module'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -274,7 +274,7 @@ public function actions(Request $request, $id, $action): JsonResponse $permission_slug = 'can-activate-module'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = Module::activateItem($module->slug); break; @@ -283,7 +283,7 @@ public function actions(Request $request, $id, $action): JsonResponse $permission_slug = 'can-deactivate-module'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = Module::deactivateItem($module->slug); @@ -293,7 +293,7 @@ public function actions(Request $request, $id, $action): JsonResponse $permission_slug = 'can-activate-module'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = Module::refreshMigrations($module->slug); break; @@ -302,7 +302,7 @@ public function actions(Request $request, $id, $action): JsonResponse $permission_slug = 'can-activate-module'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = Module::runMigrations($module->slug); break; @@ -311,7 +311,7 @@ public function actions(Request $request, $id, $action): JsonResponse $permission_slug = 'can-activate-module'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = Module::runSeeds($module->slug); break; @@ -320,7 +320,7 @@ public function actions(Request $request, $id, $action): JsonResponse $permission_slug = 'can-import-sample-data-in-module'; if(!\Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = Module::importSampleData($module->slug); @@ -330,7 +330,7 @@ public function actions(Request $request, $id, $action): JsonResponse $permission_slug = 'can-delete-module'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = Module::deleteItem($module->slug); @@ -408,7 +408,7 @@ public function updateModuleVersions(Request $request): JsonResponse $permission_slug = 'can-update-module'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -448,7 +448,7 @@ public function storeUpdates(Request $request): JsonResponse $permission_slug = 'can-update-module'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { From f419dde8ff33898fe97582cc4ae725d5d048d93c Mon Sep 17 00:00:00 2001 From: Alam Date: Wed, 10 Jan 2024 19:05:17 +0530 Subject: [PATCH 54/57] Updated: media permission response --- Http/Controllers/Backend/MediaController.php | 30 +++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/Http/Controllers/Backend/MediaController.php b/Http/Controllers/Backend/MediaController.php index e40489696..64be9450a 100644 --- a/Http/Controllers/Backend/MediaController.php +++ b/Http/Controllers/Backend/MediaController.php @@ -22,7 +22,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-media-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -85,7 +85,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-media-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -110,7 +110,7 @@ public function updateList(Request $request): JsonResponse $permission_slug = 'can-update-media'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -134,9 +134,10 @@ public function listAction(Request $request, $type): JsonResponse { $permission_slugs = ['can-update-media','can-manage-media']; - if(!Auth::user()->hasPermission($permission_slugs[0]) || - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } @@ -162,7 +163,7 @@ public function deleteList(Request $request): JsonResponse $permission_slug = 'can-delete-media'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -187,7 +188,7 @@ public function getItem(Request $request, $id): JsonResponse $permission_slug = 'can-read-media'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -212,7 +213,7 @@ public function updateItem(Request $request, $id): JsonResponse $permission_slug = 'can-update-media'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -237,7 +238,7 @@ public function deleteItem(Request $request, $id): JsonResponse $permission_slug = 'can-update-media'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -261,9 +262,10 @@ public function itemAction(Request $request, $id, $action): JsonResponse { $permission_slugs = ['can-update-media','can-manage-media']; - if(!Auth::user()->hasPermission($permission_slugs[0]) || - !Auth::user()->hasPermission($permission_slugs[1])) { - return response()->json(vh_get_permission_denied_response($permission_slugs)); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -419,7 +421,7 @@ public function postCreate(Request $request): JsonResponse $permission_slug = 'can-create-media'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { From 7127d791f34d2195070486b0a7b2eb7bff1fe6a8 Mon Sep 17 00:00:00 2001 From: Alam Date: Wed, 10 Jan 2024 19:12:06 +0530 Subject: [PATCH 55/57] Updated: settings permission response --- .../Backend/Settings/EnvController.php | 8 ++++---- .../Backend/Settings/GeneralController.php | 12 ++++++------ .../Settings/LocalizationController.php | 14 +++++++------- .../Settings/NotificationsController.php | 18 +++++++++--------- .../Backend/Settings/UpdateController.php | 10 +++++----- .../Backend/Settings/UserSettingController.php | 8 ++++---- 6 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Http/Controllers/Backend/Settings/EnvController.php b/Http/Controllers/Backend/Settings/EnvController.php index d6bce300f..be164f767 100644 --- a/Http/Controllers/Backend/Settings/EnvController.php +++ b/Http/Controllers/Backend/Settings/EnvController.php @@ -24,7 +24,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -59,7 +59,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -90,7 +90,7 @@ public function downloadFile(Request $request, $file_name): BinaryFileResponse | $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -119,7 +119,7 @@ public function store(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { diff --git a/Http/Controllers/Backend/Settings/GeneralController.php b/Http/Controllers/Backend/Settings/GeneralController.php index 71399be06..5934c3e5b 100644 --- a/Http/Controllers/Backend/Settings/GeneralController.php +++ b/Http/Controllers/Backend/Settings/GeneralController.php @@ -25,7 +25,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -65,7 +65,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -100,7 +100,7 @@ public function storeSiteSettings(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -149,7 +149,7 @@ public function storeLinks(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -226,7 +226,7 @@ public function storeMetaTags(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -286,7 +286,7 @@ public function deleteMetaTags(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { diff --git a/Http/Controllers/Backend/Settings/LocalizationController.php b/Http/Controllers/Backend/Settings/LocalizationController.php index 71d6007ee..5e627e61b 100644 --- a/Http/Controllers/Backend/Settings/LocalizationController.php +++ b/Http/Controllers/Backend/Settings/LocalizationController.php @@ -26,7 +26,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -65,7 +65,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -90,7 +90,7 @@ public function generateLanguage(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -118,7 +118,7 @@ public function postStore(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -143,7 +143,7 @@ public function storeLanguage(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -169,7 +169,7 @@ public function storeCategory(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -195,7 +195,7 @@ public function postActions(Request $request, $action): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { diff --git a/Http/Controllers/Backend/Settings/NotificationsController.php b/Http/Controllers/Backend/Settings/NotificationsController.php index 1b5ac8386..821b97d53 100644 --- a/Http/Controllers/Backend/Settings/NotificationsController.php +++ b/Http/Controllers/Backend/Settings/NotificationsController.php @@ -23,7 +23,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -59,7 +59,7 @@ public function getList(Request $request) $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try{ @@ -81,7 +81,7 @@ public function getItemData(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -113,7 +113,7 @@ public function createItem(Request $request) $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try{ @@ -136,7 +136,7 @@ public function itemAction(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -161,7 +161,7 @@ public function listAction(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -186,7 +186,7 @@ public function store(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -226,7 +226,7 @@ public function send(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -268,7 +268,7 @@ public function markAsRead(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { diff --git a/Http/Controllers/Backend/Settings/UpdateController.php b/Http/Controllers/Backend/Settings/UpdateController.php index 3bb1023a0..ae09aa998 100644 --- a/Http/Controllers/Backend/Settings/UpdateController.php +++ b/Http/Controllers/Backend/Settings/UpdateController.php @@ -27,7 +27,7 @@ public function storeUpdate(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -89,7 +89,7 @@ public function upgrade(): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -113,7 +113,7 @@ public function publish() $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -157,7 +157,7 @@ public function runMigrations(): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try{ @@ -195,7 +195,7 @@ public function clearCache(): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { diff --git a/Http/Controllers/Backend/Settings/UserSettingController.php b/Http/Controllers/Backend/Settings/UserSettingController.php index cd874d517..2b0b4c4e5 100644 --- a/Http/Controllers/Backend/Settings/UserSettingController.php +++ b/Http/Controllers/Backend/Settings/UserSettingController.php @@ -21,7 +21,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -50,7 +50,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -89,7 +89,7 @@ public function storeCustomField(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -143,7 +143,7 @@ public function storeField(Request $request): JsonResponse $permission_slug = 'has-access-of-setting-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { From c0674e8b71005620df46b3e36dea22569067f97b Mon Sep 17 00:00:00 2001 From: Alam Date: Thu, 11 Jan 2024 10:33:38 +0530 Subject: [PATCH 56/57] Updated: permission response in backup and settings --- Http/Controllers/Settings/BackupsController.php | 4 ++-- Http/Controllers/Settings/SettingsController.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Http/Controllers/Settings/BackupsController.php b/Http/Controllers/Settings/BackupsController.php index 0e280ebe8..69df1ce8a 100644 --- a/Http/Controllers/Settings/BackupsController.php +++ b/Http/Controllers/Settings/BackupsController.php @@ -27,7 +27,7 @@ public function getAssets(Request $request) $permission_slug = 'has-access-of-setting-section'; if(!\Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response['success'] = true; @@ -41,7 +41,7 @@ public function getList(Request $request) $permission_slug = 'has-access-of-setting-section'; if(!\Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } $response = VaahBackup::create($request); diff --git a/Http/Controllers/Settings/SettingsController.php b/Http/Controllers/Settings/SettingsController.php index aac6fd95a..9b60ffd8c 100644 --- a/Http/Controllers/Settings/SettingsController.php +++ b/Http/Controllers/Settings/SettingsController.php @@ -24,7 +24,7 @@ public function index() $permission_slug = 'has-access-of-setting-section'; if(!\Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } return view($this->theme.'.pages.dashboard'); From daafd887f1732bc0aa58cb66a7f7db9b09720c87 Mon Sep 17 00:00:00 2001 From: Alam Date: Thu, 11 Jan 2024 10:39:35 +0530 Subject: [PATCH 57/57] Updated: advanced permission response --- .../Controllers/Backend/Advanced/BatchesController.php | 4 ++-- .../Backend/Advanced/FailedJobsController.php | 4 ++-- Http/Controllers/Backend/Advanced/JobsController.php | 4 ++-- Http/Controllers/Backend/Advanced/LogsController.php | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Http/Controllers/Backend/Advanced/BatchesController.php b/Http/Controllers/Backend/Advanced/BatchesController.php index 76b7530c9..53044ae8c 100644 --- a/Http/Controllers/Backend/Advanced/BatchesController.php +++ b/Http/Controllers/Backend/Advanced/BatchesController.php @@ -18,7 +18,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-advanced-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -70,7 +70,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-batches-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { diff --git a/Http/Controllers/Backend/Advanced/FailedJobsController.php b/Http/Controllers/Backend/Advanced/FailedJobsController.php index 1fd5b6df9..020e39867 100644 --- a/Http/Controllers/Backend/Advanced/FailedJobsController.php +++ b/Http/Controllers/Backend/Advanced/FailedJobsController.php @@ -19,7 +19,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-advanced-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -70,7 +70,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-failed-jobs-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { diff --git a/Http/Controllers/Backend/Advanced/JobsController.php b/Http/Controllers/Backend/Advanced/JobsController.php index 999b9fd58..f6a744d9c 100644 --- a/Http/Controllers/Backend/Advanced/JobsController.php +++ b/Http/Controllers/Backend/Advanced/JobsController.php @@ -18,7 +18,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-advanced-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -69,7 +69,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-jobs-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { diff --git a/Http/Controllers/Backend/Advanced/LogsController.php b/Http/Controllers/Backend/Advanced/LogsController.php index 24528fb94..7bfe10f34 100644 --- a/Http/Controllers/Backend/Advanced/LogsController.php +++ b/Http/Controllers/Backend/Advanced/LogsController.php @@ -21,7 +21,7 @@ public function getAssets(Request $request): JsonResponse $permission_slug = 'has-access-of-advanced-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -71,7 +71,7 @@ public function getList(Request $request): JsonResponse $permission_slug = 'has-access-of-logs-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -165,7 +165,7 @@ public function getItem(Request $request, $name): JsonResponse $permission_slug = 'has-access-of-advanced-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -230,7 +230,7 @@ public function downloadFile(Request $request, $file_name): BinaryFileResponse | $permission_slug = 'has-access-of-advanced-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try { @@ -261,7 +261,7 @@ public function postActions(Request $request, $action): JsonResponse $permission_slug = 'has-access-of-advanced-section'; if(!Auth::user()->hasPermission($permission_slug)) { - return response()->json(vh_get_permission_denied_response([$permission_slug])); + return vh_get_permission_denied_json_response($permission_slug); } try {