Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor login route

Browse Source
This commit is contained in:
= 2020-08-08 09:50:32 +10:00
parent e6afbb3bcf
commit 6751654216
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,7 @@ use App\Jobs\Account\CreateAccount;
use App\Libraries\MultiDB;
use App\Libraries\OAuth\OAuth;
use App\Libraries\OAuth\Providers\Google;
use App\Models\CompanyToken;
use App\Models\CompanyUser;
use App\Models\User;
use App\Transformers\CompanyUserTransformer;
@ -177,9 +178,13 @@ class LoginController extends BaseController
->increment()
->batch();
$user = $this->guard()->user();
$company_token = CompanyToken::with(['user','company'])
->whereRaw("BINARY `token`= ?", [$request->header('X-API-TOKEN')])
->first();
$user = $company_token->user;
$user->setCompany($user->company_user->account->default_company);
$user->setCompany($company_token->company);
// $ct = CompanyUser::whereUserId($user->id)->with('company');
$ct = CompanyUser::whereUserId($user->id);

8
app/Models/CompanyToken.php
View File

@ -49,4 +49,12 @@ class CompanyToken extends BaseModel
{
return $this->belongsTo(Company::class);
}
public function company_user()
{
return $this->hasOne(CompanyUser::class,'user_id','user_id')
->where('company_id', $this->company_id)
->where('user_id', $this->user_id);
}
}