X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FUserBundle%2FEntity%2FUser.php;h=d2efd20080b4bee41b3d7b6badbbe94a7770c675;hb=2db616b586f473238706e554e809086935e0f33a;hp=8f02e070e8b10ab295a33d45441c3e1e7fcb3e96;hpb=cf0ea8f113548191cdeb8d3727dd6d2ad25d19ed;p=github%2Fwallabag%2Fwallabag.git diff --git a/src/Wallabag/UserBundle/Entity/User.php b/src/Wallabag/UserBundle/Entity/User.php index 8f02e070..d2efd200 100644 --- a/src/Wallabag/UserBundle/Entity/User.php +++ b/src/Wallabag/UserBundle/Entity/User.php @@ -4,6 +4,8 @@ namespace Wallabag\UserBundle\Entity; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\Mapping as ORM; +use Scheb\TwoFactorBundle\Model\Email\TwoFactorInterface; +use Scheb\TwoFactorBundle\Model\TrustedComputerInterface; use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; use Symfony\Component\Security\Core\User\UserInterface; use JMS\Serializer\Annotation\ExclusionPolicy; @@ -24,7 +26,7 @@ use Wallabag\CoreBundle\Entity\Tag; * @UniqueEntity("email") * @UniqueEntity("username") */ -class User extends BaseUser +class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterface { /** * @var int @@ -72,6 +74,22 @@ class User extends BaseUser */ protected $tags; + /** + * @ORM\Column(type="integer", nullable=true) + */ + private $authCode; + + /** + * @var bool Enabled yes/no + * @ORM\Column(type="boolean") + */ + private $twoFactorAuthentication = false; + + /** + * @ORM\Column(type="json_array", nullable=true) + */ + private $trusted; + public function __construct() { parent::__construct(); @@ -201,4 +219,52 @@ class User extends BaseUser { 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; + } }