From f2756799d1c58d9d540120057966e3709679ee94 Mon Sep 17 00:00:00 2001
From: = <turbo124@gmail.com>
Date: Wed, 1 Sep 2021 17:01:39 +1000
Subject: [PATCH 1/2] minor fixes

---
 app/Http/Controllers/Auth/ContactLoginController.php | 11 ++++++++++-
 app/Http/ViewComposers/PortalComposer.php            |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Auth/ContactLoginController.php b/app/Http/Controllers/Auth/ContactLoginController.php
index 37530b5fb6b8..4f4eaf1131d6 100644
--- a/app/Http/Controllers/Auth/ContactLoginController.php
+++ b/app/Http/Controllers/Auth/ContactLoginController.php
@@ -13,6 +13,7 @@ namespace App\Http\Controllers\Auth;
 
 use App\Events\Contact\ContactLoggedIn;
 use App\Http\Controllers\Controller;
+use App\Libraries\MultiDB;
 use App\Models\Account;
 use App\Models\ClientContact;
 use App\Models\Company;
@@ -40,8 +41,16 @@ class ContactLoginController extends Controller
             $company = null;
         }elseif (strpos($request->getHost(), 'invoicing.co') !== false) {
             $subdomain = explode('.', $request->getHost())[0];
+
+            MultiDB::findAndSetDbByDomain(['subdomain' => $subdomain]);
+
             $company = Company::where('subdomain', $subdomain)->first();
-        } elseif(Ninja::isHosted() && $company = Company::where('portal_domain', $request->getSchemeAndHttpHost())->first()){
+            
+        } elseif(Ninja::isHosted()){
+
+            MultiDB::findAndSetDbByDomain(['portal_domain' => $request->getSchemeAndHttpHost()]);
+
+            $company = Company::where('portal_domain', $request->getSchemeAndHttpHost())->first();
 
         }
         elseif (Ninja::isSelfHost()) {
diff --git a/app/Http/ViewComposers/PortalComposer.php b/app/Http/ViewComposers/PortalComposer.php
index 3c70aa695aba..e5be85883ea4 100644
--- a/app/Http/ViewComposers/PortalComposer.php
+++ b/app/Http/ViewComposers/PortalComposer.php
@@ -79,7 +79,7 @@ class PortalComposer
         $data['currencies'] = TranslationHelper::getCurrencies();
         $data['contact'] = auth('contact')->user();
 
-        $data['multiple_contacts'] = session()->get('multiple_contacts');
+        $data['multiple_contacts'] = session()->get('multiple_contacts') ?: collect();
 
         return $data;
     }

From 5c609f91f1c6843e748cf2c61080f6e276205e82 Mon Sep 17 00:00:00 2001
From: = <turbo124@gmail.com>
Date: Wed, 1 Sep 2021 17:36:36 +1000
Subject: [PATCH 2/2] Fixes for client portal login

---
 app/Http/Controllers/Auth/ContactLoginController.php  | 5 ++++-
 resources/views/portal/ninja2020/auth/login.blade.php | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Auth/ContactLoginController.php b/app/Http/Controllers/Auth/ContactLoginController.php
index 4f4eaf1131d6..057adf6448e7 100644
--- a/app/Http/Controllers/Auth/ContactLoginController.php
+++ b/app/Http/Controllers/Auth/ContactLoginController.php
@@ -45,7 +45,7 @@ class ContactLoginController extends Controller
             MultiDB::findAndSetDbByDomain(['subdomain' => $subdomain]);
 
             $company = Company::where('subdomain', $subdomain)->first();
-            
+
         } elseif(Ninja::isHosted()){
 
             MultiDB::findAndSetDbByDomain(['portal_domain' => $request->getSchemeAndHttpHost()]);
@@ -70,6 +70,9 @@ class ContactLoginController extends Controller
     {
         Auth::shouldUse('contact');
 
+        if(Ninja::isHosted() && $request->has('db'))
+            MultiDB::setDb($request->input('db'));
+
         $this->validateLogin($request);
         // If the class is using the ThrottlesLogins trait, we can automatically throttle
         // the login attempts for this application. We'll key this by the username and
diff --git a/resources/views/portal/ninja2020/auth/login.blade.php b/resources/views/portal/ninja2020/auth/login.blade.php
index ec2e188f8ff3..69b1ff0a7183 100644
--- a/resources/views/portal/ninja2020/auth/login.blade.php
+++ b/resources/views/portal/ninja2020/auth/login.blade.php
@@ -52,6 +52,9 @@
                                 <a class="text-xs text-gray-600 hover:text-gray-800 ease-in duration-100"
                                    href="{{ route('client.password.request') }}">{{ trans('texts.forgot_password') }}</a>
                             </div>
+                            @if($company)
+                            <input type="hidden" name="db" value="{{$company->db}}">
+                            @endif
                             <input type="password" name="password" id="password"
                                    class="input"
                                    autofocus>