IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Improve code quality.

Browse Source
This commit is contained in:
James Cole
2018-07-09 19:24:08 +02:00
parent 76386dad7d
commit 5665f127aa
55 changed files with 278 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/Http/Controllers/ProfileController.php
View File

@@ -39,6 +39,7 @@ use FireflyIII\User;
use Google2FA;
use Hash;
use Illuminate\Contracts\Auth\Guard;
use Illuminate\Support\Collection;
use Laravel\Passport\ClientRepository;
use Laravel\Passport\Passport;
use Log;
@@ -123,6 +124,7 @@ class ProfileController extends Controller
public function confirmEmailChange(UserRepositoryInterface $repository, string $token)
{
// find preference with this token value.
/** @var Collection $set */
$set = Preferences::findByName('email_change_confirm_token');
$user = null;
Log::debug(sprintf('Found %d preferences', $set->count()));
@@ -179,7 +181,9 @@ class ProfileController extends Controller
*/
public function enable2FA(UserRepositoryInterface $repository)
{
if ($repository->hasRole(auth()->user(), 'demo')) {
/** @var User $user */
$user = auth()->user();
if ($repository->hasRole($user, 'demo')) {
return redirect(route('profile.index'));
}
$hasTwoFactorAuthSecret = (null !== Preferences::get('twoFactorAuthSecret'));
@@ -217,11 +221,13 @@ class ProfileController extends Controller
$subTitle = auth()->user()->email;
$userId = auth()->user()->id;
$enabled2FA = 1 === (int)Preferences::get('twoFactorAuthEnabled', 0)->data;
/** @var User $user */
$user = auth()->user();
// get access token or create one.
$accessToken = Preferences::get('access_token', null);
if (null === $accessToken) {
$token = auth()->user()->generateAccessToken();
$token = $user->generateAccessToken();
$accessToken = Preferences::set('access_token', $token);
}
@@ -282,21 +288,23 @@ class ProfileController extends Controller
// the request has already validated both new passwords must be equal.
$current = $request->get('current_password');
$new = $request->get('new_password');
/** @var User $user */
$user = auth()->user();
try {
$this->validatePassword(auth()->user(), $current, $new);
$this->validatePassword($user, $current, $new);
} catch (ValidationException $e) {
session()->flash('error', $e->getMessage());
return redirect(route('profile.change-password'));
}
$repository->changePassword(auth()->user(), $request->get('new_password'));
$repository->changePassword($user, $request->get('new_password'));
session()->flash('success', (string)trans('firefly.password_changed'));
return redirect(route('profile.index'));
}
/** @noinspection PhpUnusedParameterInspection */
/**
* @param TokenFormRequest $request
*
@@ -326,6 +334,7 @@ class ProfileController extends Controller
return redirect(route('profile.delete-account'));
}
/** @var User $user */
$user = auth()->user();
Log::info(sprintf('User #%d has opted to delete their account', auth()->user()->id));
// make repository delete user:
@@ -341,7 +350,9 @@ class ProfileController extends Controller
*/
public function regenerate()
{
$token = auth()->user()->generateAccessToken();
/** @var User $user */
$user = auth()->user();
$token = $user->generateAccessToken();
Preferences::set('access_token', $token);
session()->flash('success', (string)trans('firefly.token_regenerated'));