From 9c040cfe485d01f9ec66374fde43d73fec8bc9db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=8Carodej?= <peterpapp@makingcg.com>
Date: Thu, 17 Mar 2022 09:38:49 +0100
Subject: [PATCH] folder creation fix

---
 .env.testing                                                 | 2 +-
 .../SetupWizard/Actions/CreateDiskDirectoriesAction.php      | 2 +-
 .../SetupWizard/Controllers/CreateAdminAccountController.php | 5 +++++
 src/Support/Middleware/AdminCheck.php                        | 2 +-
 tests/Domain/SetupWizard/SetupServiceTest.php                | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.env.testing b/.env.testing
index 25642fe0..4b5e3557 100644
--- a/.env.testing
+++ b/.env.testing
@@ -1,6 +1,6 @@
 APP_NAME=Laravel
 APP_ENV=local
-APP_KEY=base64:P5ALPv1A4kpH7ppRtRyk3M9qoU0fG/tC5rV/3KX3Ff4=
+APP_KEY=base64:AVABDIuuiuExFcG2rzjNK4x8YuYTPZDwg5FuCbePbQI=
 APP_DEBUG=true
 APP_URL=http://localhost
 APP_DEMO=false
diff --git a/src/Domain/SetupWizard/Actions/CreateDiskDirectoriesAction.php b/src/Domain/SetupWizard/Actions/CreateDiskDirectoriesAction.php
index 8f4ac438..19b8ba0b 100644
--- a/src/Domain/SetupWizard/Actions/CreateDiskDirectoriesAction.php
+++ b/src/Domain/SetupWizard/Actions/CreateDiskDirectoriesAction.php
@@ -10,7 +10,7 @@ class CreateDiskDirectoriesAction
      */
     public function __invoke(): void
     {
-        collect(['avatars', 'chunks', 'system', 'files', 'temp', 'zip'])
+        collect(['avatars', 'chunks', 'system', 'files', 'temp'])
             ->each(function ($directory) {
                 // Create directory for local driver
                 Storage::disk('local')
diff --git a/src/Domain/SetupWizard/Controllers/CreateAdminAccountController.php b/src/Domain/SetupWizard/Controllers/CreateAdminAccountController.php
index a956cee7..94a66c50 100644
--- a/src/Domain/SetupWizard/Controllers/CreateAdminAccountController.php
+++ b/src/Domain/SetupWizard/Controllers/CreateAdminAccountController.php
@@ -3,6 +3,7 @@ namespace Domain\SetupWizard\Controllers;
 
 use Artisan;
 use App\Users\Models\User;
+use Domain\SetupWizard\Actions\CreateDiskDirectoriesAction;
 use Illuminate\Http\Response;
 use Domain\Settings\Models\Setting;
 use App\Http\Controllers\Controller;
@@ -21,6 +22,7 @@ class CreateAdminAccountController extends Controller
         protected StatefulGuard $guard,
         public SeedDefaultPagesAction $seedDefaultPages,
         public SeedDefaultLanguageAction $seedDefaultLanguage,
+        public CreateDiskDirectoriesAction $createDiskDirectories,
         public SeedDefaultSettingsAction $seedDefaultSettingsAction,
     ) {
     }
@@ -28,6 +30,9 @@ class CreateAdminAccountController extends Controller
     public function __invoke(
         StoreAdminAccountRequest $request
     ): Response {
+        // Create default directories
+        ($this->createDiskDirectories)();
+
         // Create user
         $admin = User::forceCreate([
             'role'              => 'admin',
diff --git a/src/Support/Middleware/AdminCheck.php b/src/Support/Middleware/AdminCheck.php
index 7eac81ad..d9490e25 100644
--- a/src/Support/Middleware/AdminCheck.php
+++ b/src/Support/Middleware/AdminCheck.php
@@ -16,7 +16,7 @@ class AdminCheck
     {
         // Check if user have access to administration settings
         if ($request->user()->role !== 'admin') {
-            abort(403, 'You don\'t have access for this operation!');
+            return response("You don't have access for this operation!", 403);
         }
 
         return $next($request);
diff --git a/tests/Domain/SetupWizard/SetupServiceTest.php b/tests/Domain/SetupWizard/SetupServiceTest.php
index b40e4df5..a2642e87 100644
--- a/tests/Domain/SetupWizard/SetupServiceTest.php
+++ b/tests/Domain/SetupWizard/SetupServiceTest.php
@@ -13,7 +13,7 @@ class SetupServiceTest extends TestCase
     public function it_create_system_folders()
     {
         // folders are created in TestCase
-        collect(['avatars', 'chunks', 'system', 'files', 'temp', 'zip'])
+        collect(['avatars', 'chunks', 'system', 'files', 'temp'])
             ->each(function ($directory) {
                 Storage::disk('local')->assertExists($directory);
             });