From bbabe4836b033816306992582d4e4b908b1172b8 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 23 Sep 2019 22:19:37 +1000
Subject: [PATCH] Fix DB search

---
 app/Http/Controllers/ClientPortal/InvitationController.php | 1 +
 app/Http/Middleware/SetDomainNameDb.php                    | 3 +--
 app/Libraries/MultiDB.php                                  | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/ClientPortal/InvitationController.php b/app/Http/Controllers/ClientPortal/InvitationController.php
index e49c063357d5..42114b2a77c5 100644
--- a/app/Http/Controllers/ClientPortal/InvitationController.php
+++ b/app/Http/Controllers/ClientPortal/InvitationController.php
@@ -33,6 +33,7 @@ class InvitationController extends Controller
     {
 
     	$invitation = InvoiceInvitation::whereInvitationKey($invitation_key)->first();
+//        $invitation = InvoiceInvitation::whereRaw("BINARY `invitation_key`= ?", [$invitation_key])->first();
 
     	if($invitation){
     		$invitation->markViewed();
diff --git a/app/Http/Middleware/SetDomainNameDb.php b/app/Http/Middleware/SetDomainNameDb.php
index e5605e312981..706444728446 100644
--- a/app/Http/Middleware/SetDomainNameDb.php
+++ b/app/Http/Middleware/SetDomainNameDb.php
@@ -26,13 +26,12 @@ class SetDomainNameDb
     
     public function handle($request, Closure $next)
     {
-
         $error['error'] = ['message' => 'Database could not be set'];
 
         /* 
          * Use the host name to set the active DB
          **/
-        if( $request->getHttpHost() && config('ninja.db.multi_db_enabled') && ! MultiDB::findAndSetDbByDomain($request->getHttpHost())) 
+        if( $request->getSchemeAndHttpHost() && config('ninja.db.multi_db_enabled') && ! MultiDB::findAndSetDbByDomain($request->getSchemeAndHttpHost())) 
         {
             if(request()->json)
                 return response()->json(json_encode($error, JSON_PRETTY_PRINT) ,403);
diff --git a/app/Libraries/MultiDB.php b/app/Libraries/MultiDB.php
index 92828f8f0cca..affa13c55453 100644
--- a/app/Libraries/MultiDB.php
+++ b/app/Libraries/MultiDB.php
@@ -143,13 +143,15 @@ class MultiDB
 
     public static function findAndSetDbByDomain($domain) :bool
     {
+\Log::error("searching for {$domain}");
 
         foreach (self::$dbs as $db)
         {
-
+$company = Company::on($db)->whereDomain($domain)->first();
+\Log::error($company);
             if($company = Company::on($db)->whereDomain($domain)->first()) 
             {
-
+\Log::error("setting db");
                 self::setDb($company->db);
                 return true;