DEV: use ModuleAwareTrait instead
This commit is contained in:
@ -25,6 +25,7 @@ use Da\User\Service\UserBlockService;
|
|||||||
use Da\User\Service\UserConfirmationService;
|
use Da\User\Service\UserConfirmationService;
|
||||||
use Da\User\Service\UserCreateService;
|
use Da\User\Service\UserCreateService;
|
||||||
use Da\User\Traits\ContainerAwareTrait;
|
use Da\User\Traits\ContainerAwareTrait;
|
||||||
|
use Da\User\Traits\ModuleAwareTrait;
|
||||||
use Da\User\Validator\AjaxRequestModelValidator;
|
use Da\User\Validator\AjaxRequestModelValidator;
|
||||||
use Yii;
|
use Yii;
|
||||||
use yii\base\Module;
|
use yii\base\Module;
|
||||||
@ -37,6 +38,7 @@ use yii\web\Controller;
|
|||||||
class AdminController extends Controller
|
class AdminController extends Controller
|
||||||
{
|
{
|
||||||
use ContainerAwareTrait;
|
use ContainerAwareTrait;
|
||||||
|
use ModuleAwareTrait;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var UserQuery
|
* @var UserQuery
|
||||||
@ -300,9 +302,7 @@ class AdminController extends Controller
|
|||||||
|
|
||||||
public function actionSwitchIdentity($id = null)
|
public function actionSwitchIdentity($id = null)
|
||||||
{
|
{
|
||||||
/** @var \Da\User\Module $module */
|
if (false === $this->module->enableSwitchIdentities) {
|
||||||
$module = $this->module;
|
|
||||||
if (false === $module->enableSwitchIdentities) {
|
|
||||||
Yii::$app->getSession()->setFlash('danger', Yii::t('usuario', 'Switch identities is disabled.'));
|
Yii::$app->getSession()->setFlash('danger', Yii::t('usuario', 'Switch identities is disabled.'));
|
||||||
|
|
||||||
return $this->redirect(['index']);
|
return $this->redirect(['index']);
|
||||||
|
|||||||
@ -22,6 +22,7 @@ use Da\User\Query\UserQuery;
|
|||||||
use Da\User\Service\PasswordRecoveryService;
|
use Da\User\Service\PasswordRecoveryService;
|
||||||
use Da\User\Service\ResetPasswordService;
|
use Da\User\Service\ResetPasswordService;
|
||||||
use Da\User\Traits\ContainerAwareTrait;
|
use Da\User\Traits\ContainerAwareTrait;
|
||||||
|
use Da\User\Traits\ModuleAwareTrait;
|
||||||
use Da\User\Validator\AjaxRequestModelValidator;
|
use Da\User\Validator\AjaxRequestModelValidator;
|
||||||
use Yii;
|
use Yii;
|
||||||
use yii\base\InvalidConfigException;
|
use yii\base\InvalidConfigException;
|
||||||
@ -33,12 +34,11 @@ use yii\web\NotFoundHttpException;
|
|||||||
class RecoveryController extends Controller
|
class RecoveryController extends Controller
|
||||||
{
|
{
|
||||||
use ContainerAwareTrait;
|
use ContainerAwareTrait;
|
||||||
|
use ModuleAwareTrait;
|
||||||
|
|
||||||
protected $userQuery;
|
protected $userQuery;
|
||||||
protected $tokenQuery;
|
protected $tokenQuery;
|
||||||
|
|
||||||
/** @var \Da\User\Module */
|
|
||||||
public $module;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* RecoveryController constructor.
|
* RecoveryController constructor.
|
||||||
|
|||||||
@ -27,6 +27,7 @@ use Da\User\Service\UserConfirmationService;
|
|||||||
use Da\User\Service\UserCreateService;
|
use Da\User\Service\UserCreateService;
|
||||||
use Da\User\Service\UserRegisterService;
|
use Da\User\Service\UserRegisterService;
|
||||||
use Da\User\Traits\ContainerAwareTrait;
|
use Da\User\Traits\ContainerAwareTrait;
|
||||||
|
use Da\User\Traits\ModuleAwareTrait;
|
||||||
use Da\User\Validator\AjaxRequestModelValidator;
|
use Da\User\Validator\AjaxRequestModelValidator;
|
||||||
use Yii;
|
use Yii;
|
||||||
use yii\base\Module;
|
use yii\base\Module;
|
||||||
@ -37,12 +38,11 @@ use yii\web\NotFoundHttpException;
|
|||||||
class RegistrationController extends Controller
|
class RegistrationController extends Controller
|
||||||
{
|
{
|
||||||
use ContainerAwareTrait;
|
use ContainerAwareTrait;
|
||||||
|
use ModuleAwareTrait;
|
||||||
|
|
||||||
protected $userQuery;
|
protected $userQuery;
|
||||||
protected $socialNetworkAccountQuery;
|
protected $socialNetworkAccountQuery;
|
||||||
|
|
||||||
/** @var \Da\User\Module */
|
|
||||||
public $module;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* RegistrationController constructor.
|
* RegistrationController constructor.
|
||||||
|
|||||||
@ -19,6 +19,7 @@ use Da\User\Query\SocialNetworkAccountQuery;
|
|||||||
use Da\User\Service\SocialNetworkAccountConnectService;
|
use Da\User\Service\SocialNetworkAccountConnectService;
|
||||||
use Da\User\Service\SocialNetworkAuthenticateService;
|
use Da\User\Service\SocialNetworkAuthenticateService;
|
||||||
use Da\User\Traits\ContainerAwareTrait;
|
use Da\User\Traits\ContainerAwareTrait;
|
||||||
|
use Da\User\Traits\ModuleAwareTrait;
|
||||||
use Yii;
|
use Yii;
|
||||||
use yii\authclient\AuthAction;
|
use yii\authclient\AuthAction;
|
||||||
use yii\base\InvalidConfigException;
|
use yii\base\InvalidConfigException;
|
||||||
@ -33,11 +34,10 @@ use yii\widgets\ActiveForm;
|
|||||||
class SecurityController extends Controller
|
class SecurityController extends Controller
|
||||||
{
|
{
|
||||||
use ContainerAwareTrait;
|
use ContainerAwareTrait;
|
||||||
|
use ModuleAwareTrait;
|
||||||
|
|
||||||
protected $socialNetworkAccountQuery;
|
protected $socialNetworkAccountQuery;
|
||||||
|
|
||||||
/** @var \Da\User\Module */
|
|
||||||
public $module;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* SecurityController constructor.
|
* SecurityController constructor.
|
||||||
|
|||||||
@ -30,6 +30,7 @@ use Da\User\Query\UserQuery;
|
|||||||
use Da\User\Service\EmailChangeService;
|
use Da\User\Service\EmailChangeService;
|
||||||
use Da\User\Service\TwoFactorQrCodeUriGeneratorService;
|
use Da\User\Service\TwoFactorQrCodeUriGeneratorService;
|
||||||
use Da\User\Traits\ContainerAwareTrait;
|
use Da\User\Traits\ContainerAwareTrait;
|
||||||
|
use Da\User\Traits\ModuleAwareTrait;
|
||||||
use Da\User\Validator\AjaxRequestModelValidator;
|
use Da\User\Validator\AjaxRequestModelValidator;
|
||||||
use Da\User\Validator\TwoFactorCodeValidator;
|
use Da\User\Validator\TwoFactorCodeValidator;
|
||||||
use Yii;
|
use Yii;
|
||||||
@ -44,6 +45,7 @@ use yii\web\Response;
|
|||||||
class SettingsController extends Controller
|
class SettingsController extends Controller
|
||||||
{
|
{
|
||||||
use ContainerAwareTrait;
|
use ContainerAwareTrait;
|
||||||
|
use ModuleAwareTrait;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@inheritdoc}
|
* {@inheritdoc}
|
||||||
@ -54,8 +56,6 @@ class SettingsController extends Controller
|
|||||||
protected $userQuery;
|
protected $userQuery;
|
||||||
protected $socialNetworkAccountQuery;
|
protected $socialNetworkAccountQuery;
|
||||||
|
|
||||||
/** @var \Da\User\Module */
|
|
||||||
public $module;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* SettingsController constructor.
|
* SettingsController constructor.
|
||||||
|
|||||||
Reference in New Issue
Block a user