leonardo/yii2-usuario
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Close #68 fix documentation + events raised on User model

Browse Source
This commit is contained in:
Antonio Ramirez
2017-10-15 15:46:20 +02:00
parent 803a8ff4f0
commit 9607e8d775
6 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/User/Controller/RegistrationController.php
View File

@ -99,7 +99,7 @@ class RegistrationController extends Controller
$this->make(AjaxRequestModelValidator::class, [$form])->validate();
if ($form->load(Yii::$app->request->post()) && $form->validate()) {
$this->trigger(UserEvent::EVENT_BEFORE_REGISTER, $event);
$this->trigger(FormEvent::EVENT_BEFORE_REGISTER, $event);
/** @var User $user */
$user = $this->make(User::class, [], $form->attributes);
$user->setScenario('register');
@ -113,7 +113,7 @@ class RegistrationController extends Controller
'Your account has been created and a message with further instructions has been sent to your email'
)
);
$this->trigger(UserEvent::EVENT_AFTER_REGISTER, $event);
$this->trigger(FormEvent::EVENT_AFTER_REGISTER, $event);
return $this->render(
'/shared/message',

2
src/User/Event/FormEvent.php
View File

@ -22,6 +22,8 @@ class FormEvent extends Event
const EVENT_AFTER_RESEND = 'afterResend';
const EVENT_BEFORE_LOGIN = 'beforeLogin';
const EVENT_AFTER_LOGIN = 'afterLogin';
const EVENT_BEFORE_REGISTER = 'beforeRegister';
const EVENT_AFTER_REGISTER = 'afterRegister';
protected $form;

7
src/User/Service/UserRegisterService.php
View File

@ -16,6 +16,7 @@ use Da\User\Event\UserEvent;
use Da\User\Factory\TokenFactory;
use Da\User\Helper\SecurityHelper;
use Da\User\Model\User;
use Da\User\Traits\ContainerAwareTrait;
use Da\User\Traits\ModuleAwareTrait;
use Exception;
use yii\base\InvalidCallException;
@ -24,6 +25,7 @@ use yii\log\Logger;
class UserRegisterService implements ServiceInterface
{
use ModuleAwareTrait;
use ContainerAwareTrait;
protected $model;
protected $securityHelper;
@ -54,7 +56,8 @@ class UserRegisterService implements ServiceInterface
? $this->securityHelper->generatePassword(8)
: $model->password;
$model->trigger(UserEvent::EVENT_BEFORE_REGISTER);
$userEvent = $this->make(UserEvent::class, [$model]);
$model->trigger(UserEvent::EVENT_BEFORE_REGISTER, $userEvent);
if (!$model->save()) {
$transaction->rollBack();
@ -71,7 +74,7 @@ class UserRegisterService implements ServiceInterface
}
$this->mailService->run();
$model->trigger(UserEvent::EVENT_AFTER_REGISTER);
$model->trigger(UserEvent::EVENT_AFTER_REGISTER, $userEvent);
$transaction->commit();