Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-04 02:54:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add withTrashed() when searching for MultiDB users

Browse Source
This commit is contained in:
David Bomba 2021-09-06 08:21:22 +10:00
parent ddf6e94c43
commit e914447097
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Libraries/MultiDB.php
View File

@ -73,12 +73,12 @@ class MultiDB
public static function checkUserEmailExists($email) : bool public static function checkUserEmailExists($email) : bool
{ {
if (! config('ninja.db.multi_db_enabled')) if (! config('ninja.db.multi_db_enabled'))
return User::where(['email' => $email])->exists(); // true >= 1 emails found / false -> == emails found return User::where(['email' => $email])->withTrashed()->exists(); // true >= 1 emails found / false -> == emails found
$current_db = config('database.default'); $current_db = config('database.default');
foreach (self::$dbs as $db) { foreach (self::$dbs as $db) {
if (User::on($db)->where(['email' => $email])->exists()) { // if user already exists, validation will fail if (User::on($db)->where(['email' => $email])->withTrashed()->exists()) { // if user already exists, validation will fail
self::setDb($current_db); self::setDb($current_db);
return true; return true;
} }
@ -107,7 +107,7 @@ class MultiDB
$current_db = config('database.default'); $current_db = config('database.default');
foreach (self::$dbs as $db) { foreach (self::$dbs as $db) {
if (User::on($db)->where(['email' => $email])->exists()) { if (User::on($db)->where(['email' => $email])->withTrashed()->exists()) {
if (Company::on($db)->where(['company_key' => $company_key])->exists()) { if (Company::on($db)->where(['company_key' => $company_key])->exists()) {
self::setDb($current_db); self::setDb($current_db);
return true; return true;
@ -196,7 +196,7 @@ class MultiDB
//multi-db active //multi-db active
foreach (self::$dbs as $db) { foreach (self::$dbs as $db) {
if (User::on($db)->where('email', $email)->exists()){ if (User::on($db)->where('email', $email)->withTrashed()->exists()){
self::setDb($db); self::setDb($db);
return true; return true;
} }