Fix user creation to use UUIDs correctly

Also updates the notification send method to be cleaner and more maintainable

Author: DaneEveritt

app/Http/Requests/Admin/UserFormRequest.php

@@ -7,34 +7,21 @@
 class UserFormRequest extends AdminFormRequest
 {
     /**
-     * {@inheritdoc}
+     * Rules to apply to requests for updating or creating a user
+     * in the Admin CP.
      */
     public function rules()
     {
+        $rules = collect(User::getCreateRules());
         if ($this->method() === 'PATCH') {
-            $rules = User::getUpdateRulesForId($this->route()->parameter('user')->id);
-
-            return array_merge($rules, [
-                'ignore_connection_error' => 'sometimes|nullable|boolean',
+            $rules = collect(User::getUpdateRulesForId($this->route()->parameter('user')->id))->merge([
+                'ignore_connection_error' => ['sometimes', 'nullable', 'boolean'],
             ]);
         }
 
-        return User::getCreateRules();
-    }
-
-    /**
-     * @param array|null $only
-     * @return array
-     */
-    public function normalize(array $only = null)
-    {
-        if ($this->method === 'PATCH') {
-            return array_merge(
-                $this->all(['password']),
-                $this->only(['email', 'username', 'name_first', 'name_last', 'root_admin', 'language', 'ignore_connection_error'])
-            );
-        }
-
-        return parent::normalize();
+        return $rules->only([
+            'email', 'username', 'name_first', 'name_last', 'password',
+            'language', 'ignore_connection_error', 'root_admin',
+        ])->toArray();
     }
 }

app/Models/User.php

@@ -115,6 +115,7 @@ class User extends Model implements
      * @var array
      */
     protected static $applicationRules = [
+        'uuid' => 'required',
         'email' => 'required',
         'username' => 'required',
         'name_first' => 'required',
@@ -130,6 +131,7 @@ class User extends Model implements
      * @var array
      */
     protected static $dataIntegrityRules = [
+        'uuid' => 'string|size:36|unique:users,uuid',
         'email' => 'email|unique:users,email',
         'username' => 'alpha_dash|between:1,255|unique:users,username',
         'name_first' => 'string|between:1,255',

app/Notifications/AccountCreated.php

@@ -1,14 +1,8 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Notifications;
 
+use Pterodactyl\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Notifications\Notification;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -19,7 +13,15 @@ class AccountCreated extends Notification implements ShouldQueue
     use Queueable;
 
     /**
-     * The password reset token to send.
+     * The authentication token to be used for the user to set their
+     * password for the first time.
+     *
+     * @var string|null
+     */
+    public $token;
+
+    /**
+     * The user model for the created user.
      *
      * @var object
      */
@@ -28,11 +30,13 @@ class AccountCreated extends Notification implements ShouldQueue
     /**
      * Create a new notification instance.
      *
-     * @param aray $user
+     * @param \Pterodactyl\Models\User $user
+     * @param string|null              $token
      */
-    public function __construct(array $user)
+    public function __construct(User $user, string $token = null)
     {
-        $this->user = (object) $user;
+        $this->token = $token;
+        $this->user = $user;
     }
 
     /**
@@ -56,12 +60,12 @@ public function toMail($notifiable)
     {
         $message = (new MailMessage)
             ->greeting('Hello ' . $this->user->name . '!')
-            ->line('You are recieving this email because an account has been created for you on Pterodactyl Panel.')
+            ->line('You are recieving this email because an account has been created for you on ' . config('app.name') . '.')
             ->line('Username: ' . $this->user->username)
-            ->line('Email: ' . $notifiable->email);
+            ->line('Email: ' . $this->user->email);
 
-        if (! is_null($this->user->token)) {
-            return $message->action('Setup Your Account', url('/auth/password/reset/' . $this->user->token . '?email=' . $notifiable->email));
+        if (! is_null($this->token)) {
+            return $message->action('Setup Your Account', url('/auth/password/reset/' . $this->token . '?email=' . $this->user->email));
         }
 
         return $message;

app/Services/Users/UserCreationService.php

@@ -1,77 +1,52 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Services\Users;
 
 use Ramsey\Uuid\Uuid;
-use Illuminate\Foundation\Application;
 use Illuminate\Contracts\Hashing\Hasher;
 use Illuminate\Database\ConnectionInterface;
-use Illuminate\Notifications\ChannelManager;
 use Pterodactyl\Notifications\AccountCreated;
 use Pterodactyl\Services\Helpers\TemporaryPasswordService;
 use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
 
 class UserCreationService
 {
-    /**
-     * @var \Illuminate\Foundation\Application
-     */
-    protected $app;
-
     /**
      * @var \Illuminate\Database\ConnectionInterface
      */
-    protected $connection;
+    private $connection;
 
     /**
      * @var \Illuminate\Contracts\Hashing\Hasher
      */
-    protected $hasher;
-
-    /**
-     * @var \Illuminate\Notifications\ChannelManager
-     */
-    protected $notification;
+    private $hasher;
 
     /**
      * @var \Pterodactyl\Services\Helpers\TemporaryPasswordService
      */
-    protected $passwordService;
+    private $passwordService;
 
     /**
      * @var \Pterodactyl\Contracts\Repository\UserRepositoryInterface
      */
-    protected $repository;
+    private $repository;
 
     /**
      * CreationService constructor.
      *
-     * @param \Illuminate\Foundation\Application                        $application
-     * @param \Illuminate\Notifications\ChannelManager                  $notification
      * @param \Illuminate\Database\ConnectionInterface                  $connection
      * @param \Illuminate\Contracts\Hashing\Hasher                      $hasher
      * @param \Pterodactyl\Services\Helpers\TemporaryPasswordService    $passwordService
      * @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface $repository
      */
     public function __construct(
-        Application $application,
-        ChannelManager $notification,
         ConnectionInterface $connection,
         Hasher $hasher,
         TemporaryPasswordService $passwordService,
         UserRepositoryInterface $repository
     ) {
-        $this->app = $application;
         $this->connection = $connection;
         $this->hasher = $hasher;
-        $this->notification = $notification;
         $this->passwordService = $passwordService;
         $this->repository = $repository;
     }
@@ -97,20 +72,13 @@ public function handle(array $data)
             $token = $this->passwordService->handle($data['email']);
         }
 
+        /** @var \Pterodactyl\Models\User $user */
         $user = $this->repository->create(array_merge($data, [
             'uuid' => Uuid::uuid4()->toString(),
-        ]));
+        ]), true, true);
 
         $this->connection->commit();
-
-        // @todo fire event, handle notification there
-        $this->notification->send($user, $this->app->makeWith(AccountCreated::class, [
-            'user' => [
-                'name' => $user->name_first,
-                'username' => $user->username,
-                'token' => $token ?? null,
-            ],
-        ]));
+        $user->notify(new AccountCreated($user, $token ?? null));
 
         return $user;
     }