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

Add CompanyToken to Truth

Browse Source
This commit is contained in:
David Bomba 2022-03-13 20:26:45 +11:00
parent eb5e8bf60c
commit de10dae06a
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/Models/User.php
View File

@ -243,7 +243,7 @@ class User extends Authenticatable implements MustVerifyEmail
$truth = app()->make(TruthSource::class); $truth = app()->make(TruthSource::class);
if($truth->getCompanyUser()){ if($truth->getCompanyUser()){
return $truth->getCompany(); return $truth->getCompanyUser();
} }
return $this->token()->cu; return $this->token()->cu;
@ -259,24 +259,14 @@ class User extends Authenticatable implements MustVerifyEmail
// return $this->hasOneThrough(CompanyUser::class, CompanyToken::class, 'user_id', 'user_id', 'id', 'user_id') // return $this->hasOneThrough(CompanyUser::class, CompanyToken::class, 'user_id', 'user_id', 'id', 'user_id')
// ->withTrashed(); // ->withTrashed();
$truth = app()->make(TruthSource::class);
if($truth->getCompanyUser()){
return $truth->getCompanyUser();
}
return $this->token()->cu; return $this->token()->cu;
// return $this->hasOneThrough(CompanyUser::class, CompanyToken::class, 'user_id', 'user_id', 'id', 'user_id')
// ->withTrashed();
// if (request()->header('X-API-TOKEN')) {
// nlog("with an API token");
// nlog(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();
// }
} }
/** /**