From ae8a61cbcd4e307b8bb901be9aea0b259fe876aa Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 27 Jun 2020 14:09:16 +1000
Subject: [PATCH] Fixes for tests

---
 app/Http/Requests/User/StoreUserRequest.php    | 13 +++++++++++--
 app/Models/User.php                            | 18 +++++++++++++++---
 .../components/general/footer.blade.php        |  2 +-
 tests/Feature/UserTest.php                     | 17 ++++++++++++-----
 4 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/app/Http/Requests/User/StoreUserRequest.php b/app/Http/Requests/User/StoreUserRequest.php
index ce8b5c9d6dae..ead2e5b1a76e 100644
--- a/app/Http/Requests/User/StoreUserRequest.php
+++ b/app/Http/Requests/User/StoreUserRequest.php
@@ -28,7 +28,15 @@ class StoreUserRequest extends Request
      */
 
     public function authorize() : bool
-    {
+    {   
+        // info(print_r(auth()->user()->toArray(),1));
+        // info(print_r(auth()->user()->company_user->toArray(),1));
+        // 
+                $queries = \DB::getQueryLog();
+                $count = count($queries);
+            
+                info(request()->method() . ' - ' . request()->url() . ": $count queries - ");
+
         return auth()->user()->isAdmin();
     }
 
@@ -43,8 +51,9 @@ class StoreUserRequest extends Request
             $rules['email'] = new ValidUserForCompany();
         }
 
-        if(auth()->user()->company()->account->isFreeHostedClient())
+        if(auth()->user()->company()->account->isFreeHostedClient()){
             $rules['hosted_users'] = new CanAddUserRule(auth()->user()->company()->account);
+        }
 
         return $rules;
     }
diff --git a/app/Models/User.php b/app/Models/User.php
index 73c14a4adedf..55e8550e1310 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -196,9 +196,21 @@ class User extends Authenticatable implements MustVerifyEmail
             $this->id = auth()->user()->id;
         }
 
-        return $this->hasOneThrough(CompanyUser::class, CompanyToken::class, 'user_id', 'company_id', 'id', 'company_id')
-        ->where('company_user.user_id', $this->id)
-        ->withTrashed();
+          return $this->hasOneThrough(CompanyUser::class, CompanyToken::class, 'user_id', 'company_id', 'id', 'company_id')
+            ->where('company_user.user_id', $this->id)
+            ->withTrashed();
+
+        // if(request()->header('X-API-TOKEN')){
+        //     return $this->hasOneThrough(CompanyUser::class, CompanyToken::class, 'user_id', 'company_id', 'id', 'company_id')
+        //     ->where('company_tokens.token', request()->header('X-API-TOKEN'))
+        //     ->withTrashed();
+        // }
+        // else {
+
+        //     return $this->hasOneThrough(CompanyUser::class, CompanyToken::class, 'user_id', 'company_id', 'id', 'company_id')
+        //     ->where('company_user.user_id', $this->id)
+        //     ->withTrashed();
+        // }
     }
 
     /**
diff --git a/resources/views/portal/ninja2020/components/general/footer.blade.php b/resources/views/portal/ninja2020/components/general/footer.blade.php
index 9b96d6e78a3e..f9933daa30fb 100644
--- a/resources/views/portal/ninja2020/components/general/footer.blade.php
+++ b/resources/views/portal/ninja2020/components/general/footer.blade.php
@@ -1,6 +1,6 @@
 <footer class="bg-white px-4 py-5 shadow px-4 sm:px-6 md:px-8 flex justify-center border border-gray-200 justify-between items-center">
     <span class="text-sm text-gray-700">{{ ctrans('texts.footer_label', ['year' => date('Y')])  }}</span>
-    @if(!auth()->user()->user->account->isPaid())
+    @if(auth()->user()->user && !auth()->user()->user->account->isPaid())
         <a href="#">
             <img class="h-8" src="{{ asset('images/invoiceninja-black-logo-2.png') }}" alt="Invoice Ninja Logo">
         </a>
diff --git a/tests/Feature/UserTest.php b/tests/Feature/UserTest.php
index aa86249793f0..2fde162e44c7 100644
--- a/tests/Feature/UserTest.php
+++ b/tests/Feature/UserTest.php
@@ -4,6 +4,7 @@ namespace Feature;
 
 use App\Factory\CompanyUserFactory;
 use App\Factory\UserFactory;
+use App\Http\Middleware\PasswordProtection;
 use App\Models\Account;
 use App\Models\Activity;
 use App\Models\Company;
@@ -35,17 +36,18 @@ class UserTest extends TestCase
     {
         parent::setUp();
 
-        $this->withoutMiddleware(
-            ThrottleRequests::class
-        );
-
         Session::start();
 
         $this->faker = \Faker\Factory::create();
 
+        $this->makeTestData();
+
         Model::reguard();
 
-        $this->makeTestData();
+        $this->withoutMiddleware(
+            ThrottleRequests::class,
+            PasswordProtection::class
+        );
 
     }
 
@@ -62,6 +64,8 @@ class UserTest extends TestCase
 
     public function testUserStore()
     {
+        $this->withoutMiddleware(PasswordProtection::class);
+        
         $data = [
             'first_name' => 'hey',
             'last_name' => 'you',
@@ -88,6 +92,8 @@ class UserTest extends TestCase
 
     public function testUserAttachAndDetach()
     {
+        $this->withoutMiddleware(PasswordProtection::class);
+
         $user = UserFactory::create($this->account->id);
         $user->first_name = 'Test';
         $user->last_name = 'Palloni';
@@ -124,6 +130,7 @@ class UserTest extends TestCase
 
     public function testAttachUserToMultipleCompanies()
     {
+        $this->withoutMiddleware(PasswordProtection::class);
 
         /* Create New Company */
         $company2 = factory(\App\Models\Company::class)->create([