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

Remove a lot of stuff that deals with user activation.

Browse Source
This commit is contained in:
James Cole
2016-12-28 17:07:44 +01:00
parent 98d4bc48b6
commit f44336f7aa
18 changed files with 10 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,6 @@ declare(strict_types = 1);
namespace FireflyIII\Http\Controllers\Admin;
use FireflyConfig;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\UserFormRequest;
use FireflyIII\Repositories\User\UserRepositoryInterface;
@@ -81,15 +80,15 @@ class UserController extends Controller
*/
public function index(UserRepositoryInterface $repository)
{
$subTitle = strval(trans('firefly.user_administration'));
$subTitleIcon = 'fa-users';
$users = $repository->all();
$subTitle = strval(trans('firefly.user_administration'));
$subTitleIcon = 'fa-users';
$users = $repository->all();
// add meta stuff.
$users->each(
function (User $user) {
$list = ['twoFactorAuthEnabled', 'twoFactorAuthSecret'];
$preferences = Preferences::getArrayForUser($user, $list);
$list = ['twoFactorAuthEnabled', 'twoFactorAuthSecret'];
$preferences = Preferences::getArrayForUser($user, $list);
$user->isAdmin = $user->hasRole('owner');
$is2faEnabled = $preferences['twoFactorAuthEnabled'] === true;
$has2faSecret = !is_null($preferences['twoFactorAuthSecret']);
@@ -115,37 +114,12 @@ class UserController extends Controller
$mainTitleIcon = 'fa-hand-spock-o';
$subTitle = strval(trans('firefly.single_user_administration', ['email' => $user->email]));
$subTitleIcon = 'fa-user';
// get IP info:
$defaultIp = '0.0.0.0';
$regPref = Preferences::getForUser($user, 'registration_ip_address');
$registration = $defaultIp;
$conPref = Preferences::getForUser($user, 'confirmation_ip_address');
$confirmation = $defaultIp;
if (!is_null($regPref)) {
$registration = $regPref->data;
}
if (!is_null($conPref)) {
$confirmation = $conPref->data;
}
$registrationHost = '';
$confirmationHost = '';
if ($registration != $defaultIp) {
$registrationHost = gethostbyaddr($registration);
}
if ($confirmation != $defaultIp) {
$confirmationHost = gethostbyaddr($confirmation);
}
$information = $repository->getUserData($user);
$information = $repository->getUserData($user);
return view(
'admin.users.show',
compact(
'title', 'mainTitleIcon', 'subTitle', 'subTitleIcon', 'information',
'user', 'registration', 'confirmation', 'registrationHost', 'confirmationHost'
'title', 'mainTitleIcon', 'subTitle', 'subTitleIcon', 'information', 'user'
)
);
}

90
app/Http/Controllers/Auth/ConfirmationController.php
View File

@@ -1,90 +0,0 @@
<?php
/**
* ConfirmationController.php
* Copyright (C) 2016 thegrumpydictator@gmail.com
*
* This software may be modified and distributed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International License.
*
* See the LICENSE file for details.
*/
declare(strict_types = 1);
namespace FireflyIII\Http\Controllers\Auth;
use FireflyIII\Events\ConfirmedUser;
use FireflyIII\Events\ResentConfirmation;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use Illuminate\Http\Request;
use Preferences;
use Session;
/**
* Class ConfirmationController
*
* @package FireflyIII\Http\Controllers\Auth
*/
class ConfirmationController extends Controller
{
/**
* @return mixed
*/
public function confirmationError()
{
return view('auth.confirmation.error');
}
/**
* @param Request $request
* @param string $code
*
* @return mixed
* @throws FireflyException
*/
public function doConfirmation(Request $request, string $code)
{
// check user_confirmed_last_mail
$database = Preferences::get('user_confirmed_code')->data;
$time = Preferences::get('user_confirmed_last_mail', 0)->data;
$now = time();
$maxDiff = config('firefly.confirmation_age');
if ($database === $code && ($now - $time <= $maxDiff)) {
// trigger user registration event:
event(new ConfirmedUser(auth()->user(), $request->ip()));
Preferences::setForUser(auth()->user(), 'user_confirmed', true);
Preferences::setForUser(auth()->user(), 'user_confirmed_confirmed', time());
Session::flash('success', strval(trans('firefly.account_is_confirmed')));
return redirect(route('home'));
}
throw new FireflyException(trans('firefly.invalid_activation_code'));
}
/**
* @param Request $request
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function resendConfirmation(Request $request)
{
$time = Preferences::get('user_confirmed_last_mail', 0)->data;
$now = time();
$maxDiff = config('firefly.resend_confirmation');
$owner = env('SITE_OWNER', 'mail@example.com');
$view = 'auth.confirmation.no-resent';
if ($now - $time > $maxDiff) {
event(new ResentConfirmation(auth()->user(), $request->ip()));
$view = 'auth.confirmation.resent';
}
return view($view, ['owner' => $owner]);
}
}

8
app/Http/Controllers/Auth/RegisterController.php
View File

@@ -98,9 +98,6 @@ class RegisterController extends Controller
$user = $this->create($request->all());
// trigger user registration event:
// automatically activate user:
Preferences::setForUser($user, 'user_confirmed', true);
Preferences::setForUser($user, 'user_confirmed_last_mail', 0);
event(new RegisteredUser($user, $request->ip()));
Auth::login($user);
@@ -125,9 +122,6 @@ class RegisterController extends Controller
// is demo site?
$isDemoSite = FireflyConfig::get('is_demo_site', Config::get('firefly.configuration.is_demo_site'))->data;
// activate account?
$mustConfirmAccount = FireflyConfig::get('must_confirm_account', Config::get('firefly.configuration.must_confirm_account'))->data;
// is allowed to?
$singleUserMode = FireflyConfig::get('single_user_mode', Config::get('firefly.configuration.single_user_mode'))->data;
$userCount = User::count();
@@ -139,7 +133,7 @@ class RegisterController extends Controller
$email = $request->old('email');
return view('auth.register', compact('isDemoSite', 'email', 'mustConfirmAccount'));
return view('auth.register', compact('isDemoSite', 'email'));
}
/**

3
app/Http/Controllers/HomeController.php
View File

@@ -175,9 +175,6 @@ class HomeController extends Controller
'logout',
'two-fac',
'lost-two',
'confirm',
'resend',
'do_confirm',
// test troutes
'test-flash',
'all-routes',