kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Code optimisations.

Browse Source
This commit is contained in:
James Cole
2018-07-22 18:50:27 +02:00
parent ea2c48bca5
commit ca096852a5
56 changed files with 221 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/Repositories/User/UserRepository.php
View File

@@ -25,6 +25,7 @@ namespace FireflyIII\Repositories\User;
use FireflyIII\Models\BudgetLimit;
use FireflyIII\Models\Role;
use FireflyIII\User;
use Illuminate\Database\QueryException;
use Illuminate\Support\Collection;
use Log;
@@ -49,9 +50,17 @@ class UserRepository implements UserRepositoryInterface
*/
public function attachRole(User $user, string $role): bool
{
$admin = Role::where('name', 'owner')->first();
$user->attachRole($admin);
$user->save();
$roleObject = Role::where('name', $role)->first();
if (null === $roleObject) {
return false;
}
try {
$user->roles()->attach($role);
} catch (QueryException $e) {
// don't care
Log::info(sprintf('Query exception when giving user a role: %s', $e->getMessage()));
}
return true;
}
@@ -76,8 +85,8 @@ class UserRepository implements UserRepositoryInterface
app('preferences')->setForUser($user, 'previous_email_' . date('Y-m-d-H-i-s'), $oldEmail);
// set undo and confirm token:
app('preferences')->setForUser($user, 'email_change_undo_token', (string)bin2hex(random_bytes(16)));
app('preferences')->setForUser($user, 'email_change_confirm_token', (string)bin2hex(random_bytes(16)));
app('preferences')->setForUser($user, 'email_change_undo_token', bin2hex(random_bytes(16)));
app('preferences')->setForUser($user, 'email_change_confirm_token', bin2hex(random_bytes(16)));
// update user
$user->email = $newEmail;
@@ -228,7 +237,7 @@ class UserRepository implements UserRepositoryInterface
$return['has_2fa'] = true;
}
$return['is_admin'] = $user->hasRole('owner');
$return['is_admin'] = $this->hasRole($user, 'owner');
$return['blocked'] = 1 === (int)$user->blocked;
$return['blocked_code'] = $user->blocked_code;
$return['accounts'] = $user->accounts()->count();
@@ -263,7 +272,14 @@ class UserRepository implements UserRepositoryInterface
*/
public function hasRole(User $user, string $role): bool
{
return $user->hasRole($role);
/** @var Role $userRole */
foreach ($user->roles as $userRole) {
if ($userRole->name === $role) {
return true;
}
}
return false;
}
/**