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

Improve test coverage and efficiency for accounts and budgets.

Browse Source
This commit is contained in:
James Cole
2019-06-23 11:13:36 +02:00
parent 8f25562923
commit 43d753e5bd
47 changed files with 919 additions and 985 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/Http/Controllers/Admin/UserController.php
View File

@@ -35,6 +35,9 @@ use Log;
*/
class UserController extends Controller
{
/** @var UserRepositoryInterface */
private $repository;
/**
* UserController constructor.
*/
@@ -46,7 +49,7 @@ class UserController extends Controller
function ($request, $next) {
app('view')->share('title', (string)trans('firefly.administration'));
app('view')->share('mainTitleIcon', 'fa-hand-spock-o');
$this->repository = app(UserRepositoryInterface::class);
return $next($request);
}
);
@@ -72,13 +75,12 @@ class UserController extends Controller
* Destroy a user.
*
* @param User $user
* @param UserRepositoryInterface $repository
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function destroy(User $user, UserRepositoryInterface $repository)
public function destroy(User $user)
{
$repository->destroy($user);
$this->repository->destroy($user);
session()->flash('success', (string)trans('firefly.user_deleted'));
return redirect(route('admin.users'));
@@ -114,22 +116,20 @@ class UserController extends Controller
/**
* Show index of user manager.
*
* @param UserRepositoryInterface $repository
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function index(UserRepositoryInterface $repository)
public function index()
{
$subTitle = (string)trans('firefly.user_administration');
$subTitleIcon = 'fa-users';
$users = $repository->all();
$users = $this->repository->all();
// add meta stuff.
$users->each(
function (User $user) use ($repository) {
function (User $user) {
$list = ['twoFactorAuthEnabled', 'twoFactorAuthSecret'];
$preferences = app('preferences')->getArrayForUser($user, $list);
$user->isAdmin = $repository->hasRole($user, 'owner');
$user->isAdmin = $this->repository->hasRole($user, 'owner');
$is2faEnabled = 1 === $preferences['twoFactorAuthEnabled'];
$has2faSecret = null !== $preferences['twoFactorAuthSecret'];
$user->has2FA = ($is2faEnabled && $has2faSecret);
@@ -143,18 +143,17 @@ class UserController extends Controller
/**
* Show single user.
*
* @param UserRepositoryInterface $repository
* @param User $user
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function show(UserRepositoryInterface $repository, User $user)
public function show(User $user)
{
$title = (string)trans('firefly.administration');
$mainTitleIcon = 'fa-hand-spock-o';
$subTitle = (string)trans('firefly.single_user_administration', ['email' => $user->email]);
$subTitleIcon = 'fa-user';
$information = $repository->getUserData($user);
$information = $this->repository->getUserData($user);
return view(
'admin.users.show', compact(
@@ -168,22 +167,21 @@ class UserController extends Controller
*
* @param UserFormRequest $request
* @param User $user
* @param UserRepositoryInterface $repository
*
* @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function update(UserFormRequest $request, User $user, UserRepositoryInterface $repository)
public function update(UserFormRequest $request, User $user)
{
Log::debug('Actually here');
$data = $request->getUserData();
// update password
if ('' !== $data['password']) {
$repository->changePassword($user, $data['password']);
$this->repository->changePassword($user, $data['password']);
}
$repository->changeStatus($user, $data['blocked'], $data['blocked_code']);
$repository->updateEmail($user, $data['email']);
$this->repository->changeStatus($user, $data['blocked'], $data['blocked_code']);
$this->repository->updateEmail($user, $data['email']);
session()->flash('success', (string)trans('firefly.updated_user', ['email' => $user->email]));
app('preferences')->mark();