UI/UX improvements

src/App/Users/Actions/CreateNewUserAction.php

@@ -5,20 +5,17 @@ use App\Users\Models\User;
 use App\Users\DTO\CreateUserData;
 use App\Http\Controllers\Controller;
 use Illuminate\Auth\Events\Registered;
-use Illuminate\Contracts\Auth\StatefulGuard;
 
 class CreateNewUserAction extends Controller
 {
     public function __construct(
-        protected StatefulGuard $guard,
         protected AutoSubscribeForMeteredBillingAction $autoSubscribeForMeteredBilling,
-    ) {
-    }
+    ) {}
 
     /**
      * Validate and create a new user.
      */
-    public function __invoke(CreateUserData $data)
+    public function __invoke(CreateUserData $data): User
     {
         $settings = get_settings([
             'user_verification', 'subscription_type',
@@ -53,9 +50,6 @@ class CreateNewUserAction extends Controller
 
         event(new Registered($user));
 
-        // Log in if verification is disabled
-        if (! $data->password || ! intval($settings['user_verification'])) {
-            $this->guard->login($user);
-        }
+        return $user;
     }
 }

src/App/Users/Controllers/Authentication/RegisterUserController.php

@@ -5,11 +5,13 @@ use App\Users\DTO\CreateUserData;
 use App\Http\Controllers\Controller;
 use App\Users\Actions\CreateNewUserAction;
 use App\Users\Requests\RegisterUserRequest;
+use Illuminate\Contracts\Auth\StatefulGuard;
 
 class RegisterUserController extends Controller
 {
     public function __construct(
-        public CreateNewUserAction $createNewUser,
+        protected CreateNewUserAction $createNewUser,
+        protected StatefulGuard $guard,
     ) {
     }
     
@@ -27,7 +29,12 @@ class RegisterUserController extends Controller
         $data = CreateUserData::fromRequest($request);
 
         // Register user
-        ($this->createNewUser)($data);
+        $user = ($this->createNewUser)($data);
+
+        // Log in if verification is disabled
+        if (! $user->password || ! intval(get_settings('user_verification'))) {
+            $this->guard->login($user);
+        }
 
         return response('User successfully registered.', 201);
     }

src/App/Users/DTO/CreateUserData.php

@@ -29,7 +29,7 @@ class CreateUserData extends DataTransferObject
             'email'           => $array['email'],
             'avatar'          => $array['avatar'],
             'password'        => $array['password'] ?? null,
-            'oauth_provider'  => $array['oauth_provider'],
+            'oauth_provider'  => $array['oauth_provider'] ?? null,
         ]);
     }
 }

src/App/Users/Models/User.php

@@ -30,6 +30,7 @@ use VueFileManager\Subscription\App\User\Traits\Billable;
  * @property string email
  * @property mixed favouriteFolders
  * @property string role
+ * @property string email_verified_at
  * @method static count()
  * @method static sortable(string[] $array)
  * @method static forceCreate(array $array)

src/Domain/Admin/Controllers/Users/UserController.php

@@ -1,6 +1,9 @@
 <?php
+
 namespace Domain\Admin\Controllers\Users;
 
+use App\Users\Actions\CreateNewUserAction;
+use App\Users\DTO\CreateUserData;
 use App\Users\Models\User;
 use Illuminate\Http\Response;
 use App\Http\Controllers\Controller;
@@ -10,6 +13,10 @@ use Domain\Admin\Requests\CreateUserByAdmin;
 
 class UserController extends Controller
 {
+    public function __construct(
+        protected CreateNewUserAction $createNewUser,
+    ) {}
+
     /**
      * Get all users
      */
@@ -34,24 +41,22 @@ class UserController extends Controller
      */
     public function store(CreateUserByAdmin $request): Response
     {
-        // Create user
-        $user = User::forceCreate([
-            'password'          => bcrypt($request->input('password')),
-            'role'              => $request->input('role'),
-            'email'             => $request->input('email'),
-            'email_verified_at' => now(),
+        // Map user data
+        $data = CreateUserData::fromArray([
+            'name'     => $request->input('name'),
+            'email'    => $request->input('email'),
+            'password' => $request->input('password'),
+            'avatar'   => store_avatar($request, 'avatar'),
         ]);
 
-        // Split username
-        $name = split_name($request->input('name'));
+        // Register user
+        $user = ($this->createNewUser)($data);
 
-        $user
-            ->settings()
-            ->create([
-                'avatar'     => store_avatar($request, 'avatar'),
-                'first_name' => $name['first_name'],
-                'last_name'  => $name['last_name'],
-            ]);
+        // Update user data
+        $user->email_verified_at = now();
+        $user->role = $request->input('role');
+
+        $user->save();
 
         return response(new UserResource($user), 201);
     }

src/Domain/Admin/Requests/CreateUserByAdmin.php

@@ -26,7 +26,6 @@ class CreateUserByAdmin extends FormRequest
             'email'              => 'required|string|email|max:255|unique:users',
             'password'           => 'required|string|min:6|confirmed',
             'name'               => 'required|string|max:255',
-            'max_storage_amount' => 'required|digits_between:1,9',
             'role'               => 'required|string',
             'avatar'             => 'sometimes|file',
         ];

src/Support/helpers.php

@@ -312,10 +312,11 @@ if (! function_exists('split_name')) {
     function split_name(string $name): array
     {
         $firstName = explode(' ', $name)[0];
+        $lastName = str_replace("$firstName ", '', $name);
 
         return [
             'first_name' => $firstName,
-            'last_name'  => str_replace("$firstName ", '', $name),
+            'last_name'  => $lastName !== $firstName ? $lastName : null,
         ];
     }
 }