Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 05:24:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix for user_confirmation code

Browse Source
This commit is contained in:
David Bomba 2020-09-16 09:56:10 +10:00
parent 71c3865bb5
commit 8471c2689f
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,7 @@ use App\DataMapper\CompanySettings;
use App\DataMapper\DefaultSettings; use App\DataMapper\DefaultSettings;
use App\Events\User\UserEmailAddressChangedNewEmail; use App\Events\User\UserEmailAddressChangedNewEmail;
use App\Events\User\UserEmailAddressChangedOldEmail; use App\Events\User\UserEmailAddressChangedOldEmail;
use App\Events\User\UserWasCreated;
use App\Factory\UserFactory; use App\Factory\UserFactory;
use App\Filters\UserFilters; use App\Filters\UserFilters;
use App\Http\Controllers\Traits\VerifiesUserEmail; use App\Http\Controllers\Traits\VerifiesUserEmail;
@ -204,6 +205,8 @@ class UserController extends BaseController
$ct = CreateCompanyToken::dispatchNow($company, $user, $user_agent); $ct = CreateCompanyToken::dispatchNow($company, $user, $user_agent);
event(new UserWasCreated($user, $company, Ninja::eventVars()));
return $this->itemResponse($user->fresh()); return $this->itemResponse($user->fresh());
} }

4
app/Listeners/SendVerificationNotification.php
View File

@ -50,7 +50,11 @@ class SendVerificationNotification implements ShouldQueue
$event->user->notify(new VerifyUser($event->user)); $event->user->notify(new VerifyUser($event->user));
Ninja::registerNinjaUser($event->user); Ninja::registerNinjaUser($event->user);
} catch (\Exception $e) { } catch (\Exception $e) {
info("I couldn't send the email " . $e->getMessage());
} }
} }
} }

7
app/Repositories/UserRepository.php
View File

@ -17,6 +17,7 @@ use App\Factory\CompanyUserFactory;
use App\Models\CompanyUser; use App\Models\CompanyUser;
use App\Models\User; use App\Models\User;
use App\Utils\Ninja; use App\Utils\Ninja;
use App\Utils\Traits\MakesHash;
use Illuminate\Http\Request; use Illuminate\Http\Request;
/** /**
@ -24,6 +25,8 @@ use Illuminate\Http\Request;
*/ */
class UserRepository extends BaseRepository class UserRepository extends BaseRepository
{ {
use MakesHash;
/** /**
* Gets the class name. * Gets the class name.
* *
@ -66,6 +69,10 @@ class UserRepository extends BaseRepository
} }
$user->fill($details); $user->fill($details);
if(!$user->confirmation_code)
$user->confirmation_code = $this->createDbHash(config('database.default'));
$user->account_id = $account->id; $user->account_id = $account->id;
$user->save(); $user->save();