From a163af86be2874e6b84da2b943d5c8811cbc97db Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 27 Dec 2021 06:00:50 +0000
Subject: [PATCH] Revert "fix admin permission issues"

This reverts commit da3408ad78eb5dd24c616b116fe7bb624be96e5c
---
 .../ControllersLogic/DeleteUserLogic.php      | 21 +++++++++++++------
 .../Standards/Rules/CanCreateSegment.php      |  6 +++---
 .../Standards/Rules/CanDeleteSegment.php      |  6 +++---
 .../Standards/Rules/CanUpdateSegment.php      |  6 +++---
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/app/Classes/Modules/Accounts/ControllersLogic/DeleteUserLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/DeleteUserLogic.php
index eb5fcc62..485e9cf3 100644
--- a/app/Classes/Modules/Accounts/ControllersLogic/DeleteUserLogic.php
+++ b/app/Classes/Modules/Accounts/ControllersLogic/DeleteUserLogic.php
@@ -53,15 +53,24 @@ class DeleteUserLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
+     * @throws ErrorException
      */
     public function logic(Request $request) : JsonResponse
     {
-        $user = $this->fetchesUser->execute(['id' => $request->route('id')]);
-        $this->canDeleteUser->passes();
-        $this->deletesUser->execute($user);
+        try {
+            DB::beginTransaction();
+
+            $user = $this->fetchesUser->execute(['id' => $request->route('id')]);
+            $this->canDeleteUser->passes();
+            $this->deletesUser->execute($user);
+            
+            DB::commit();
+
+            return $this->resourceResponse(new UserResource($user));
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
     }
 
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Segments/Standards/Rules/CanCreateSegment.php b/app/Classes/Modules/Segments/Standards/Rules/CanCreateSegment.php
index f7bdf2ef..50f7e81d 100644
--- a/app/Classes/Modules/Segments/Standards/Rules/CanCreateSegment.php
+++ b/app/Classes/Modules/Segments/Standards/Rules/CanCreateSegment.php
@@ -27,9 +27,9 @@ class CanCreateSegment extends AbstractRule
     protected function authorized(): bool
     {
         // TODO  Set Authorization rules
-//        if (!\Auth::user()->can('add segment')) {
-//            return false;
-//        }
+        if (!\Auth::user()->can('add segment')) {
+            return false;
+        }
 
         return true;
     }
diff --git a/app/Classes/Modules/Segments/Standards/Rules/CanDeleteSegment.php b/app/Classes/Modules/Segments/Standards/Rules/CanDeleteSegment.php
index 9208f492..197b0a5f 100644
--- a/app/Classes/Modules/Segments/Standards/Rules/CanDeleteSegment.php
+++ b/app/Classes/Modules/Segments/Standards/Rules/CanDeleteSegment.php
@@ -14,9 +14,9 @@ class CanDeleteSegment extends AbstractRule
     {
         // TODO  Set Authorization rules
 
-//        if (!\Auth::user()->can('delete segment')) {
-//            return false;
-//        }
+        if (!\Auth::user()->can('delete segment')) {
+            return false;
+        }
 
         return true;
 
diff --git a/app/Classes/Modules/Segments/Standards/Rules/CanUpdateSegment.php b/app/Classes/Modules/Segments/Standards/Rules/CanUpdateSegment.php
index 534f93ec..58a8c0ca 100644
--- a/app/Classes/Modules/Segments/Standards/Rules/CanUpdateSegment.php
+++ b/app/Classes/Modules/Segments/Standards/Rules/CanUpdateSegment.php
@@ -30,9 +30,9 @@ class CanUpdateSegment extends AbstractRule
     {
         // TODO  Set Authorization rules
 
-//        if (!\Auth::user()->can('edit segment')) {
-//            return false;
-//        }
+        if (!\Auth::user()->can('edit segment')) {
+            return false;
+        }
 
         return true;
     }