diff --git a/app/Http/Middleware/TokenAuth.php b/app/Http/Middleware/TokenAuth.php index 743cb9da5e14..53924c89cc17 100644 --- a/app/Http/Middleware/TokenAuth.php +++ b/app/Http/Middleware/TokenAuth.php @@ -58,6 +58,7 @@ class TokenAuth $truth->setCompanyUser($company_token->cu); $truth->setUser($company_token->user); $truth->setCompany($company_token->company); + $truth->setCompanyToken($company_token); /* | diff --git a/app/Models/User.php b/app/Models/User.php index c8bbb0899677..4475288f8552 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -145,6 +145,12 @@ class User extends Authenticatable implements MustVerifyEmail public function token() { + $truth = app()->make(TruthSource::class); + + if($truth->getCompanyToken()){ + return $truth->getCompanyToken(); + } + if (request()->header('X-API-TOKEN')) { return CompanyToken::with(['cu'])->where('token', request()->header('X-API-TOKEN'))->first(); } diff --git a/app/Utils/TruthSource.php b/app/Utils/TruthSource.php index ed4f3b3c734d..1e2841a38c22 100644 --- a/app/Utils/TruthSource.php +++ b/app/Utils/TruthSource.php @@ -21,6 +21,7 @@ class TruthSource public $company_user; + public $company_token; public function setCompanyUser($company_user) { @@ -39,6 +40,13 @@ class TruthSource return $this; } + public function setCompanyToken($company_token) + { + $this->company_token = $company_token; + return $this; + } + + public function getCompany() { return $this->company; @@ -53,4 +61,10 @@ class TruthSource { return $this->user; } + + public function getCompanyToken() + { + return $this->company_token; + } + }