Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Require re-confirming email address when it's changed

Browse Source
This commit is contained in:
Hillel Coren 2015-10-13 20:21:32 +03:00
parent aef0fe8430
commit f1bf91b0fb
4 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Events/UserSettingsChanged.php
View File

@ -8,14 +8,16 @@ class UserSettingsChanged extends Event {
use SerializesModels; use SerializesModels;
public $user;
/** /**
* Create a new event instance. * Create a new event instance.
* *
* @return void * @return void
*/ */
public function __construct() public function __construct($user = false)
{ {
// $this->user = $user;
} }
} }

21
app/Listeners/HandleUserSettingsChanged.php
View File

@ -6,6 +6,7 @@ use App\Events\UserSettingsChanged;
use App\Ninja\Repositories\AccountRepository; use App\Ninja\Repositories\AccountRepository;
use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Contracts\Queue\ShouldBeQueued; use Illuminate\Contracts\Queue\ShouldBeQueued;
use App\Ninja\Mailers\UserMailer;
class HandleUserSettingsChanged { class HandleUserSettingsChanged {
@ -14,9 +15,10 @@ class HandleUserSettingsChanged {
* *
* @return void * @return void
*/ */
public function __construct(AccountRepository $accountRepo) public function __construct(AccountRepository $accountRepo, UserMailer $userMailer)
{ {
$this->accountRepo = $accountRepo; $this->accountRepo = $accountRepo;
$this->userMailer = $userMailer;
} }
/** /**
@ -27,12 +29,19 @@ class HandleUserSettingsChanged {
*/ */
public function handle(UserSettingsChanged $event) public function handle(UserSettingsChanged $event)
{ {
if (Auth::check()) { if (!Auth::check()) {
$account = Auth::user()->account; return;
$account->loadLocalizationSettings(); }
$users = $this->accountRepo->loadAccounts(Auth::user()->id); $account = Auth::user()->account;
Session::put(SESSION_USER_ACCOUNTS, $users); $account->loadLocalizationSettings();
$users = $this->accountRepo->loadAccounts(Auth::user()->id);
Session::put(SESSION_USER_ACCOUNTS, $users);
if ($event->user && $event->user->isEmailBeingChanged()) {
$this->userMailer->sendConfirmation($event->user);
Session::flash('warning', trans('texts.verify_email'));
} }
} }

36
app/Models/User.php
View File

@ -130,27 +130,6 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
{ {
return Session::get(SESSION_COUNTER, 0); return Session::get(SESSION_COUNTER, 0);
} }
/*
public function getPopOverText()
{
if (!Utils::isNinja() || !Auth::check() || Session::has('error')) {
return false;
}
$count = self::getRequestsCount();
if ($count == 1 || $count % 5 == 0) {
if (!Utils::isRegistered()) {
return trans('texts.sign_up_to_save');
} elseif (!Auth::user()->account->name) {
return trans('texts.set_name');
}
}
return false;
}
*/
public function afterSave($success = true, $forced = false) public function afterSave($success = true, $forced = false)
{ {
@ -204,6 +183,12 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
if ($user->password != $user->getOriginal('password')) { if ($user->password != $user->getOriginal('password')) {
$user->failed_logins = 0; $user->failed_logins = 0;
} }
// if the user changes their email then they need to reconfirm it
if ($user->isEmailBeingChanged()) {
$user->confirmed = 0;
$user->confirmation_code = str_random(RANDOM_KEY_LENGTH);
}
} }
public static function onUpdatedUser($user) public static function onUpdatedUser($user)
@ -214,7 +199,14 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
event(new UserSignedUp()); event(new UserSignedUp());
} }
event(new UserSettingsChanged()); event(new UserSettingsChanged($user));
}
public function isEmailBeingChanged()
{
return Utils::isNinjaProd()
&& $this->email != $this->getOriginal('email')
&& $this->getOriginal('confirmed');
} }
} }

1
resources/lang/en/texts.php
View File

@ -817,6 +817,7 @@ return array(
'custom_invoice_link' => 'Custom Invoice Link', 'custom_invoice_link' => 'Custom Invoice Link',
'total_invoiced' => 'Total Invoiced', 'total_invoiced' => 'Total Invoiced',
'open_balance' => 'Open Balance', 'open_balance' => 'Open Balance',
'verify_email' => 'Please visit the link in the account confirmation email to verify your email address.',
); );