refactor: remove exception for already hashed

The function will break the classic Auth::attempt method probabily because a save will be performed on the user table
beliven-it · Jan 15, 2025 · fae4ed2 · fae4ed2
1 parent dd36466
commit fae4ed2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 24 deletions.
diff --git a/src/Exceptions/PasswordAlreadyHashedException.php b/src/Exceptions/PasswordAlreadyHashedException.php
diff --git a/src/PasswordHistory.php b/src/PasswordHistory.php
@@ -2,7 +2,6 @@
 
 namespace Beliven\PasswordHistory;
 
-use Beliven\PasswordHistory\Exceptions\PasswordAlreadyHashedException;
 use Beliven\PasswordHistory\Exceptions\PasswordInHistoryException;
 use Beliven\PasswordHistory\Models\PasswordHash;
 use Illuminate\Database\Eloquent\Model;
@@ -43,17 +42,20 @@ public function addPasswordToHistory(Model $model, string $newPassword): ?Passwo
     {
         $historyDepth = config('password-history.depth');
 
-        if (Hash::isHashed($newPassword)) {
-            throw new PasswordAlreadyHashedException;
-        }
+        return DB::transaction(function () use ($model, $newPassword, $historyDepth) {
+            $isHashed = Hash::isHashed($newPassword);
 
-        if ($this->hasPasswordInHistory($model, $newPassword)) {
-            throw new PasswordInHistoryException;
-        }
+            if ($isHashed) {
+                return null;
+            }
 
-        return DB::transaction(function () use ($model, $newPassword, $historyDepth) {
+            if ($this->hasPasswordInHistory($model, $newPassword)) {
+                throw new PasswordInHistoryException;
+            }
+
+            $newPassword = Hash::make($newPassword);
             $password_instance = new PasswordHash;
-            $password_instance->hash = Hash::make($newPassword);
+            $password_instance->hash = $newPassword;
             $password_instance->model()->associate($model);
             $password_instance->save();
 

diff --git a/tests/PasswordHistoryTest.php b/tests/PasswordHistoryTest.php
@@ -1,7 +1,6 @@
 <?php
 
 use Beliven\PasswordHistory\Entities\Enums\DomainErrorsEnum;
-use Beliven\PasswordHistory\Exceptions\PasswordAlreadyHashedException;
 use Beliven\PasswordHistory\Exceptions\PasswordInHistoryException;
 use Beliven\PasswordHistory\Facades\PasswordHistory as PasswordHistoryFacade;
 use Beliven\PasswordHistory\Models\PasswordHash;
@@ -191,7 +190,14 @@
         $model->password = $passwordHash;
         $model->id = 123;
         $model->save();
-    })->throws(PasswordAlreadyHashedException::class, DomainErrorsEnum::PASSWORD_ALREADY_HASHED->message());
+
+        $this->assertDatabaseMissing('password_hashes', [
+            'model_type' => get_class($model),
+            'model_id'   => $model->id,
+        ]);
+
+        expect($model->password)->toBe($passwordHash);
+    });
 
     it('should not save any history hash using null value', function () {
         $model = new TestModelWithTrait;