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

Fixes for login refactory

Browse Source
This commit is contained in:
David Bomba 2022-05-06 09:29:45 +10:00
parent ba5037c6da
commit 964563dce4
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Http/Controllers/Auth/LoginController.php
View File

@ -372,29 +372,26 @@ class LoginController extends BaseController
private function hydrateCompanyUser() :Builder private function hydrateCompanyUser() :Builder
{ {
$cu = CompanyUser::query() $cu = CompanyUser::query()->where('user_id', auth()->user()->id);
->where('user_id', auth()->user()->id)
->where('company_id', auth()->user()->account->default_company_id);
if($cu->exists()) if(CompanyUser::query()->where('user_id', auth()->user()->id)->where('company_id', auth()->user()->account->default_company_id)->exists())
$set_company = auth()->user()->account->default_company; $set_company = auth()->user()->account->default_company;
else{ else{
$cu = CompanyUser::query()->where('user_id', auth()->user()->id); $set_company = $cu->first()->company;
$set_company = $cu->company;
} }
auth()->user()->setCompany($set_company); auth()->user()->setCompany($set_company);
$this->setLoginCache(auth()->user()); $this->setLoginCache(auth()->user());
if($cu->count() == 0)
return $cu;
$truth = app()->make(TruthSource::class); $truth = app()->make(TruthSource::class);
$truth->setCompanyUser($cu->first()); $truth->setCompanyUser($cu->first());
$truth->setUser(auth()->user()); $truth->setUser(auth()->user());
$truth->setCompany($set_company); $truth->setCompany($set_company);
if($cu->count() == 0)
return $cu;
if(auth()->user()->company_users()->count() != auth()->user()->tokens()->count()) if(auth()->user()->company_users()->count() != auth()->user()->tokens()->count())
{ {