use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Mapping as ORM;
-use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
-use Symfony\Component\Security\Core\User\UserInterface;
+use Scheb\TwoFactorBundle\Model\Email\TwoFactorInterface;
+use Scheb\TwoFactorBundle\Model\TrustedComputerInterface;
+use FOS\UserBundle\Model\User as BaseUser;
use JMS\Serializer\Annotation\ExclusionPolicy;
use JMS\Serializer\Annotation\Expose;
-use FOS\UserBundle\Model\User as BaseUser;
+use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
+use Symfony\Component\Security\Core\User\UserInterface;
use Wallabag\CoreBundle\Entity\Config;
use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\Tag;
/**
* User.
*
* @ORM\Entity(repositoryClass="Wallabag\UserBundle\Repository\UserRepository")
- * @ORM\Table
+ * @ORM\Table(name="`user`")
* @ORM\HasLifecycleCallbacks()
* @ExclusionPolicy("all")
*
* @UniqueEntity("email")
* @UniqueEntity("username")
*/
-class User extends BaseUser
+class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterface
{
/**
* @var int
protected $config;
/**
- * @ORM\OneToMany(targetEntity="Wallabag\CoreBundle\Entity\Tag", mappedBy="user", cascade={"remove"})
+ * @ORM\Column(type="integer", nullable=true)
+ */
+ private $authCode;
+
+ /**
+ * @var bool Enabled yes/no
+ * @ORM\Column(type="boolean")
*/
- protected $tags;
+ private $twoFactorAuthentication = false;
+
+ /**
+ * @ORM\Column(type="json_array", nullable=true)
+ */
+ private $trusted;
public function __construct()
{
parent::__construct();
$this->entries = new ArrayCollection();
- $this->tags = new ArrayCollection();
$this->roles = array('ROLE_USER');
}
return $this->entries;
}
- /**
- * @param Entry $entry
- *
- * @return User
- */
- public function addTag(Tag $tag)
- {
- $this->tags[] = $tag;
-
- return $this;
- }
-
- /**
- * @return ArrayCollection<Tag>
- */
- public function getTags()
- {
- return $this->tags;
- }
-
public function isEqualTo(UserInterface $user)
{
return $this->username === $user->getUsername();
{
return $this->config;
}
+
+ /**
+ * @return bool
+ */
+ public function isTwoFactorAuthentication()
+ {
+ return $this->twoFactorAuthentication;
+ }
+
+ /**
+ * @param bool $twoFactorAuthentication
+ */
+ public function setTwoFactorAuthentication($twoFactorAuthentication)
+ {
+ $this->twoFactorAuthentication = $twoFactorAuthentication;
+ }
+
+ public function isEmailAuthEnabled()
+ {
+ return $this->twoFactorAuthentication;
+ }
+
+ public function getEmailAuthCode()
+ {
+ return $this->authCode;
+ }
+
+ public function setEmailAuthCode($authCode)
+ {
+ $this->authCode = $authCode;
+ }
+
+ public function addTrustedComputer($token, \DateTime $validUntil)
+ {
+ $this->trusted[$token] = $validUntil->format('r');
+ }
+
+ public function isTrustedComputer($token)
+ {
+ if (isset($this->trusted[$token])) {
+ $now = new \DateTime();
+ $validUntil = new \DateTime($this->trusted[$token]);
+
+ return $now < $validUntil;
+ }
+
+ return false;
+ }
}