Skip to content

Commit

Permalink
Merge pull request #242 from webreinvent/2.x-feature/permission-denie…
Browse files Browse the repository at this point in the history 
…d-response

2.x feature -> 2.x develop | Updated: permission denied response
  • Loading branch information
@themodernpk
themodernpk authored Jan 19, 2024
2 parents e9dd125 + 6ce454e commit 9141cd0
Show file tree
Hide file tree
Showing 22 changed files with 530 additions and 667 deletions.
14 changes: 14 additions & 0 deletions Helpers/backend.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
//-----------------------------------------------------------------------------------
14 changes: 6 additions & 8 deletions Http/Controllers/Backend/Advanced/BatchesController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
15 changes: 7 additions & 8 deletions Http/Controllers/Backend/Advanced/FailedJobsController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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) {
Expand Down
14 changes: 6 additions & 8 deletions Http/Controllers/Backend/Advanced/JobsController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
36 changes: 15 additions & 21 deletions Http/Controllers/Backend/Advanced/LogsController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
79 changes: 35 additions & 44 deletions Http/Controllers/Backend/MediaController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand All @@ -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 {
Expand All @@ -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) {
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
Loading

0 comments on commit 9141cd0

Please sign in to comment.