diff --git a/Helpers/backend.php b/Helpers/backend.php index 638a2751f..eb209aed8 100644 --- a/Helpers/backend.php +++ b/Helpers/backend.php @@ -112,5 +112,19 @@ function vh_get_backend_file($file_path) return vh_get_backend_theme_url()."/".$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; + $response['errors'][] = trans("vaahcms-general.permission_denied"); + if(env('APP_DEBUG')){ + $response['hint'][] = 'You don\'t have "'.$permission_slugs.'" permission.'; + } + return $response; +} //----------------------------------------------------------------------------------- diff --git a/Http/Controllers/Backend/Advanced/BatchesController.php b/Http/Controllers/Backend/Advanced/BatchesController.php index ee34dd8d7..53044ae8c 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 vh_get_permission_denied_json_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 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 4d9e9816d..020e39867 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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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..f6a744d9c 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 vh_get_permission_denied_json_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 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 2a88cc8c5..7bfe10f34 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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_response($permission_slug); } try { diff --git a/Http/Controllers/Backend/MediaController.php b/Http/Controllers/Backend/MediaController.php index a7202ca5a..64be9450a 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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_response($permission_slug); } try { @@ -135,15 +132,15 @@ 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); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } + try { $response = Media::listAction($request, $type); } catch (\Exception $e) { @@ -163,11 +160,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 vh_get_permission_denied_json_response($permission_slug); } try { @@ -189,11 +185,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 vh_get_permission_denied_json_response($permission_slug); } try { @@ -215,11 +210,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 vh_get_permission_denied_json_response($permission_slug); } try { @@ -241,11 +235,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 vh_get_permission_denied_json_response($permission_slug); } try { @@ -267,13 +260,12 @@ 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); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -426,11 +418,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 vh_get_permission_denied_json_response($permission_slug); } try { diff --git a/Http/Controllers/Backend/ModulesController.php b/Http/Controllers/Backend/ModulesController.php index 749314567..046e92ba3 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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_response($permission_slug); } try { diff --git a/Http/Controllers/Backend/PermissionsController.php b/Http/Controllers/Backend/PermissionsController.php index d3b3ee926..556d1ccd9 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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_response($permission_slug); } try { diff --git a/Http/Controllers/Backend/RegistrationsController.php b/Http/Controllers/Backend/RegistrationsController.php index d4503412a..b19d30b3e 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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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']; + $permission_response = Auth::user()->hasPermissions($permission_slugs); - return response()->json($response); + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -173,13 +169,12 @@ 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); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -201,12 +196,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 vh_get_permission_denied_json_response($permission_slug); + } try { $response = Registration::createItem($request); @@ -227,12 +221,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 vh_get_permission_denied_json_response($permission_slug); + } try { $response = Registration::getItem($id); @@ -253,12 +246,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 vh_get_permission_denied_json_response($permission_slug); } try { @@ -280,13 +271,12 @@ 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']; + + $permission_response = Auth::user()->hasPermissions($permission_slugs); - return response()->json($response); + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -308,13 +298,12 @@ 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']; + + $permission_response = Auth::user()->hasPermissions($permission_slugs); - return response()->json($response); + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -355,11 +344,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 vh_get_permission_denied_json_response($permission_slug); } try { diff --git a/Http/Controllers/Backend/RolesController.php b/Http/Controllers/Backend/RolesController.php index 7b450c21f..aa3d417c9 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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_response($permission_slug); } try { @@ -128,13 +125,12 @@ 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); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -156,11 +152,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 vh_get_permission_denied_json_response($permission_slug); } try { @@ -182,11 +177,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 vh_get_permission_denied_json_response($permission_slug); } try { @@ -208,11 +202,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 vh_get_permission_denied_json_response($permission_slug); } try { @@ -234,11 +227,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 vh_get_permission_denied_json_response($permission_slug); } try { @@ -260,11 +252,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 vh_get_permission_denied_json_response($permission_slug); } try { @@ -286,13 +277,12 @@ 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); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -314,11 +304,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 vh_get_permission_denied_json_response($permission_slug); } try { @@ -340,11 +329,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 vh_get_permission_denied_json_response($permission_slug); } try { diff --git a/Http/Controllers/Backend/Settings/EnvController.php b/Http/Controllers/Backend/Settings/EnvController.php index 0103c809f..be164f767 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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 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 839e66be6..5934c3e5b 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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 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 bda0821a1..5e627e61b 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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 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 982d90d37..821b97d53 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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 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 7a6f75fd4..ae09aa998 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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 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 e874d7dc9..2b0b4c4e5 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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_response($permission_slug); } try { diff --git a/Http/Controllers/Backend/TaxonomiesController.php b/Http/Controllers/Backend/TaxonomiesController.php index 0ada84d6b..2c9cefb5c 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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_response($permission_slug); } try { @@ -108,13 +106,12 @@ 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); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -136,13 +133,12 @@ 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); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -164,11 +160,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 vh_get_permission_denied_json_response($permission_slug); } try { @@ -190,11 +185,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 vh_get_permission_denied_json_response($permission_slug); } try { @@ -216,11 +210,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 vh_get_permission_denied_json_response($permission_slug); } try { @@ -266,11 +259,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 vh_get_permission_denied_json_response($permission_slug); } try { @@ -292,11 +284,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 vh_get_permission_denied_json_response($permission_slug); } try { @@ -318,13 +309,12 @@ 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); + $permission_response = Auth::user()->hasPermissions($permission_slugs); + + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -346,11 +336,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 vh_get_permission_denied_json_response($permission_slug); } try { @@ -395,11 +384,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 vh_get_permission_denied_json_response($permission_slug); } try { @@ -449,11 +437,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 vh_get_permission_denied_json_response($permission_slug); } try { @@ -513,13 +500,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 vh_get_permission_denied_json_response($permission_slug); } + try { $parent_id = null; diff --git a/Http/Controllers/Backend/ThemesController.php b/Http/Controllers/Backend/ThemesController.php index 5ce591621..2f661f79c 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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_response($permission_slug); } try { diff --git a/Http/Controllers/Backend/UsersController.php b/Http/Controllers/Backend/UsersController.php index 10318f27b..3ebfa1c35 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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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 vh_get_permission_denied_json_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']; + $permission_response = Auth::user()->hasPermissions($permission_slugs); - return response()->json($response); + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -327,13 +319,12 @@ 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']; + + $permission_response = Auth::user()->hasPermissions($permission_slugs); - return response()->json($response); + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } try { @@ -365,11 +356,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 vh_get_permission_denied_json_response($permission_slug); } try { @@ -448,13 +438,12 @@ 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); + $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); @@ -463,11 +452,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 vh_get_permission_denied_json_response($permission_slug); } $response = User::bulkTrash($request); @@ -476,11 +464,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 vh_get_permission_denied_json_response($permission_slug); } $response = User::bulkRestore($request); @@ -489,13 +476,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']; + $permission_response = Auth::user()->hasPermissions($permission_slugs); - return response()->json($response); + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } $response = User::bulkDelete($request); @@ -504,13 +489,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']; + $permission_response = Auth::user()->hasPermissions($permission_slugs); - return response()->json($response); + if(isset($permission_response['success']) && $permission_response['success'] == false) { + return response()->json($permission_response); } $response = User::bulkChangeRoleStatus($request); @@ -559,11 +542,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 vh_get_permission_denied_json_response($permission_slug); } try { @@ -600,12 +582,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 vh_get_permission_denied_json_response($permission_slug); } try { @@ -723,12 +703,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 vh_get_permission_denied_json_response($permission_slug); } try { diff --git a/Http/Controllers/Settings/BackupsController.php b/Http/Controllers/Settings/BackupsController.php index 9a32404eb..69df1ce8a 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 vh_get_permission_denied_json_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 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 b0de6c371..9b60ffd8c 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 vh_get_permission_denied_json_response($permission_slug); } return view($this->theme.'.pages.dashboard'); diff --git a/Models/UserBase.php b/Models/UserBase.php index b14105b43..d82a0e1c8 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_response($permission_slugs_string); + } + } + + $response = []; + $response['success'] = true; + return $response; + + } + //-------------------------------------------------