laravel-6 changes

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -8,7 +8,8 @@ use App\User;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
-use Lang;
+use Illuminate\Support\Facades\Lang;
+Use Illuminate\Support\Facades\DB;
 
 class ForgotPasswordController extends Controller
 {
@@ -53,13 +54,13 @@ class ForgotPasswordController extends Controller
                 $user1 = $user->email;
                 //gen new code and pass
                 $code = Str::random(60);
-                $password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->first();
+                $password_reset_table = DB::table('password_resets')->where('email', '=', $user->email)->first();
                 if (isset($password_reset_table)) {
-                    $password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->update(['token' => $code, 'created_at' => $date]);
+                    $password_reset_table = DB::table('password_resets')->where('email', '=', $user->email)->update(['token' => $code, 'created_at' => $date]);
                 // $password_reset_table->token = $code;
                 // $password_reset_table->update(['token' => $code]);
                 } else {
-                    $create_password_reset = \DB::table('password_resets')->insert(['email' => $user->email, 'token' => $code, 'created_at' => $date]);
+                    $create_password_reset = DB::table('password_resets')->insert(['email' => $user->email, 'token' => $code, 'created_at' => $date]);
                 }
                 $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $user->user_name, 'email' => $user->email], $message = ['subject' => 'Your Password Reset Link', 'scenario' => 'reset-password'], $template_variables = ['user' => $user->first_name, 'email_address' => $user->email, 'password_reset_link' => url('password/reset/'.$code.'?email='.$user->email)], true);
                 if ($user->mobile != '' && $user->mobile != null) {

app/Http/Controllers/Auth/ResetPasswordController.php

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

app/Http/Kernel.php

@@ -57,8 +57,6 @@ class Kernel extends HttpKernel
         'role.agent' => \App\Http\Middleware\CheckRoleAgent::class,
         'role.user' => \App\Http\Middleware\CheckRoleUser::class,
         'api' => \App\Http\Middleware\ApiKey::class,
-        'jwt.auth' => \Tymon\JWTAuth\Middleware\GetUserFromToken::class,
-        'jwt.refresh' => \Tymon\JWTAuth\Middleware\RefreshToken::class,
         'jwt.authOveride' => \App\Http\Middleware\JwtAuthenticate::class,
         'update' => \App\Http\Middleware\CheckUpdate::class,
         'board' => \App\Http\Middleware\CheckBoard::class,
@@ -67,6 +65,10 @@ class Kernel extends HttpKernel
         'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
         'installer' => \App\Http\Middleware\IsInstalled::class,
         'force.option' => \App\Http\Middleware\TicketViewURL::class,
+        'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
+        'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
+        'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
+        'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
     ];
 
     /**
@@ -80,6 +82,7 @@ class Kernel extends HttpKernel
         \Illuminate\Session\Middleware\StartSession::class,
         \Illuminate\View\Middleware\ShareErrorsFromSession::class,
         \App\Http\Middleware\Authenticate::class,
+        \Illuminate\Routing\Middleware\ThrottleRequests::class,
         \Illuminate\Session\Middleware\AuthenticateSession::class,
         \Illuminate\Routing\Middleware\SubstituteBindings::class,
         \Illuminate\Auth\Middleware\Authorize::class,

resources/lang/en/passwords.php

@@ -3,19 +3,21 @@
 return [
 
     /*
-      |--------------------------------------------------------------------------
+    |--------------------------------------------------------------------------
-      | Password Reminder Language Lines
+    | Password Reset Language Lines
-      |--------------------------------------------------------------------------
+    |--------------------------------------------------------------------------
-      |
+    |
-      | The following language lines are the default lines which match reasons
+    | The following language lines are the default lines which match reasons
-      | that are given by the password broker for a password update attempt
+    | that are given by the password broker for a password update attempt
-      | has failed, such as for an invalid token or invalid new password.
+    | has failed, such as for an invalid token or invalid new password.
-      |
+    |
-     */
+    */
 
     'password' => 'Passwords must be at least six characters and match the confirmation.',
-    'user' => "We can't find a user with that e-mail address.",
-    'token' => 'This password reset token is invalid.',
-    'sent' => 'We have e-mailed your password reset link!',
     'reset' => 'Your password has been reset!',
+    'sent' => 'We have e-mailed your password reset link!',
+    'throttled' => 'Please wait before retrying.',
+    'token' => 'This password reset token is invalid.',
+    'user' => "We can't find a user with that e-mail address.",
+
 ];