From 3fc8374cb5fc9bd32ea7818faea9feeccb13b6c6 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 10 Dec 2020 21:28:19 +1100
Subject: [PATCH] Fixes for attempting to create a user with duplicate email

---
 app/Http/Requests/User/StoreUserRequest.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/Http/Requests/User/StoreUserRequest.php b/app/Http/Requests/User/StoreUserRequest.php
index 9b47bfe17476..abe486a05a16 100644
--- a/app/Http/Requests/User/StoreUserRequest.php
+++ b/app/Http/Requests/User/StoreUserRequest.php
@@ -17,6 +17,7 @@ use App\Http\Requests\Request;
 use App\Http\ValidationRules\ValidUserForCompany;
 use App\Libraries\MultiDB;
 use App\Models\User;
+use Illuminate\Validation\Rule;
 
 class StoreUserRequest extends Request
 {
@@ -37,9 +38,11 @@ class StoreUserRequest extends Request
         $rules['first_name'] = 'required|string|max:100';
         $rules['last_name'] = 'required|string|max:100';
 
-        if (config('ninja.db.multi_db_enabled')) {
-            $rules['email'] = new ValidUserForCompany();
-        }
+        if (config('ninja.db.multi_db_enabled')) 
+            $rules['email'] = [new ValidUserForCompany(), Rule::unique('users')];
+        else
+            $rules['email'] = Rule::unique('users');
+
 
         if (auth()->user()->company()->account->isFreeHostedClient()) {
             $rules['hosted_users'] = new CanAddUserRule(auth()->user()->company()->account);