From 3867c9cd672d63e180fe58e27c2264fced465edf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=8Carodej?= <peterpapp@makingcg.com>
Date: Thu, 10 Feb 2022 09:06:47 +0100
Subject: [PATCH] admin creation via setup wizard refactoring

---
 config/services.php                           |  2 +-
 routes/api.php                                |  2 +-
 .../Homepage/Controllers/IndexController.php  |  3 +-
 .../CreateAdminAccountController.php          | 28 +++++----------
 .../StoreEnvironmentSettingsController.php    |  4 +--
 .../Requests/StoreAdminAccountRequest.php     | 34 +++++++++++++++++++
 .../Requests/StoreEnvironmentSetupRequest.php |  1 -
 src/Support/helpers.php                       |  4 +--
 tests/Domain/SetupWizard/SetupWizardTest.php  |  3 +-
 9 files changed, 48 insertions(+), 33 deletions(-)
 create mode 100644 src/Domain/SetupWizard/Requests/StoreAdminAccountRequest.php

diff --git a/config/services.php b/config/services.php
index 0743cce4..2483ace0 100644
--- a/config/services.php
+++ b/config/services.php
@@ -27,7 +27,7 @@ return [
         'key'    => env('AWS_ACCESS_KEY_ID'),
         'secret' => env('AWS_SECRET_ACCESS_KEY'),
         'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
-        'token' => env('AWS_SESSION_TOKEN'),
+        'token'  => env('AWS_SESSION_TOKEN'),
     ],
 
     'google' => [
diff --git a/routes/api.php b/routes/api.php
index 5debb7c2..2d8d2d2b 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -1,6 +1,5 @@
 <?php
 
-use Domain\SetupWizard\Controllers\PingAPIController;
 use Domain\Zip\Controllers\ZipController;
 use Domain\Pages\Controllers\PagesController;
 use Domain\Sharing\Controllers\ShareController;
@@ -9,6 +8,7 @@ use App\Users\Controllers\ResetPasswordController;
 use Domain\Files\Controllers\UploadFileController;
 use App\Users\Controllers\ForgotPasswordController;
 use Domain\Folders\Controllers\FavouriteController;
+use Domain\SetupWizard\Controllers\PingAPIController;
 use Domain\Folders\Controllers\CreateFolderController;
 use Domain\Browsing\Controllers\BrowseFolderController;
 use Domain\Sharing\Controllers\ShareViaEmailController;
diff --git a/src/Domain/Homepage/Controllers/IndexController.php b/src/Domain/Homepage/Controllers/IndexController.php
index a4d5c13d..f588ae72 100644
--- a/src/Domain/Homepage/Controllers/IndexController.php
+++ b/src/Domain/Homepage/Controllers/IndexController.php
@@ -1,13 +1,12 @@
 <?php
-
 namespace Domain\Homepage\Controllers;
 
 use DB;
+use PDOException;
 use Domain\Pages\Models\Page;
 use Illuminate\Contracts\View\View;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\Foundation\Application;
-use PDOException;
 
 class IndexController
 {
diff --git a/src/Domain/SetupWizard/Controllers/CreateAdminAccountController.php b/src/Domain/SetupWizard/Controllers/CreateAdminAccountController.php
index 4fe0629a..5e5a41bf 100644
--- a/src/Domain/SetupWizard/Controllers/CreateAdminAccountController.php
+++ b/src/Domain/SetupWizard/Controllers/CreateAdminAccountController.php
@@ -2,13 +2,13 @@
 namespace Domain\SetupWizard\Controllers;
 
 use App\Users\Models\User;
-use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Domain\Settings\Models\Setting;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
 use Domain\Pages\Actions\SeedDefaultPagesAction;
 use Domain\Settings\Actions\SeedDefaultSettingsAction;
+use Domain\SetupWizard\Requests\StoreAdminAccountRequest;
 use Domain\Localization\Actions\SeedDefaultLanguageAction;
 
 /**
@@ -24,19 +24,8 @@ class CreateAdminAccountController extends Controller
     }
 
     public function __invoke(
-        Request $request
+        StoreAdminAccountRequest $request
     ): Response {
-        // Validate request
-        // TODO: validator do requestu
-        $request->validate([
-            'email'         => 'required|string|email|unique:users',
-            'password'      => 'required|string|min:6|confirmed',
-            'name'          => 'required|string',
-            'purchase_code' => 'required|string',
-            'license'       => 'required|string',
-            'avatar'        => 'sometimes|file',
-        ]);
-
         // Create user
         $user = User::forceCreate([
             'role'              => 'admin',
@@ -48,13 +37,12 @@ class CreateAdminAccountController extends Controller
         // Split username
         $name = split_name($request->input('name'));
 
-        $user
-            ->settings()
-            ->create([
-                'avatar'     => store_avatar($request, 'avatar'),
-                'first_name' => $name['first_name'],
-                'last_name'  => $name['last_name'],
-            ]);
+        // Store user data
+        $user->settings()->create([
+            'avatar'     => store_avatar($request, 'avatar'),
+            'first_name' => $name['first_name'],
+            'last_name'  => $name['last_name'],
+        ]);
 
         collect([
             [
diff --git a/src/Domain/SetupWizard/Controllers/StoreEnvironmentSettingsController.php b/src/Domain/SetupWizard/Controllers/StoreEnvironmentSettingsController.php
index e43517e7..b265d10e 100644
--- a/src/Domain/SetupWizard/Controllers/StoreEnvironmentSettingsController.php
+++ b/src/Domain/SetupWizard/Controllers/StoreEnvironmentSettingsController.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace Domain\SetupWizard\Controllers;
 
 use Artisan;
@@ -15,7 +14,7 @@ class StoreEnvironmentSettingsController extends Controller
     public function __invoke(
         StoreEnvironmentSetupRequest $request,
     ): Response {
-        if (!app()->runningUnitTests()) {
+        if (! app()->runningUnitTests()) {
             $drivers = [
                 'local' => [
                     'FILESYSTEM_DRIVER' => 'local',
@@ -65,7 +64,6 @@ class StoreEnvironmentSettingsController extends Controller
                     'MAILGUN_DOMAIN'   => $request->input('mailgun.domain'),
                     'MAILGUN_SECRET'   => $request->input('mailgun.secret'),
                     'MAILGUN_ENDPOINT' => $request->input('mailgun.endpoint'),
-
                 ],
             ];
 
diff --git a/src/Domain/SetupWizard/Requests/StoreAdminAccountRequest.php b/src/Domain/SetupWizard/Requests/StoreAdminAccountRequest.php
new file mode 100644
index 00000000..ee7db9fc
--- /dev/null
+++ b/src/Domain/SetupWizard/Requests/StoreAdminAccountRequest.php
@@ -0,0 +1,34 @@
+<?php
+namespace Domain\SetupWizard\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class StoreAdminAccountRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'email'         => 'required|string|email|unique:users',
+            'password'      => 'required|string|min:6|confirmed',
+            'name'          => 'required|string',
+            'purchase_code' => 'required|string',
+            'license'       => 'required|string',
+            'avatar'        => 'sometimes|file',
+        ];
+    }
+}
diff --git a/src/Domain/SetupWizard/Requests/StoreEnvironmentSetupRequest.php b/src/Domain/SetupWizard/Requests/StoreEnvironmentSetupRequest.php
index 35457e3a..ee1a9c19 100644
--- a/src/Domain/SetupWizard/Requests/StoreEnvironmentSetupRequest.php
+++ b/src/Domain/SetupWizard/Requests/StoreEnvironmentSetupRequest.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace Domain\SetupWizard\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
diff --git a/src/Support/helpers.php b/src/Support/helpers.php
index e6e01e5a..1e0dd5a5 100644
--- a/src/Support/helpers.php
+++ b/src/Support/helpers.php
@@ -155,10 +155,8 @@ if (! function_exists('add_paragraphs')) {
 if (! function_exists('setEnvironmentValue')) {
     /**
      * Set environment value
-     *
-     * @return bool
      */
-    function setEnvironmentValue(array $values)
+    function setEnvironmentValue(array $values): bool
     {
         $envFile = app()->environmentFilePath();
         $str = file_get_contents($envFile);
diff --git a/tests/Domain/SetupWizard/SetupWizardTest.php b/tests/Domain/SetupWizard/SetupWizardTest.php
index df8ba803..4746d89e 100644
--- a/tests/Domain/SetupWizard/SetupWizardTest.php
+++ b/tests/Domain/SetupWizard/SetupWizardTest.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace Tests\Domain\SetupWizard;
 
 use Tests\TestCase;
@@ -201,7 +200,7 @@ class SetupWizardTest extends TestCase
 
         collect(config('vuefilemanager.avatar_sizes'))
             ->each(
-                fn($size) => Storage::disk('local')
+                fn ($size) => Storage::disk('local')
                     ->assertExists("avatars/{$size['name']}-{$avatar}")
             );
     }