Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-01 03:04:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for user company user resolution

Browse Source
This commit is contained in:
David Bomba 2022-03-16 11:12:12 +11:00
parent 17434b4caa
commit 197dde037e
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/UserController.php
View File

@ -380,7 +380,7 @@ class UserController extends BaseController
*/ */
public function update(UpdateUserRequest $request, User $user) public function update(UpdateUserRequest $request, User $user)
{ {
$old_company_user = $user->company_user; $old_company_user = $user->company_users()->where('company_id', auth()->user()->company()->id)->first();
$old_user = json_encode($user); $old_user = json_encode($user);
$old_user_email = $user->getOriginal('email'); $old_user_email = $user->getOriginal('email');
@ -395,14 +395,9 @@ class UserController extends BaseController
$user->save(); $user->save();
UserEmailChanged::dispatch($new_user, json_decode($old_user), auth()->user()->company()); UserEmailChanged::dispatch($new_user, json_decode($old_user), auth()->user()->company());
} }
$user->company_users()->update(["permissions_updated_at" => now()]);
if(
strcasecmp($old_company_user->permissions, $user->company_user->permissions) != 0 ||
$old_company_user->is_admin != $user->company_user->is_admin
){
$user->company_user()->update(["permissions_updated_at" => now()]);
}
event(new UserWasUpdated($user, auth()->user(), auth()->user()->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null))); event(new UserWasUpdated($user, auth()->user(), auth()->user()->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));

2
app/Models/User.php
View File

@ -202,9 +202,7 @@ class User extends Authenticatable implements MustVerifyEmail
return $company_token->company; return $company_token->company;
} }
// return false;
throw new \Exception('No Company Found'); throw new \Exception('No Company Found');
//return Company::find(config('ninja.company_id'));
} }
public function companyIsSet() public function companyIsSet()

2
tests/Feature/LoginTest.php
View File

@ -175,7 +175,7 @@ class LoginTest extends TestCase
$this->assertTrue($user->companies !== null); $this->assertTrue($user->companies !== null);
$this->assertTrue($user->company_users !== null); $this->assertTrue($user->company_users !== null);
$this->assertTrue($user->company_users->first() !== null); $this->assertTrue($user->company_users->first() !== null);
$this->assertTrue($user->company_user()->account !== null); $this->assertTrue($user->account !== null);
$this->assertEquals($user->email, 'test@example.com'); $this->assertEquals($user->email, 'test@example.com');
$this->assertTrue(\Hash::check('123456', $user->password)); $this->assertTrue(\Hash::check('123456', $user->password));