Pull in upstream updates to the auth controllers

This commit is contained in:
Kevin MacMartin 2020-02-25 16:02:36 -05:00
parent 96cba915fe
commit 72e77aba76
6 changed files with 30 additions and 21 deletions

View file

@ -3,6 +3,7 @@
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
use Illuminate\Foundation\Auth\ConfirmsPasswords;
class ConfirmPasswordController extends Controller
@ -25,7 +26,7 @@ class ConfirmPasswordController extends Controller
*
* @var string
*/
protected $redirectTo = '/';
protected $redirectTo = RouteServiceProvider::HOME;
/**
* Create a new controller instance.

View file

@ -1,10 +1,12 @@
<?php namespace App\Http\Controllers\Auth;
<?php
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
class ForgotPasswordController extends Controller {
class ForgotPasswordController extends Controller
{
/*
|--------------------------------------------------------------------------
| Password Reset Controller
@ -17,5 +19,4 @@ class ForgotPasswordController extends Controller {
*/
use SendsPasswordResetEmails;
}

View file

@ -1,10 +1,13 @@
<?php namespace App\Http\Controllers\Auth;
<?php
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
use Illuminate\Foundation\Auth\AuthenticatesUsers;
class LoginController extends Controller {
class LoginController extends Controller
{
/*
|--------------------------------------------------------------------------
| Login Controller
@ -23,7 +26,7 @@ class LoginController extends Controller {
*
* @var string
*/
protected $redirectTo = '/dashboard';
protected $redirectTo = RouteServiceProvider::HOME;
/**
* Create a new controller instance.
@ -34,5 +37,4 @@ class LoginController extends Controller {
{
$this->middleware('guest')->except('logout');
}
}

View file

@ -1,14 +1,17 @@
<?php namespace App\Http\Controllers\Auth;
<?php
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
use App\User;
use App\Dashboard;
use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Validator;
class RegisterController extends Controller {
class RegisterController extends Controller
{
/*
|--------------------------------------------------------------------------
| Register Controller
@ -27,7 +30,7 @@ class RegisterController extends Controller {
*
* @var string
*/
protected $redirectTo = '/dashboard';
protected $redirectTo = RouteServiceProvider::HOME;
/**
* Create a new controller instance.
@ -87,5 +90,4 @@ class RegisterController extends Controller {
header('Location: /login');
}
}
}

View file

@ -1,10 +1,13 @@
<?php namespace App\Http\Controllers\Auth;
<?php
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
use Illuminate\Foundation\Auth\ResetsPasswords;
class ResetPasswordController extends Controller {
class ResetPasswordController extends Controller
{
/*
|--------------------------------------------------------------------------
| Password Reset Controller
@ -23,6 +26,5 @@ class ResetPasswordController extends Controller {
*
* @var string
*/
protected $redirectTo = '/login';
protected $redirectTo = RouteServiceProvider::HOME;
}

View file

@ -3,6 +3,7 @@
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
use Illuminate\Foundation\Auth\VerifiesEmails;
class VerificationController extends Controller
@ -25,7 +26,7 @@ class VerificationController extends Controller
*
* @var string
*/
protected $redirectTo = '/login';
protected $redirectTo = RouteServiceProvider::HOME;
/**
* Create a new controller instance.