fix: handle updating and creating properly

beliven-it · Dec 12, 2024 · 368902a · 368902a
1 parent 7f637c0
commit 368902a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/PasswordHistory.php b/src/PasswordHistory.php
@@ -25,9 +25,7 @@ private function removeModelOldestHash(Model $model): void
 
     public function hasPasswordInHistory(Model $model, string $newPassword): bool
     {
-        $listOfPasswords = PasswordHash::query()
-            ->whereHasMorph('model', $model::class)
-            ->get();
+        $listOfPasswords = PasswordHash::byModel($model)->get();
 
         foreach ($listOfPasswords as $password) {
             $hash = $password->getAttribute('hash');

diff --git a/src/Traits/HasPasswordHistory.php b/src/Traits/HasPasswordHistory.php
@@ -20,7 +20,7 @@ protected static function bootHasPasswordHistory(): void
             self::handleCreating($model);
         });
 
-        static::updated(function ($model) {
+        static::updating(function ($model) {
             self::handleUpdating($model);
         });
     }
@@ -64,6 +64,10 @@ protected function savePasswordInHistory(string $newPassword, bool $explicit = t
 
     private static function handleCreating(Model $model): void
     {
+        if (is_null(self::$plain_text_password)) {
+            return;
+        }
+
         $model->savePasswordInHistory(self::$plain_text_password, false);
     }
 
@@ -73,6 +77,10 @@ private static function handleUpdating(Model $model): void
             return;
         }
 
+        if (is_null(self::$plain_text_password)) {
+            return;
+        }
+
         $model->savePasswordInHistory(self::$plain_text_password, false);
     }
 }