pnx/httpcb
Archived
1
0
Fork 0
Code Releases Activity

app/models/Data/PasswordLink.php: rename to UserActivation

Browse source 
+ Confirm to the database changes.
This commit is contained in:
Henrik Hautakoski 2018-09-20 23:16:56 +02:00
parent bdf16e6fbb
commit a52fc99ded
2 changed files with 34 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/controllers/UserController.php
View file

@ -4,9 +4,9 @@ namespace App\Controller;
use App\Controller\ControllerBase, use App\Controller\ControllerBase,
App\Form\UserSettings as UserSettingsForm, App\Form\UserSettings as UserSettingsForm,
App\Model\Data\ActivityLog, App\Model\Data\User,
App\Model\Data\PasswordLink, App\Model\Data\UserActivation,
App\Model\Data\User; App\Model\Data\ActivityLog;
class UserController extends ControllerBase class UserController extends ControllerBase
{ {
@ -39,15 +39,15 @@ class UserController extends ControllerBase
} }
// Else we create a password link and email. // Else we create a password link and email.
else { else {
$link = new PasswordLink(); $activation = new UserActivation();
$link->setUserId($user->getId()) $activation->setUserId($user->getId())
->setPassword($hash) ->setPassword($hash)
->save(); ->save();
// Render the email content. // Render the email content.
$tpl = $this->di->get('template'); $tpl = $this->di->get('template');
$content = $tpl->render('mail/password_activation', [ $content = $tpl->render('mail/password_activation', [
'link' => $link->getPublicId() 'link' => $activation->getActivationKey()
]); ]);
// Send the email. // Send the email.
@ -113,7 +113,7 @@ class UserController extends ControllerBase
*/ */
public function activationLinkAction($id) public function activationLinkAction($id)
{ {
$link = PasswordLink::findFirst(['public_id = ?0', 'bind' => [ $id ]]); $link = UserActivation::findFirst(['activation_key = ?0', 'bind' => [ $id ]]);
if ($link) { if ($link) {
if ($link->isValid()) { if ($link->isValid()) {

44
app/models/Data/PasswordLink.php → app/models/Data/UserActivation.php
View file

@ -6,7 +6,7 @@ use Httpcb\Mvc\Model\Behavior\RandomId as RandomIdBehavior;
use Phalcon\Forms\Element\Date; use Phalcon\Forms\Element\Date;
use Phalcon\Mvc\Model\Behavior\SoftDelete; use Phalcon\Mvc\Model\Behavior\SoftDelete;
class PasswordLink extends Base class UserActivation extends Base
{ {
/** /**
* @var int * @var int
@ -16,13 +16,18 @@ class PasswordLink extends Base
/** /**
* @var string * @var string
*/ */
protected $public_id; protected $activation_key;
/** /**
* @var int * @var int
*/ */
protected $user_id; protected $user_id;
/**
* @var int
*/
protected $used;
/** /**
* @var string * @var string
*/ */
@ -38,7 +43,7 @@ class PasswordLink extends Base
*/ */
public function initialize() public function initialize()
{ {
$this->setSource('password_link'); $this->setSource('user_activation');
$this->useDynamicUpdate(true); $this->useDynamicUpdate(true);
// Relationships // Relationships
@ -46,15 +51,20 @@ class PasswordLink extends Base
// Behaviour // Behaviour
$this->addBehavior(new RandomIdBehavior(array( $this->addBehavior(new RandomIdBehavior(array(
'field' => 'public_id', 'field' => 'activation_key',
'length' => 12, 'length' => 40,
'expression' => '(password IS NULL OR HOUR(TIMEDIFF(date, NOW())) = 0)' 'expression' => '(used = 0 OR HOUR(TIMEDIFF(date, NOW())) = 0)'
))); )));
$this->addBehavior(new SoftDelete([ $this->addBehavior(new SoftDelete([
'field' => 'password', 'field' => 'password',
'value' => null 'value' => null
])); ]));
$this->addBehavior(new SoftDelete([
'field' => 'used',
'value' => 1
]));
} }
/** /**
@ -69,7 +79,7 @@ class PasswordLink extends Base
* @param int $id * @param int $id
* @return PasswordLink * @return PasswordLink
*/ */
public function setId(int $id) : PasswordLink public function setId(int $id) : UserActivation
{ {
$this->id = $id; $this->id = $id;
return $this; return $this;
@ -78,18 +88,18 @@ class PasswordLink extends Base
/** /**
* @return string * @return string
*/ */
public function getPublicId() public function getActivationKey()
{ {
return $this->public_id; return $this->activation_key;
} }
/** /**
* @param string $public_id * @param string $public_id
* @return PasswordLink * @return UserActivation
*/ */
public function setPublicId(string $public_id) : PasswordLink public function setActivationKey(string $key) : UserActivation
{ {
$this->public_id = $public_id; $this->activation_key = $key;
return $this; return $this;
} }
@ -103,9 +113,9 @@ class PasswordLink extends Base
/** /**
* @param int $user_id * @param int $user_id
* @return PasswordLink * @return UserActivation
*/ */
public function setUserId(int $user_id) : PasswordLink public function setUserId(int $user_id) : UserActivation
{ {
$this->user_id = $user_id; $this->user_id = $user_id;
return $this; return $this;
@ -121,9 +131,9 @@ class PasswordLink extends Base
/** /**
* @param string $password * @param string $password
* @return PasswordLink * @return UserActivation
*/ */
public function setPassword(string $password) : PasswordLink public function setPassword(string $password) : UserActivation
{ {
$this->password = $password; $this->password = $password;
return $this; return $this;
@ -136,7 +146,7 @@ class PasswordLink extends Base
*/ */
public function isUsed() : bool public function isUsed() : bool
{ {
return strlen($this->password) < 1; return (bool) $this->used;
} }
/** /**