different interface for otp entities

LM-Commons · lampi87 · Oct 27, 2021 · Oct 27, 2021 · Oct 27, 2021 · Oct 27, 2021
commit d690a51b250d6ab63e0b3c4779e0fcbd046579ac
diff --git a/src/LmcUser/Authentication/Adapter/OtpMail.php b/src/LmcUser/Authentication/Adapter/OtpMail.php
@@ -8,7 +8,7 @@
 use Laminas\ServiceManager\ServiceManager;
 use Laminas\Crypt\Password\Bcrypt;
 use Laminas\Session\Container as SessionContainer;
-use LmcUser\Entity\UserInterface;
+use LmcUser\Entity\UserOtpInterface;
 use LmcUser\Mapper\UserInterface as UserMapperInterface;
 use LmcUser\Options\ModuleOptions;
 use LmcUser\Entity\User;
@@ -62,6 +62,10 @@ public function authenticate(AdapterChainEvent $e)
             return;
         }
 
+        /**
+         *
+         * @var UserOtpInterface|null $userObject
+        */
         $userObject = $this->getMapper()->findById($storage['identity']);
         if (!$userObject) {
             $e->setCode(AuthenticationResult::FAILURE_IDENTITY_NOT_FOUND)

diff --git a/src/LmcUser/Entity/User.php b/src/LmcUser/Entity/User.php
@@ -34,11 +34,6 @@ class User implements UserInterface
      */
     protected $state;
 
-    /**
-     * @var bool
-     */
-    protected $useOtp;
-
     /**
      * Get id.
      *
@@ -170,26 +165,4 @@ public function setState($state)
         $this->state = $state;
         return $this;
     }
-
-    /**
-     * Get otp usage.
-     *
-     * @return bool
-     */
-    public function getUseOtp()
-    {
-        return $this->useOtp;
-    }
-
-    /**
-     * Set otp usage.
-     *
-     * @param  bool $useOtp
-     * @return UserInterface
-     */
-    public function setUseOtp($useOtp)
-    {
-        $this->useOtp = $useOtp;
-        return $this;
-    }
 }
diff --git a/src/LmcUser/Entity/UserInterface.php b/src/LmcUser/Entity/UserInterface.php
@@ -93,19 +93,4 @@ public function getState();
      * @return UserInterface
      */
     public function setState($state);
-
-    /**
-     * Get otp usage.
-     *
-     * @return bool
-     */
-    public function getUseOtp();
-
-    /**
-     * Set otp usage.
-     *
-     * @param  bool $otp
-     * @return UserInterface
-     */
-    public function setUseOtp($useOtp);
 }
diff --git a/src/LmcUser/Entity/UserOtpInterface.php b/src/LmcUser/Entity/UserOtpInterface.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace LmcUser\Entity;
+
+interface UserOtpInterface
+{
+    /**
+     * Get id.
+     *
+     * @return int
+     */
+    public function getId();
+
+    /**
+     * Set id.
+     *
+     * @param  int $id
+     * @return UserInterface
+     */
+    public function setId($id);
+
+    /**
+     * Get username.
+     *
+     * @return string
+     */
+    public function getUsername();
+
+    /**
+     * Set username.
+     *
+     * @param  string $username
+     * @return UserInterface
+     */
+    public function setUsername($username);
+
+    /**
+     * Get email.
+     *
+     * @return string
+     */
+    public function getEmail();
+
+    /**
+     * Set email.
+     *
+     * @param  string $email
+     * @return UserInterface
+     */
+    public function setEmail($email);
+
+    /**
+     * Get displayName.
+     *
+     * @return string
+     */
+    public function getDisplayName();
+
+    /**
+     * Set displayName.
+     *
+     * @param  string $displayName
+     * @return UserInterface
+     */
+    public function setDisplayName($displayName);
+
+    /**
+     * Get password.
+     *
+     * @return string password
+     */
+    public function getPassword();
+
+    /**
+     * Set password.
+     *
+     * @param  string $password
+     * @return UserInterface
+     */
+    public function setPassword($password);
+
+    /**
+     * Get state.
+     *
+     * @return int
+     */
+    public function getState();
+
+    /**
+     * Set state.
+     *
+     * @param  int $state
+     * @return UserInterface
+     */
+    public function setState($state);
+
+    /**
+     * Get otp usage.
+     *
+     * @return bool
+     */
+    public function getUseOtp();
+
+    /**
+     * Set otp usage.
+     *
+     * @param  bool $otp
+     * @return UserInterface
+     */
+    public function setUseOtp($useOtp);
+}