Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

API fixes

Browse Source
This commit is contained in:
David Bomba 2019-09-11 20:15:44 +10:00
parent 6fc248ee51
commit 4536bc0566
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,9 @@ use App\Http\Controllers\Controller;
use App\Jobs\Account\CreateAccount; use App\Jobs\Account\CreateAccount;
use App\Libraries\MultiDB; use App\Libraries\MultiDB;
use App\Libraries\OAuth\OAuth; use App\Libraries\OAuth\OAuth;
use App\Models\CompanyUser;
use App\Models\User; use App\Models\User;
use App\Transformers\CompanyUserTransformer;
use App\Transformers\UserTransformer; use App\Transformers\UserTransformer;
use App\Utils\Traits\UserSessionAttributes; use App\Utils\Traits\UserSessionAttributes;
use Illuminate\Foundation\Auth\AuthenticatesUsers; use Illuminate\Foundation\Auth\AuthenticatesUsers;
@ -41,9 +43,9 @@ class LoginController extends BaseController
use AuthenticatesUsers; use AuthenticatesUsers;
use UserSessionAttributes; use UserSessionAttributes;
protected $entity_type = User::class; protected $entity_type = CompanyUser::class;
protected $entity_transformer = UserTransformer::class; protected $entity_transformer = CompanyUserTransformer::class;
/** /**
* Where to redirect users after login. * Where to redirect users after login.
@ -105,7 +107,10 @@ class LoginController extends BaseController
$user->setCompany($user->user_companies->first()->account->default_company); $user->setCompany($user->user_companies->first()->account->default_company);
return $this->itemResponse($this->guard()->user()); $ct = CompanyUser::whereUserId($user->id);
return $this->listResponse($ct);
//return $this->itemResponse($this->guard()->user());
} }
else { else {