Merge branch 'main' into repalce_register_with_fortify

# Conflicts:
#	app/Http/Controllers/Auth/NewPasswordController.php
#	app/Http/Controllers/Auth/RegisteredUserController.php

Author: pushpak1300

app/Http/Controllers/Settings/PasswordController.php

@@ -5,7 +5,6 @@
 use App\Http\Controllers\Controller;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Hash;
 use Illuminate\Validation\Rules\Password;
 use Inertia\Inertia;
 use Inertia\Response;
@@ -31,7 +30,7 @@ public function update(Request $request): RedirectResponse
         ]);
 
         $request->user()->update([
-            'password' => Hash::make($validated['password']),
+            'password' => $validated['password'],
         ]);
 
         return back();

app/Models/User.php

@@ -32,7 +32,7 @@ class User extends Authenticatable
     protected $hidden = [
         'password',
         'two_factor_secret',
-        'two_factory_recovery_codes',
+        'two_factor_recovery_codes',
         'remember_token',
     ];
 
@@ -46,6 +46,7 @@ protected function casts(): array
         return [
             'email_verified_at' => 'datetime',
             'password' => 'hashed',
+            'two_factor_confirmed_at' => 'datetime',
         ];
     }
 }

database/factories/UserFactory.php

@@ -3,7 +3,6 @@
 namespace Database\Factories;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
-use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
 
 /**
@@ -27,7 +26,7 @@ public function definition(): array
             'name' => fake()->name(),
             'email' => fake()->unique()->safeEmail(),
             'email_verified_at' => now(),
-            'password' => static::$password ??= Hash::make('password'),
+            'password' => static::$password ??= 'password',
             'remember_token' => Str::random(10),
             'two_factor_secret' => Str::random(10),
             'two_factor_recovery_codes' => Str::random(10),