Keep PlainPasswordTrait in User Entity

systemli · Sep 29, 2024 · cb9936a · cb9936a
1 parent 34110af
commit cb9936a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/src/Entity/User.php b/src/Entity/User.php
@@ -3,6 +3,7 @@
 namespace App\Entity;
 
 use App\Repository\UserRepository;
+use App\Traits\PlainPasswordTrait;
 use Stringable;
 use DateTime;
 use App\Enum\Roles;
@@ -55,8 +56,9 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface, Passwor
     use DomainAwareTrait;
     use LastLoginTimeTrait;
     use PasswordVersionTrait;
-    use RecoverySecretBoxTrait;
+    use PlainPasswordTrait;
     use PlainRecoveryTokenTrait;
+    use RecoverySecretBoxTrait;
     use RecoveryStartTimeTrait;
     use MailCryptTrait;
     use MailCryptSecretBoxTrait;
@@ -141,7 +143,11 @@ public function getPasswordHasherName(): ?string
         return null;
     }
 
-    public function eraseCredentials()
+    public function eraseCredentials(): void
     {
+        // If you store any temporary, sensitive data on the user, clear it here
+        $this->plainPassword = null;
+        $this->erasePlainMailCryptPrivateKey();
+        $this->erasePlainRecoveryToken();
     }
 }
diff --git a/src/Traits/PlainPasswordTrait.php b/src/Traits/PlainPasswordTrait.php
@@ -23,12 +23,4 @@ public function setPlainPassword(?string $plainPassword): void
     {
         $this->plainPassword = $plainPassword;
     }
-
-    public function eraseCredentials(): void
-    {
-        // If you store any temporary, sensitive data on the user, clear it here
-        $this->plainPassword = null;
-        $this->erasePlainMailCryptPrivateKey();
-        $this->erasePlainRecoveryToken();
-    }
 }