Add user id and verification token to registration

Author: carlbennett

src/controllers/User/Register.php

@@ -148,12 +148,20 @@ protected function tryRegister(Router &$router, UserRegisterModel &$model) {
       }
     } catch (UserNotFoundException $e) {}
 
+    $user = null;
+    $user_id = null;
+
     try {
 
       $success = User::create(
         $email, $username, null, $pw1, User::DEFAULT_OPTION
       );
 
+      if ($success) {
+        $user = User::findIdByUsername($username);
+        $user_id = $user->getId();
+      }
+
     } catch (QueryException $e) {
 
       // SQL error occurred. We can show a friendly message to the user while
@@ -163,9 +171,14 @@ protected function tryRegister(Router &$router, UserRegisterModel &$model) {
     }
 
     if ($success) {
+      $state = new StdClass();
+
       $mail = new PHPMailer( true ); // true enables exceptions
       $mail_config = Common::$config->email;
 
+      $state->mail &= $mail;
+      $state->token = ( $user ? $user->getVerificationToken() : null );
+
       try {
         //Server settings
         $mail->Timeout = 10; // default is 300 per RFC2821 $ 4.5.3.2
@@ -206,7 +219,7 @@ protected function tryRegister(Router &$router, UserRegisterModel &$model) {
 
         Logger::logEvent(
           EventTypes::EMAIL_SENT,
-          null,
+          $user_id,
           getenv('REMOTE_ADDR'),
           json_encode([
             'from' => $mail->From,
@@ -231,7 +244,7 @@ protected function tryRegister(Router &$router, UserRegisterModel &$model) {
     }
     Logger::logEvent(
       EventTypes::USER_CREATED,
-      null,
+      $user_id,
       getenv("REMOTE_ADDR"),
       json_encode([
         "error"           => $model->error,