From 53f05cf21b152db4ddbba4d6d42fafe475af0f6c Mon Sep 17 00:00:00 2001
From: Pablo <pablomiranda304@gmail.com>
Date: Tue, 15 Oct 2024 16:51:38 -0400
Subject: [PATCH] Correcao da trait

---
 src/app/Observers/UserObserver.php       | 5 ++++-
 src/app/Traits/HasPasswordValidation.php | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/app/Observers/UserObserver.php b/src/app/Observers/UserObserver.php
index 4481e3d..6f690bb 100644
--- a/src/app/Observers/UserObserver.php
+++ b/src/app/Observers/UserObserver.php
@@ -14,8 +14,11 @@ class UserObserver
     {
         PasswordHistoryManager::logPassword($user);
         $passwordCol = config('ae3auth-config.user.password_column');
-        if ($user->isDirty($passwordCol))
+        if ($user->isDirty($passwordCol)) {
             $this->updateExpireColumn($user);
+            $user->forceChangePassword(false);
+        }
+
     }
 
     /**
diff --git a/src/app/Traits/HasPasswordValidation.php b/src/app/Traits/HasPasswordValidation.php
index 6dd1f43..eb218b9 100644
--- a/src/app/Traits/HasPasswordValidation.php
+++ b/src/app/Traits/HasPasswordValidation.php
@@ -15,8 +15,8 @@ trait HasPasswordValidation
     /**
      * @return void
      */
-    public function forceChangePassword(): void
+    public function forceChangePassword(?bool $forceChangePassword = true): void
     {
-        $this->forceFill(['force_change_password' => true])->save();
+        $this->forceFill(['force_change_password' => $forceChangePassword])->save();
     }
 }