Skip to content

An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.

fix(auth): clear forced password reset after a password reset

Andras Bacsai96ed09f0ccfa
diff --git a/app/Actions/Fortify/ResetUserPassword.php b/app/Actions/Fortify/ResetUserPassword.php
index 5baa8b7ed2..d7a6e5a4a0 100644
--- a/app/Actions/Fortify/ResetUserPassword.php
+++ b/app/Actions/Fortify/ResetUserPassword.php
@@ -23,6 +23,7 @@ class ResetUserPassword implements ResetsUserPasswords
$user->fill([
'password' => Hash::make($input['password']),
+ 'force_password_reset' => false,
])->save();
$user->deleteAllSessions();
}
diff --git a/tests/Feature/Auth/ResetUserPasswordTest.php b/tests/Feature/Auth/ResetUserPasswordTest.php
new file mode 100644
index 0000000000..52e1dd0fb9
--- /dev/null
+++ b/tests/Feature/Auth/ResetUserPasswordTest.php
@@ -0,0 +1,34 @@
+<?php
+
+use App\Models\InstanceSettings;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Password;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+ config()->set('app.maintenance.store', 'array');
+ InstanceSettings::unguarded(fn () => InstanceSettings::firstOrCreate(['id' => 0]));
+});
+
+it('clears the forced password reset of an invited user who resets the password', function () {
+ $user = User::factory()->create([
+ 'email' => '[email protected]',
+ 'email_verified_at' => null,
+ 'force_password_reset' => true,
+ ]);
+
+ $this->post(route('password.update'), [
+ 'token' => Password::createToken($user),
+ 'email' => $user->email,
+ 'password' => 'Own-Passw0rd!',
+ 'password_confirmation' => 'Own-Passw0rd!',
+ ])->assertSessionHasNoErrors();
+
+ $user->refresh();
+ expect(Hash::check('Own-Passw0rd!', $user->password))->toBeTrue()
+ ->and($user->force_password_reset)->toBeFalse()
+ ->and($user->isUnusedInvitedAccount())->toBeFalse();
+});