diff --git a/docs/README.md b/docs/README.md new file mode 100644 index 0000000..e69de29 diff --git a/lib/User/Command/ConfirmController.php b/lib/User/Command/ConfirmController.php index b9e758a..fc4bfc9 100644 --- a/lib/User/Command/ConfirmController.php +++ b/lib/User/Command/ConfirmController.php @@ -13,7 +13,7 @@ namespace Da\User\Command; use Da\User\Query\UserQuery; use Da\User\Service\UserConfirmationService; -use Da\User\Traits\ContainerTrait; +use Da\User\Traits\ContainerAwareTrait; use Yii; use yii\base\Module; use yii\console\Controller; @@ -21,7 +21,7 @@ use yii\helpers\Console; class ConfirmController extends Controller { - use ContainerTrait; + use ContainerAwareTrait; protected $userQuery; diff --git a/lib/User/Command/CreateController.php b/lib/User/Command/CreateController.php index d85c0e5..c5e5866 100644 --- a/lib/User/Command/CreateController.php +++ b/lib/User/Command/CreateController.php @@ -14,14 +14,14 @@ namespace Da\User\Command; use Da\User\Factory\MailFactory; use Da\User\Model\User; use Da\User\Service\UserCreateService; -use Da\User\Traits\ContainerTrait; +use Da\User\Traits\ContainerAwareTrait; use Yii; use yii\console\Controller; use yii\helpers\Console; class CreateController extends Controller { - use ContainerTrait; + use ContainerAwareTrait; public function actionIndex($email, $username, $password = null) { diff --git a/lib/User/Command/PasswordController.php b/lib/User/Command/PasswordController.php index b9a3b6a..31cb443 100644 --- a/lib/User/Command/PasswordController.php +++ b/lib/User/Command/PasswordController.php @@ -14,7 +14,7 @@ namespace Da\User\Command; use Da\User\Model\User; use Da\User\Query\UserQuery; use Da\User\Service\ResetPasswordService; -use Da\User\Traits\ContainerTrait; +use Da\User\Traits\ContainerAwareTrait; use Yii; use yii\base\Module; use yii\console\Controller; @@ -22,7 +22,7 @@ use yii\helpers\Console; class PasswordController extends Controller { - use ContainerTrait; + use ContainerAwareTrait; protected $userQuery; diff --git a/lib/User/Controller/AbstractAuthItemController.php b/lib/User/Controller/AbstractAuthItemController.php index 2708697..03b07af 100644 --- a/lib/User/Controller/AbstractAuthItemController.php +++ b/lib/User/Controller/AbstractAuthItemController.php @@ -16,7 +16,7 @@ use Da\User\Helper\AuthHelper; use Da\User\Model\AbstractAuthItem; use Da\User\Module; use Da\User\Service\AuthItemEditionService; -use Da\User\Traits\ContainerTrait; +use Da\User\Traits\ContainerAwareTrait; use Da\User\Validator\AjaxRequestModelValidator; use Yii; use yii\filters\AccessControl; @@ -24,7 +24,7 @@ use yii\web\Controller; abstract class AbstractAuthItemController extends Controller { - use ContainerTrait; + use ContainerAwareTrait; protected $modelClass; protected $searchModelClass; diff --git a/lib/User/Controller/AdminController.php b/lib/User/Controller/AdminController.php index cb89364..077c182 100644 --- a/lib/User/Controller/AdminController.php +++ b/lib/User/Controller/AdminController.php @@ -21,7 +21,7 @@ use Da\User\Search\UserSearch; use Da\User\Service\UserBlockService; use Da\User\Service\UserConfirmationService; use Da\User\Service\UserCreateService; -use Da\User\Traits\ContainerTrait; +use Da\User\Traits\ContainerAwareTrait; use Da\User\Validator\AjaxRequestModelValidator; use Yii; use yii\base\Module; @@ -33,7 +33,7 @@ use yii\web\Controller; class AdminController extends Controller { - use ContainerTrait; + use ContainerAwareTrait; /** * @var UserQuery diff --git a/lib/User/Controller/RecoveryController.php b/lib/User/Controller/RecoveryController.php index 764208f..9af34e3 100644 --- a/lib/User/Controller/RecoveryController.php +++ b/lib/User/Controller/RecoveryController.php @@ -20,7 +20,7 @@ use Da\User\Query\TokenQuery; use Da\User\Query\UserQuery; use Da\User\Service\PasswordRecoveryService; use Da\User\Service\ResetPasswordService; -use Da\User\Traits\ContainerTrait; +use Da\User\Traits\ContainerAwareTrait; use Da\User\Validator\AjaxRequestModelValidator; use Yii; use Da\User\Module; @@ -30,7 +30,7 @@ use yii\web\NotFoundHttpException; class RecoveryController extends Controller { - use ContainerTrait; + use ContainerAwareTrait; protected $userQuery; protected $tokenQuery; diff --git a/lib/User/Controller/RegistrationController.php b/lib/User/Controller/RegistrationController.php index 672e0d4..277d4f8 100644 --- a/lib/User/Controller/RegistrationController.php +++ b/lib/User/Controller/RegistrationController.php @@ -26,7 +26,7 @@ use Da\User\Service\ResendConfirmationService; use Da\User\Service\UserConfirmationService; use Da\User\Service\UserCreateService; use Da\User\Service\UserRegisterService; -use Da\User\Traits\ContainerTrait; +use Da\User\Traits\ContainerAwareTrait; use Da\User\Validator\AjaxRequestModelValidator; use Yii; use yii\base\Module; @@ -36,7 +36,7 @@ use yii\web\NotFoundHttpException; class RegistrationController extends Controller { - use ContainerTrait; + use ContainerAwareTrait; protected $userQuery; protected $socialNetworkAccountQuery; diff --git a/lib/User/Controller/SecurityController.php b/lib/User/Controller/SecurityController.php index aabf320..617a896 100644 --- a/lib/User/Controller/SecurityController.php +++ b/lib/User/Controller/SecurityController.php @@ -18,17 +18,18 @@ use Da\User\Form\LoginForm; use Da\User\Query\SocialNetworkAccountQuery; use Da\User\Service\SocialNetworkAccountConnectService; use Da\User\Service\SocialNetworkAuthenticateService; -use Da\User\Traits\ContainerTrait; +use Da\User\Traits\ContainerAwareTrait; use yii\authclient\AuthAction; use yii\base\Module; use yii\filters\AccessControl; use yii\filters\VerbFilter; use yii\web\Controller; use Yii; +use \yii\web\Response; class SecurityController extends Controller { - use ContainerTrait; + use ContainerAwareTrait; protected $socialNetworkAccountQuery; @@ -97,11 +98,16 @@ class SecurityController extends Controller ]; } + /** + * Controller action responsible for handling login page and actions. + * @return string|Response + */ public function actionLogin() { if (!Yii::$app->user->getIsGuest()) { return $this->goHome(); } + /** @var LoginForm $form */ $form = $this->make(LoginForm::class); /** @var FormEvent $event */ diff --git a/lib/User/Controller/SettingsController.php b/lib/User/Controller/SettingsController.php index c231392..0f907e3 100644 --- a/lib/User/Controller/SettingsController.php +++ b/lib/User/Controller/SettingsController.php @@ -25,7 +25,7 @@ use Da\User\Query\ProfileQuery; use Da\User\Query\SocialNetworkAccountQuery; use Da\User\Query\UserQuery; use Da\User\Service\EmailChangeService; -use Da\User\Traits\ContainerTrait; +use Da\User\Traits\ContainerAwareTrait; use Da\User\Validator\AjaxRequestModelValidator; use yii\filters\AccessControl; use yii\filters\VerbFilter; @@ -36,7 +36,7 @@ use yii\web\NotFoundHttpException; class SettingsController extends Controller { - use ContainerTrait; + use ContainerAwareTrait; protected $profileQuery; protected $userQuery; diff --git a/lib/User/Form/RecoveryForm.php b/lib/User/Form/RecoveryForm.php index dcb839b..b6626b9 100644 --- a/lib/User/Form/RecoveryForm.php +++ b/lib/User/Form/RecoveryForm.php @@ -12,13 +12,13 @@ namespace Da\User\Form; use Da\User\Query\UserQuery; -use Da\User\Traits\ContainerTrait; +use Da\User\Traits\ContainerAwareTrait; use Yii; use yii\base\Model; class RecoveryForm extends Model { - use ContainerTrait; + use ContainerAwareTrait; const SCENARIO_REQUEST = 'request'; const SCENARIO_RESET = 'reset'; diff --git a/lib/User/Form/RegistrationForm.php b/lib/User/Form/RegistrationForm.php index b59f786..bd10da2 100644 --- a/lib/User/Form/RegistrationForm.php +++ b/lib/User/Form/RegistrationForm.php @@ -12,7 +12,7 @@ namespace Da\User\Form; use Da\User\Model\User; -use Da\User\Traits\ContainerTrait; +use Da\User\Traits\ContainerAwareTrait; use Da\User\Traits\ModuleTrait; use Yii; use yii\base\Model; @@ -20,7 +20,7 @@ use yii\base\Model; class RegistrationForm extends Model { use ModuleTrait; - use ContainerTrait; + use ContainerAwareTrait; /** * @var string User email address diff --git a/lib/User/Form/SettingsForm.php b/lib/User/Form/SettingsForm.php index 06833fc..8bc8345 100644 --- a/lib/User/Form/SettingsForm.php +++ b/lib/User/Form/SettingsForm.php @@ -14,7 +14,7 @@ namespace Da\User\Form; use Da\User\Factory\EmailChangeStrategyFactory; use Da\User\Helper\SecurityHelper; use Da\User\Model\User; -use Da\User\Traits\ContainerTrait; +use Da\User\Traits\ContainerAwareTrait; use Da\User\Traits\ModuleTrait; use Yii; use yii\base\Model; @@ -22,7 +22,7 @@ use yii\base\Model; class SettingsForm extends Model { use ModuleTrait; - use ContainerTrait; + use ContainerAwareTrait; /** * @var string diff --git a/lib/User/Model/Profile.php b/lib/User/Model/Profile.php index 04dd0eb..8b06718 100644 --- a/lib/User/Model/Profile.php +++ b/lib/User/Model/Profile.php @@ -13,7 +13,7 @@ namespace Da\User\Model; use Da\User\Helper\GravatarHelper; use Da\User\Query\ProfileQuery; -use Da\User\Traits\ContainerTrait; +use Da\User\Traits\ContainerAwareTrait; use Da\User\Traits\ModuleTrait; use Da\User\Validator\TimeZoneValidator; use Yii; @@ -37,7 +37,7 @@ use DateTime; class Profile extends ActiveRecord { use ModuleTrait; - use ContainerTrait; + use ContainerAwareTrait; /** * {@inheritdoc} diff --git a/lib/User/Model/SocialNetworkAccount.php b/lib/User/Model/SocialNetworkAccount.php index 8070c81..6f970a4 100644 --- a/lib/User/Model/SocialNetworkAccount.php +++ b/lib/User/Model/SocialNetworkAccount.php @@ -12,7 +12,7 @@ namespace Da\User\Model; use Da\User\Query\SocialNetworkAccountQuery; -use Da\User\Traits\ContainerTrait; +use Da\User\Traits\ContainerAwareTrait; use Da\User\Traits\ModuleTrait; use Yii; use yii\db\ActiveRecord; @@ -35,7 +35,7 @@ use yii\helpers\Url; class SocialNetworkAccount extends ActiveRecord { use ModuleTrait; - use ContainerTrait; + use ContainerAwareTrait; /** * @var array json decoded properties diff --git a/lib/User/Model/Token.php b/lib/User/Model/Token.php index e0c7aab..052ba7f 100644 --- a/lib/User/Model/Token.php +++ b/lib/User/Model/Token.php @@ -13,7 +13,7 @@ namespace Da\User\Model; use Da\User\Helper\SecurityHelper; use Da\User\Query\TokenQuery; -use Da\User\Traits\ContainerTrait; +use Da\User\Traits\ContainerAwareTrait; use Da\User\Traits\ModuleTrait; use yii\db\ActiveRecord; use yii\helpers\Url; @@ -33,7 +33,7 @@ use RuntimeException; class Token extends ActiveRecord { use ModuleTrait; - use ContainerTrait; + use ContainerAwareTrait; const TYPE_CONFIRMATION = 0; const TYPE_RECOVERY = 1; diff --git a/lib/User/Model/User.php b/lib/User/Model/User.php index 260383b..385891e 100644 --- a/lib/User/Model/User.php +++ b/lib/User/Model/User.php @@ -13,7 +13,7 @@ namespace Da\User\Model; use Da\User\Helper\SecurityHelper; use Da\User\Query\UserQuery; -use Da\User\Traits\ContainerTrait; +use Da\User\Traits\ContainerAwareTrait; use Da\User\Traits\ModuleTrait; use Yii; use yii\base\NotSupportedException; @@ -51,7 +51,7 @@ use yii\web\IdentityInterface; class User extends ActiveRecord implements IdentityInterface { use ModuleTrait; - use ContainerTrait; + use ContainerAwareTrait; // following constants are used on secured email changing process const OLD_EMAIL_CONFIRMED = 0b1; diff --git a/lib/User/Search/AbstractAuthItemSearch.php b/lib/User/Search/AbstractAuthItemSearch.php index be7b8f2..0eb80a2 100644 --- a/lib/User/Search/AbstractAuthItemSearch.php +++ b/lib/User/Search/AbstractAuthItemSearch.php @@ -12,7 +12,7 @@ namespace Da\User\Search; use Da\User\Traits\AuthManagerTrait; -use Da\User\Traits\ContainerTrait; +use Da\User\Traits\ContainerAwareTrait; use yii\base\Model; use yii\data\ArrayDataProvider; use yii\db\Query; @@ -20,7 +20,7 @@ use yii\db\Query; abstract class AbstractAuthItemSearch extends Model { use AuthManagerTrait; - use ContainerTrait; + use ContainerAwareTrait; /** * @var string diff --git a/lib/User/Service/AuthItemEditionService.php b/lib/User/Service/AuthItemEditionService.php index b2c8269..a452de3 100644 --- a/lib/User/Service/AuthItemEditionService.php +++ b/lib/User/Service/AuthItemEditionService.php @@ -15,13 +15,13 @@ use Da\User\Contracts\ServiceInterface; use Da\User\Factory\AuthItemFactory; use Da\User\Model\AbstractAuthItem; use Da\User\Traits\AuthManagerTrait; -use Da\User\Traits\ContainerTrait; +use Da\User\Traits\ContainerAwareTrait; use Exception; class AuthItemEditionService implements ServiceInterface { use AuthManagerTrait; - use ContainerTrait; + use ContainerAwareTrait; protected $model; diff --git a/lib/User/Service/SocialNetworkAccountConnectService.php b/lib/User/Service/SocialNetworkAccountConnectService.php index 3758910..20cdfd7 100644 --- a/lib/User/Service/SocialNetworkAccountConnectService.php +++ b/lib/User/Service/SocialNetworkAccountConnectService.php @@ -18,12 +18,12 @@ use Da\User\Event\SocialNetworkAuthEvent; use Da\User\Model\SocialNetworkAccount; use Da\User\Model\User; use Da\User\Query\SocialNetworkAccountQuery; -use Da\User\Traits\ContainerTrait; +use Da\User\Traits\ContainerAwareTrait; use Yii; class SocialNetworkAccountConnectService implements ServiceInterface { - use ContainerTrait; + use ContainerAwareTrait; protected $controller; protected $client; diff --git a/lib/User/Strategy/DefaultEmailChangeStrategy.php b/lib/User/Strategy/DefaultEmailChangeStrategy.php index 5c62aa5..ef1a4d0 100644 --- a/lib/User/Strategy/DefaultEmailChangeStrategy.php +++ b/lib/User/Strategy/DefaultEmailChangeStrategy.php @@ -15,12 +15,12 @@ use Da\User\Contracts\MailChangeStrategyInterface; use Da\User\Factory\MailFactory; use Da\User\Factory\TokenFactory; use Da\User\Form\SettingsForm; -use Da\User\Traits\ContainerTrait; +use Da\User\Traits\ContainerAwareTrait; use Yii; class DefaultEmailChangeStrategy implements MailChangeStrategyInterface { - use ContainerTrait; + use ContainerAwareTrait; protected $form; diff --git a/lib/User/Strategy/SecureEmailChangeStrategy.php b/lib/User/Strategy/SecureEmailChangeStrategy.php index bd5dadb..0c43fa6 100644 --- a/lib/User/Strategy/SecureEmailChangeStrategy.php +++ b/lib/User/Strategy/SecureEmailChangeStrategy.php @@ -16,12 +16,12 @@ use Da\User\Factory\MailFactory; use Da\User\Factory\TokenFactory; use Da\User\Form\SettingsForm; use Da\User\Model\User; -use Da\User\Traits\ContainerTrait; +use Da\User\Traits\ContainerAwareTrait; use Yii; class SecureEmailChangeStrategy implements MailChangeStrategyInterface { - use ContainerTrait; + use ContainerAwareTrait; protected $form; diff --git a/lib/User/Traits/ContainerTrait.php b/lib/User/Traits/ContainerAwareTrait.php similarity index 98% rename from lib/User/Traits/ContainerTrait.php rename to lib/User/Traits/ContainerAwareTrait.php index 4b0e754..6648128 100644 --- a/lib/User/Traits/ContainerTrait.php +++ b/lib/User/Traits/ContainerAwareTrait.php @@ -21,7 +21,7 @@ use yii\di\Container; * @property-ready Da\User\Helper\AuthHelper $auth * @property-ready Da\User\Helper\ClassMapHelper $classMap */ -trait ContainerTrait +trait ContainerAwareTrait { /** * @return Container diff --git a/lib/User/Widget/AssignmentsWidget.php b/lib/User/Widget/AssignmentsWidget.php index 3876a35..8a97ee3 100644 --- a/lib/User/Widget/AssignmentsWidget.php +++ b/lib/User/Widget/AssignmentsWidget.php @@ -14,7 +14,7 @@ namespace Da\User\Widget; use Da\User\Model\Assignment; use Da\User\Service\UpdateAuthAssignmentsService; use Da\User\Traits\AuthManagerTrait; -use Da\User\Traits\ContainerTrait; +use Da\User\Traits\ContainerAwareTrait; use yii\base\InvalidConfigException; use yii\base\Widget; use yii\helpers\ArrayHelper; @@ -22,7 +22,7 @@ use yii\helpers\ArrayHelper; class AssignmentsWidget extends Widget { use AuthManagerTrait; - use ContainerTrait; + use ContainerAwareTrait; /** * @var int ID of the user to whom auth items will be assigned