From 8471c2689f7a8b7883b1a3de2ba2abbc20f5172b Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 16 Sep 2020 09:56:10 +1000
Subject: [PATCH] Fix for user_confirmation code

---
 app/Http/Controllers/UserController.php        | 3 +++
 app/Listeners/SendVerificationNotification.php | 4 ++++
 app/Repositories/UserRepository.php            | 7 +++++++
 3 files changed, 14 insertions(+)

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 32d28e405066..b29221269590 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -15,6 +15,7 @@ use App\DataMapper\CompanySettings;
 use App\DataMapper\DefaultSettings;
 use App\Events\User\UserEmailAddressChangedNewEmail;
 use App\Events\User\UserEmailAddressChangedOldEmail;
+use App\Events\User\UserWasCreated;
 use App\Factory\UserFactory;
 use App\Filters\UserFilters;
 use App\Http\Controllers\Traits\VerifiesUserEmail;
@@ -204,6 +205,8 @@ class UserController extends BaseController
 
         $ct = CreateCompanyToken::dispatchNow($company, $user, $user_agent);
 
+        event(new UserWasCreated($user, $company, Ninja::eventVars()));
+
         return $this->itemResponse($user->fresh());
     }
 
diff --git a/app/Listeners/SendVerificationNotification.php b/app/Listeners/SendVerificationNotification.php
index cb4b6ce919dc..b8205f7b7139 100644
--- a/app/Listeners/SendVerificationNotification.php
+++ b/app/Listeners/SendVerificationNotification.php
@@ -50,7 +50,11 @@ class SendVerificationNotification implements ShouldQueue
             $event->user->notify(new VerifyUser($event->user));
 
             Ninja::registerNinjaUser($event->user);
+
         } catch (\Exception $e) {
+            
+            info("I couldn't send the email " . $e->getMessage());
+
         }
     }
 }
diff --git a/app/Repositories/UserRepository.php b/app/Repositories/UserRepository.php
index 16e9d34ddc70..012423b67470 100644
--- a/app/Repositories/UserRepository.php
+++ b/app/Repositories/UserRepository.php
@@ -17,6 +17,7 @@ use App\Factory\CompanyUserFactory;
 use App\Models\CompanyUser;
 use App\Models\User;
 use App\Utils\Ninja;
+use App\Utils\Traits\MakesHash;
 use Illuminate\Http\Request;
 
 /**
@@ -24,6 +25,8 @@ use Illuminate\Http\Request;
  */
 class UserRepository extends BaseRepository
 {
+    use MakesHash;
+
     /**
      * Gets the class name.
      *
@@ -66,6 +69,10 @@ class UserRepository extends BaseRepository
         }
 
         $user->fill($details);
+
+        if(!$user->confirmation_code)
+            $user->confirmation_code = $this->createDbHash(config('database.default'));
+
         $user->account_id = $account->id;
         $user->save();