From 28e3defc83cea50a38fc6f967109440b95c55aae Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 24 Jun 2021 18:42:45 +1000 Subject: [PATCH] Fixes for dissociated default_company --- app/Http/Controllers/Auth/LoginController.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index b806f69675cd..5a191d928eae 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -201,6 +201,14 @@ class LoginController extends BaseController ->header('X-Api-Version', config('ninja.minimum_client_version')); } + /* If for some reason we lose state on the default company ie. a company is deleted - always make sure we can default to a company*/ + if(!$user->account->default_company){ + $account = $user->account; + $account->default_company_id = $user->companies->first()->id; + $account->save(); + $user = $user->fresh(); + } + $user->setCompany($user->account->default_company); $this->setLoginCache($user);