diff --git a/app/Http/Middleware/TokenAuth.php b/app/Http/Middleware/TokenAuth.php index 4778719a04f2..a280d1439239 100644 --- a/app/Http/Middleware/TokenAuth.php +++ b/app/Http/Middleware/TokenAuth.php @@ -31,7 +31,7 @@ class TokenAuth */ public function handle($request, Closure $next) { - if ($request->header('X-API-TOKEN') && ($company_token = CompanyToken::with(['user', 'company', 'cu'])->where('token', $request->header('X-API-TOKEN'))->first())) { + if ($request->header('X-API-TOKEN') && ($company_token = CompanyToken::with(['user', 'company'])->where('token', $request->header('X-API-TOKEN'))->first())) { $user = $company_token->user; diff --git a/app/Models/CompanyToken.php b/app/Models/CompanyToken.php index 72c57361f251..2a4e941d2939 100644 --- a/app/Models/CompanyToken.php +++ b/app/Models/CompanyToken.php @@ -59,6 +59,13 @@ class CompanyToken extends BaseModel public function cu() { - return $this->hasOneThrough(CompanyUser::class, Company::class, 'id', 'company_id', 'company_id', 'id'); + return $this->hasOne(CompanyUser::class, 'user_id', 'user_id') + ->where('company_id', $this->company_id) + ->where('user_id', $this->user_id); + + // return $this->company_user; + // return $this->belongsTo(CompanyUser::class)->where('user_id', $this->user_id); + + // return $this->hasOneThrough(CompanyUser::class, Company::class, 'id', 'company_id', 'company_id', 'id'); } }