Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-06 02:14:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed problem when adding user

Browse Source
This commit is contained in:
Hillel Coren 2015-05-12 12:36:32 +03:00
parent 0fa30fb55f
commit 140943f166
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,7 @@ use Session;
use URL; use URL;
use Utils; use Utils;
use Validator; use Validator;
use Illuminate\Auth\Passwords\TokenRepositoryInterface;
use App\Models\User; use App\Models\User;
use App\Http\Requests; use App\Http\Requests;
use App\Ninja\Repositories\AccountRepository; use App\Ninja\Repositories\AccountRepository;
@ -263,7 +263,7 @@ class UserController extends BaseController
* *
* @param string $code * @param string $code
*/ */
public function confirm($code) public function confirm($code, TokenRepositoryInterface $tokenRepo)
{ {
$user = User::where('confirmation_code', '=', $code)->get()->first(); $user = User::where('confirmation_code', '=', $code)->get()->first();
@ -275,9 +275,10 @@ class UserController extends BaseController
$user->save(); $user->save();
if ($user->public_id) { if ($user->public_id) {
Auth::login($user); //Auth::login($user);
$token = $tokenRepo->create($user);
return Redirect::to('user/reset'); return Redirect::to("/password/reset/{$token}");
} else { } else {
if (Session::has(REQUESTED_PRO_PLAN)) { if (Session::has(REQUESTED_PRO_PLAN)) {
Session::forget(REQUESTED_PRO_PLAN); Session::forget(REQUESTED_PRO_PLAN);