From 3415cb5272039c5ac00dd91acc588a360ac544d5 Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Tue, 9 Jun 2020 07:24:05 -0500
Subject: [PATCH] user creation error handling

---
 app/Http/Controllers/Install/MakeUserController.php | 10 +++++-----
 resources/views/install/make-user.blade.php         |  9 ++++++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/Install/MakeUserController.php b/app/Http/Controllers/Install/MakeUserController.php
index f4a215f942..7bacd1c4b9 100644
--- a/app/Http/Controllers/Install/MakeUserController.php
+++ b/app/Http/Controllers/Install/MakeUserController.php
@@ -27,6 +27,7 @@ namespace App\Http\Controllers\Install;
 
 use App\Models\User;
 use Illuminate\Http\Request;
+use Illuminate\Support\Arr;
 
 class MakeUserController extends \App\Http\Controllers\Controller
 {
@@ -34,10 +35,6 @@ class MakeUserController extends \App\Http\Controllers\Controller
 
     public function __invoke(Request $request)
     {
-        if ($request->method() == 'POST') {
-            $this->create($request);
-        }
-
         if (session('install.database')) {
             $this->configureDatabase();
             $user = User::first();
@@ -50,7 +47,9 @@ class MakeUserController extends \App\Http\Controllers\Controller
             ]);
         }
 
-        return view('install.make-user');
+        return view('install.make-user', [
+            'messages' => Arr::wrap(session('message'))
+        ]);
     }
 
     public function create(Request $request)
@@ -63,6 +62,7 @@ class MakeUserController extends \App\Http\Controllers\Controller
         try {
             $this->configureDatabase();
             $user = new User($request->only(['username', 'password', 'email']));
+            $user->level = 10;
             $user->setPassword($request->get('password'));
             $res = $user->save();
             $message = $res ? trans('install.user.success') : trans('install.user.failure');
diff --git a/resources/views/install/make-user.blade.php b/resources/views/install/make-user.blade.php
index dc26d8a047..1ccd6233a7 100644
--- a/resources/views/install/make-user.blade.php
+++ b/resources/views/install/make-user.blade.php
@@ -10,19 +10,22 @@
                 <div class="form-row pb-3">
                     <label for="username" class="col-sm-4 col-form-label text-right">@lang('install.user.username')</label>
                     <div class="col-sm-6">
-                        <input type="text" class="form-control" name="username" id="username" value="{{ old('username') }}">
+                        <input type="text" class="form-control @error('username') is-invalid @enderror" name="username" id="username" value="{{ old('username') }}">
+                        @error('username')<div class="invalid-feedback">{{ $message }}</div>@enderror
                     </div>
                 </div>
                 <div class="form-row pb-3">
                     <label for="password" class="col-sm-4 col-form-label text-right">@lang('install.user.password')</label>
                     <div class="col-sm-6">
-                        <input type="password" class="form-control" name="password" id="password" value="{{ old('password') }}">
+                        <input type="password" class="form-control @error('password') is-invalid @enderror" name="password" id="password" value="{{ old('password') }}">
+                        @error('password')<div class="invalid-feedback">{{ $message }}</div>@enderror
                     </div>
                 </div>
                 <div class="form-row pb-3">
                     <label for="email" class="col-sm-4 col-form-label text-right">@lang('install.user.email')</label>
                     <div class="col-sm-6">
-                        <input type="email" class="form-control" name="email" id="email" value="{{ old('email') }}">
+                        <input type="email" class="form-control @error('email') is-invalid @enderror" name="email" id="email" value="{{ old('email') }}">
+                        @error('email')<div class="invalid-feedback">{{ $message }}</div>@enderror
                     </div>
                 </div>
                 <button type="submit" class="btn btn-success float-right">@lang('install.user.button')</button>