tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Wind back changes to login route

Browse source
This commit is contained in:
= 2020-08-08 09:58:10 +10:00
parent 6751654216
commit 1be45a4e38
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Http/Controllers/Auth/LoginController.php
View file

@ -19,7 +19,6 @@ 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;
@ -178,15 +177,10 @@ class LoginController extends BaseController
->increment()
->batch();
$company_token = CompanyToken::with(['user','company'])
->whereRaw("BINARY `token`= ?", [$request->header('X-API-TOKEN')])
->first();
$user = $company_token->user;
$user = $this->guard()->user();
$user->setCompany($company_token->company);
$user->setCompany($user->company_user->account->default_company);
// $ct = CompanyUser::whereUserId($user->id)->with('company');
$ct = CompanyUser::whereUserId($user->id);
return $this->listResponse($ct);