From 542a63707ab55ce52577269dcbec99884a02cbd2 Mon Sep 17 00:00:00 2001
From: David Bomba <davidbomba@Davids-iMac.local>
Date: Wed, 5 Jun 2019 14:06:27 +1000
Subject: [PATCH] unique email check

---
 .../Requests/Account/CreateAccountRequest.php |  6 +--
 app/Http/Requests/User/StoreUserRequest.php   |  3 +-
 .../ValidationRules/NewUniqueUserRule.php     | 52 +++++++++++++++++++
 3 files changed, 56 insertions(+), 5 deletions(-)
 create mode 100644 app/Http/ValidationRules/NewUniqueUserRule.php

diff --git a/app/Http/Requests/Account/CreateAccountRequest.php b/app/Http/Requests/Account/CreateAccountRequest.php
index bb69db41a951..5c2020aacaef 100644
--- a/app/Http/Requests/Account/CreateAccountRequest.php
+++ b/app/Http/Requests/Account/CreateAccountRequest.php
@@ -12,9 +12,7 @@
 namespace App\Http\Requests\Account;
 
 use App\Http\Requests\Request;
-use App\Http\ValidationRules\UniqueUserRule;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Hash;
+use App\Http\ValidationRules\NewUniqueUserRule;
 
 class CreateAccountRequest extends Request
 {
@@ -41,7 +39,7 @@ class CreateAccountRequest extends Request
             'first_name'        => 'required|string|max:100',
             'last_name'         =>  'required|string:max:100',
             'password'          => 'required|string|min:6',
-            'email'             => new UniqueUserRule(),
+            'email'             => new NewUniqueUserRule(),
             'privacy_policy'    => 'required',
             'terms_of_service'  => 'required'
         ];
diff --git a/app/Http/Requests/User/StoreUserRequest.php b/app/Http/Requests/User/StoreUserRequest.php
index 398386fbbc54..d5a025dbff6b 100644
--- a/app/Http/Requests/User/StoreUserRequest.php
+++ b/app/Http/Requests/User/StoreUserRequest.php
@@ -12,6 +12,7 @@
 namespace App\Http\Requests\User;
 
 use App\Http\Requests\Request;
+use App\Http\ValidationRules\NewUniqueUserRule;
 use App\Models\User;
 
 class StoreUserRequest extends Request
@@ -32,7 +33,7 @@ class StoreUserRequest extends Request
         return [
             'first_name' => 'required|string|max:100',
             'last_name' =>  'required|string:max:100',
-            'email' => new UniqueUserRule(),
+            'email' => new NewUniqueUserRule(),
         ];
     }
 
diff --git a/app/Http/ValidationRules/NewUniqueUserRule.php b/app/Http/ValidationRules/NewUniqueUserRule.php
new file mode 100644
index 000000000000..816b3b3f1281
--- /dev/null
+++ b/app/Http/ValidationRules/NewUniqueUserRule.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com)
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Http\ValidationRules;
+
+use App\Libraries\MultiDB;
+use App\Models\User;
+use Illuminate\Contracts\Validation\Rule;
+
+/**
+ * Class NewUniqueUserRule
+ * @package App\Http\ValidationRules
+ */
+class NewUniqueUserRule implements Rule
+{
+
+    /**
+     * @param string $attribute
+     * @param mixed $value
+     * @return bool
+     */
+    public function passes($attribute, $value)
+    {
+        return ! $this->checkIfEmailExists($value); //if it exists, return false!
+    }
+
+    /**
+     * @return string
+     */
+    public function message()
+    {
+        return ctrans('texts.email_already_register');
+    }
+
+    /**
+     * @param $email
+     * @return bool
+     */
+    private function checkIfEmailExists($email) : bool
+    {
+        return MultiDB::checkUserEmailExists($email);
+    }
+
+}