From d46b3d765c1511725def926edc6ac8197dc651a8 Mon Sep 17 00:00:00 2001 From: Pablo Date: Tue, 15 Oct 2024 17:05:04 -0400 Subject: [PATCH] Correcao da trait --- src/app/Observers/UserObserver.php | 11 ++++++++++- src/app/Traits/HasPasswordValidation.php | 9 --------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/app/Observers/UserObserver.php b/src/app/Observers/UserObserver.php index 6f690bb..ca7e3d6 100644 --- a/src/app/Observers/UserObserver.php +++ b/src/app/Observers/UserObserver.php @@ -16,7 +16,7 @@ class UserObserver $passwordCol = config('ae3auth-config.user.password_column'); if ($user->isDirty($passwordCol)) { $this->updateExpireColumn($user); - $user->forceChangePassword(false); + $this->makePasswordAvailable($user); } } @@ -48,4 +48,13 @@ class UserObserver $expiresAtColumn = config('ae3auth-config.user.expires_password_column_name'); $user->$expiresAtColumn = now()->addDays(config('ae3auth-config.password_expires_in')); } + + /** + * @return void + */ + private function makePasswordAvailable($user): void + { + $forceChangePasswordColumn = config('ae3auth-config.user.force_change_column_name'); + $user->$forceChangePasswordColumn = false; + } } diff --git a/src/app/Traits/HasPasswordValidation.php b/src/app/Traits/HasPasswordValidation.php index c1b6694..66993e2 100644 --- a/src/app/Traits/HasPasswordValidation.php +++ b/src/app/Traits/HasPasswordValidation.php @@ -11,13 +11,4 @@ trait HasPasswordValidation $passwordExpiresAtColumn = config('ae3auth-config.user.expires_password_column_name'); return Carbon::now()->greaterThan($this->$passwordExpiresAtColumn); } - - /** - * @return void - */ - public function forceChangePassword(?bool $forceChangePassword = true): void - { - $forceChangePasswordColumn = config('ae3auth-config.user.force_change_column_name'); - $this->forceFill([$forceChangePasswordColumn => $forceChangePassword])->save(); - } }