From 3e0a323a7a170aab56f277a26f03612418b2f071 Mon Sep 17 00:00:00 2001 From: Gonzalo Bourdieu Date: Fri, 2 Jul 2021 01:11:50 -0300 Subject: [PATCH 01/18] Se renombro el namespace --- .gitignore | 1 + Module.php | 30 +++++++++--------- README.md | 8 ++--- SOCIAL.md | 6 ++-- components/RedditAuth.php | 2 +- components/User.php | 12 +++---- composer.json | 5 +-- controllers/AdminController.php | 14 ++++----- controllers/AuthController.php | 48 ++++++++++++++-------------- controllers/CopyController.php | 2 +- controllers/DefaultController.php | 52 +++++++++++++++---------------- helpers/Timezone.php | 2 +- mail/confirmEmail.php | 6 ++-- mail/forgotPassword.php | 4 +-- mail/loginToken.php | 4 +-- models/Profile.php | 4 +-- models/Role.php | 4 +-- models/User.php | 4 +-- models/UserAuth.php | 4 +-- models/UserToken.php | 4 +-- models/forms/ForgotForm.php | 10 +++--- models/forms/LoginEmailForm.php | 4 +-- models/forms/LoginForm.php | 12 +++---- models/forms/ResendForm.php | 14 ++++----- models/search/UserSearch.php | 10 +++--- views/admin/_form.php | 8 ++--- views/admin/_search.php | 2 +- views/admin/create.php | 4 +-- views/admin/index.php | 8 ++--- views/admin/update.php | 4 +-- views/admin/view.php | 2 +- views/default/account.php | 6 ++-- views/default/forgot.php | 2 +- views/default/index.php | 2 +- views/default/login.php | 2 +- views/default/loginCallback.php | 8 ++--- views/default/loginEmail.php | 4 +-- views/default/profile.php | 4 +-- views/default/register.php | 6 ++-- views/default/resend.php | 2 +- views/default/reset.php | 2 +- 41 files changed, 167 insertions(+), 165 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a09c56d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/.idea diff --git a/Module.php b/Module.php index 11f6a29..d0d58aa 100644 --- a/Module.php +++ b/Module.php @@ -1,6 +1,6 @@ "amnah\yii2\user\models\User"] + * @var array Model classes, e.g., ["User" => "faro\core\user\models\User"] * Usage: * $user = Yii::$app->getModule("user")->model("User", $config); * (equivalent to) - * $user = new \amnah\yii2\user\models\User($config); + * $user = new \faro\core\user\models\User($config); * * The model classes here will be merged with/override the [[getDefaultModelClasses()|default ones]] */ @@ -182,8 +182,8 @@ protected function checkModuleProperties() // "common/config" instead of "frontend/config" and/or "backend/config" // -> this results in users failing to login without any feedback/error message $userComponent = Yii::$app->get('user', false); - if ($userComponent && !$userComponent instanceof \amnah\yii2\user\components\User) { - throw new InvalidConfigException('Yii::$app->user is not set properly. It needs to extend \amnah\yii2\user\components\User'); + if ($userComponent && !$userComponent instanceof \faro\core\user\components\User) { + throw new InvalidConfigException('Yii::$app->user is not set properly. It needs to extend \faro\core\user\components\User'); } } @@ -199,20 +199,20 @@ protected function getDefaultModelClasses() } elseif (class_exists('app\models\User')) { $userClass = 'app\models\User'; } else { - $userClass = 'amnah\yii2\user\models\User'; + $userClass = 'faro\core\user\models\User'; } return [ 'User' => $userClass, - 'Profile' => 'amnah\yii2\user\models\Profile', - 'Role' => 'amnah\yii2\user\models\Role', - 'UserToken' => 'amnah\yii2\user\models\UserToken', - 'UserAuth' => 'amnah\yii2\user\models\UserAuth', - 'ForgotForm' => 'amnah\yii2\user\models\forms\ForgotForm', - 'LoginForm' => 'amnah\yii2\user\models\forms\LoginForm', - 'ResendForm' => 'amnah\yii2\user\models\forms\ResendForm', - 'UserSearch' => 'amnah\yii2\user\models\search\UserSearch', - 'LoginEmailForm' => 'amnah\yii2\user\models\forms\LoginEmailForm', + 'Profile' => 'faro\core\user\models\Profile', + 'Role' => 'faro\core\user\models\Role', + 'UserToken' => 'faro\core\user\models\UserToken', + 'UserAuth' => 'faro\core\user\models\UserAuth', + 'ForgotForm' => 'faro\core\user\models\forms\ForgotForm', + 'LoginForm' => 'faro\core\user\models\forms\LoginForm', + 'ResendForm' => 'faro\core\user\models\forms\ResendForm', + 'UserSearch' => 'faro\core\user\models\search\UserSearch', + 'LoginEmailForm' => 'faro\core\user\models\forms\LoginEmailForm', ]; } diff --git a/README.md b/README.md index 821c0c7..a49d528 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ return [ // 'frontend/config/main.php' and/or 'backend/config/main.php' (OR you can add it // to 'common/config' if you remove it from frontend/backend) 'user' => [ - 'class' => 'amnah\yii2\user\components\User', + 'class' => 'faro\core\user\components\User', ], 'mailer' => [ 'class' => 'yii\swiftmailer\Mailer', @@ -60,7 +60,7 @@ return [ ], 'modules' => [ 'user' => [ - 'class' => 'amnah\yii2\user\Module', + 'class' => 'faro\core\user\Module', // set custom module properties here ... ], ], @@ -211,7 +211,7 @@ To do so, you can use the helper command ```CopyController```. // app/config/console.php 'modules' => [ 'user' => [ - 'class' => 'amnah\yii2\user\Module', + 'class' => 'faro\core\user\Module', ], ], ``` @@ -235,7 +235,7 @@ php yii user/copy --from=@vendor/amnah/yii2-user --to=@app/modules/user --namesp ``` **Alternatively,** you can do this manually. Just copy/paste the files wherever you'd like and -change the namespaces in the files. Replace ```amnah\yii2\user``` with ```app\modules\user```. +change the namespaces in the files. Replace ```faro\core\user``` with ```app\modules\user```. ## Todo * Tests diff --git a/SOCIAL.md b/SOCIAL.md index fc60068..957e2a0 100644 --- a/SOCIAL.md +++ b/SOCIAL.md @@ -45,7 +45,7 @@ auth clients** 'clientSecret' => 'yyyyyyyyyy', ], 'reddit' => [ - 'class' => 'amnah\yii2\user\components\RedditAuth', + 'class' => 'faro\core\user\components\RedditAuth', 'clientId' => 'xxxxxxxxxx', 'clientSecret' => 'yyyyyyyyyy', 'scope' => 'identity', // comma separated string, NO SPACES @@ -113,8 +113,8 @@ Let's take a look at the basic implementation for facebook: */ protected function setInfoFacebook($attributes) { - /** @var \amnah\yii2\user\models\User $user */ - /** @var \amnah\yii2\user\models\Profile $profile */ + /** @var \faro\core\user\models\User $user */ + /** @var \faro\core\user\models\Profile $profile */ $user = Yii::$app->getModule("user")->model("User"); $profile = Yii::$app->getModule("user")->model("Profile"); diff --git a/components/RedditAuth.php b/components/RedditAuth.php index 7d52655..8b1ffaa 100644 --- a/components/RedditAuth.php +++ b/components/RedditAuth.php @@ -1,6 +1,6 @@ updateLoginMeta(); parent::afterLogin($identity, $cookieBased, $duration); } @@ -67,7 +67,7 @@ public function afterLogin($identity, $cookieBased, $duration) */ public function getDisplayName() { - /** @var \amnah\yii2\user\models\User $user */ + /** @var \faro\core\user\models\User $user */ $user = $this->getIdentity(); return $user ? $user->getDisplayName() : ""; } @@ -90,7 +90,7 @@ public function can($permissionName, $params = [], $allowCaching = true) } // otherwise use our own custom permission (via the role table) - /** @var \amnah\yii2\user\models\User $user */ + /** @var \faro\core\user\models\User $user */ $user = $this->getIdentity(); return $user ? $user->can($permissionName) : false; } diff --git a/composer.json b/composer.json index af83867..8422d23 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,6 @@ { - "name": "amnah/yii2-user", + "name": "faro/yii2-user", + "version": "dev-2021.3-alpha", "description": "Yii 2 user authentication module", "keywords": ["yii", "yii2", "user", "auth", "authentication"], "type": "yii2-extension", @@ -15,6 +16,6 @@ "yiisoft/yii2-authclient": "*" }, "autoload": { - "psr-4": { "amnah\\yii2\\user\\": "" } + "psr-4": { "faro\\core\\user\\": "" } } } \ No newline at end of file diff --git a/controllers/AdminController.php b/controllers/AdminController.php index b75bf29..cfd873e 100644 --- a/controllers/AdminController.php +++ b/controllers/AdminController.php @@ -1,9 +1,9 @@ module->model("UserSearch"); $dataProvider = $searchModel->search(Yii::$app->request->getQueryParams()); @@ -83,8 +83,8 @@ public function actionView($id) */ public function actionCreate() { - /** @var \amnah\yii2\user\models\User $user */ - /** @var \amnah\yii2\user\models\Profile $profile */ + /** @var \faro\core\user\models\User $user */ + /** @var \faro\core\user\models\Profile $profile */ $user = $this->module->model("User"); $user->setScenario("admin"); @@ -174,7 +174,7 @@ public function actionDelete($id) */ protected function findModel($id) { - /** @var \amnah\yii2\user\models\User $user */ + /** @var \faro\core\user\models\User $user */ $user = $this->module->model("User"); $user = $user::findOne($id); if ($user) { diff --git a/controllers/AuthController.php b/controllers/AuthController.php index cc378df..814fd6d 100644 --- a/controllers/AuthController.php +++ b/controllers/AuthController.php @@ -1,6 +1,6 @@ getUserAttributes(); @@ -117,9 +117,9 @@ protected function initUserAuth($client) */ protected function attemptLogin($client) { - /** @var \amnah\yii2\user\models\User $user */ - /** @var \amnah\yii2\user\models\UserAuth $userAuth */ - /** @var \amnah\yii2\user\models\UserToken $userToken */ + /** @var \faro\core\user\models\User $user */ + /** @var \faro\core\user\models\UserAuth $userAuth */ + /** @var \faro\core\user\models\UserToken $userToken */ $user = $this->module->model("User"); $userAuth = $this->module->model("UserAuth"); $userToken = $this->module->model("UserToken"); @@ -175,13 +175,13 @@ protected function attemptLogin($client) /** * Register a new user using client attributes and then associate userAuth * @param \yii\authclient\BaseClient $client - * @param \amnah\yii2\user\models\UserAuth $userAuth + * @param \faro\core\user\models\UserAuth $userAuth */ protected function registerAndLoginUser($client, $userAuth) { - /** @var \amnah\yii2\user\models\User $user */ - /** @var \amnah\yii2\user\models\Profile $profile */ - /** @var \amnah\yii2\user\models\Role $role */ + /** @var \faro\core\user\models\User $user */ + /** @var \faro\core\user\models\Profile $profile */ + /** @var \faro\core\user\models\Role $role */ $role = $this->module->model("Role"); // set user and profile info @@ -206,7 +206,7 @@ protected function registerAndLoginUser($client, $userAuth) /** * Double checks username to ensure that it isn't already taken. If so, * revert to fallback - * @param \amnah\yii2\user\models\User $user + * @param \faro\core\user\models\User $user * @param string $fallbackUsername * @return mixed */ @@ -230,8 +230,8 @@ protected function doubleCheckUsername($user, $fallbackUsername) */ protected function setInfoFacebook($attributes) { - /** @var \amnah\yii2\user\models\User $user */ - /** @var \amnah\yii2\user\models\Profile $profile */ + /** @var \faro\core\user\models\User $user */ + /** @var \faro\core\user\models\Profile $profile */ $user = $this->module->model("User"); $profile = $this->module->model("Profile"); @@ -261,8 +261,8 @@ protected function setInfoFacebook($attributes) */ protected function setInfoTwitter($attributes) { - /** @var \amnah\yii2\user\models\User $user */ - /** @var \amnah\yii2\user\models\Profile $profile */ + /** @var \faro\core\user\models\User $user */ + /** @var \faro\core\user\models\Profile $profile */ $user = $this->module->model("User"); $profile = $this->module->model("Profile"); @@ -279,8 +279,8 @@ protected function setInfoTwitter($attributes) */ protected function setInfoGoogle($attributes) { - /** @var \amnah\yii2\user\models\User $user */ - /** @var \amnah\yii2\user\models\Profile $profile */ + /** @var \faro\core\user\models\User $user */ + /** @var \faro\core\user\models\Profile $profile */ $user = $this->module->model("User"); $profile = $this->module->model("Profile"); @@ -297,8 +297,8 @@ protected function setInfoGoogle($attributes) */ protected function setInfoReddit($attributes) { - /** @var \amnah\yii2\user\models\User $user */ - /** @var \amnah\yii2\user\models\Profile $profile */ + /** @var \faro\core\user\models\User $user */ + /** @var \faro\core\user\models\Profile $profile */ $user = $this->module->model("User"); $profile = $this->module->model("Profile"); @@ -314,8 +314,8 @@ protected function setInfoReddit($attributes) */ protected function setInfoLinkedIn($attributes) { - /** @var \amnah\yii2\user\models\User $user */ - /** @var \amnah\yii2\user\models\Profile $profile */ + /** @var \faro\core\user\models\User $user */ + /** @var \faro\core\user\models\Profile $profile */ $user = $this->module->model("User"); $profile = $this->module->model("Profile"); @@ -334,8 +334,8 @@ protected function setInfoLinkedIn($attributes) */ protected function setInfoVkontakte($attributes) { - /** @var \amnah\yii2\user\models\User $user */ - /** @var \amnah\yii2\user\models\Profile $profile */ + /** @var \faro\core\user\models\User $user */ + /** @var \faro\core\user\models\Profile $profile */ $user = $this->module->model("User"); $profile = $this->module->model("Profile"); diff --git a/controllers/CopyController.php b/controllers/CopyController.php index 8e3637c..da7c951 100644 --- a/controllers/CopyController.php +++ b/controllers/CopyController.php @@ -1,6 +1,6 @@ module->model("LoginForm"); // load post data and login @@ -93,7 +93,7 @@ public function actionLogin() */ public function actionLoginEmail() { - /** @var \amnah\yii2\user\models\forms\LoginEmailForm $loginEmailForm */ + /** @var \faro\core\user\models\forms\LoginEmailForm $loginEmailForm */ $loginEmailForm = $this->module->model("LoginEmailForm"); // load post data and validate @@ -113,10 +113,10 @@ public function actionLoginEmail() */ public function actionLoginCallback($token) { - /** @var \amnah\yii2\user\models\User $user */ - /** @var \amnah\yii2\user\models\Profile $profile */ - /** @var \amnah\yii2\user\models\Role $role */ - /** @var \amnah\yii2\user\models\UserToken $userToken */ + /** @var \faro\core\user\models\User $user */ + /** @var \faro\core\user\models\Profile $profile */ + /** @var \faro\core\user\models\Role $role */ + /** @var \faro\core\user\models\UserToken $userToken */ $user = $this->module->model("User"); $profile = $this->module->model("Profile"); @@ -196,9 +196,9 @@ public function actionLogout() */ public function actionRegister() { - /** @var \amnah\yii2\user\models\User $user */ - /** @var \amnah\yii2\user\models\Profile $profile */ - /** @var \amnah\yii2\user\models\Role $role */ + /** @var \faro\core\user\models\User $user */ + /** @var \faro\core\user\models\Profile $profile */ + /** @var \faro\core\user\models\Role $role */ // set up new user/profile objects $user = $this->module->model("User", ["scenario" => "register"]); @@ -242,11 +242,11 @@ public function actionRegister() /** * Process data after registration - * @param \amnah\yii2\user\models\User $user + * @param \faro\core\user\models\User $user */ protected function afterRegister($user) { - /** @var \amnah\yii2\user\models\UserToken $userToken */ + /** @var \faro\core\user\models\UserToken $userToken */ $userToken = $this->module->model("UserToken"); // determine userToken type to see if we need to send email @@ -275,8 +275,8 @@ protected function afterRegister($user) */ public function actionConfirm($token) { - /** @var \amnah\yii2\user\models\UserToken $userToken */ - /** @var \amnah\yii2\user\models\User $user */ + /** @var \faro\core\user\models\UserToken $userToken */ + /** @var \faro\core\user\models\User $user */ // search for userToken $success = false; @@ -307,8 +307,8 @@ public function actionConfirm($token) */ public function actionAccount() { - /** @var \amnah\yii2\user\models\User $user */ - /** @var \amnah\yii2\user\models\UserToken $userToken */ + /** @var \faro\core\user\models\User $user */ + /** @var \faro\core\user\models\UserToken $userToken */ // set up user and load post data $user = Yii::$app->user->identity; @@ -352,7 +352,7 @@ public function actionAccount() */ public function actionProfile() { - /** @var \amnah\yii2\user\models\Profile $profile */ + /** @var \faro\core\user\models\Profile $profile */ // set up profile and load post data $profile = Yii::$app->user->identity->profile; @@ -379,7 +379,7 @@ public function actionProfile() */ public function actionResend() { - /** @var \amnah\yii2\user\models\forms\ResendForm $model */ + /** @var \faro\core\user\models\forms\ResendForm $model */ // load post data and send email $model = $this->module->model("ResendForm"); @@ -398,8 +398,8 @@ public function actionResend() */ public function actionResendChange() { - /** @var \amnah\yii2\user\models\User $user */ - /** @var \amnah\yii2\user\models\UserToken $userToken */ + /** @var \faro\core\user\models\User $user */ + /** @var \faro\core\user\models\UserToken $userToken */ // find userToken of type email change $user = Yii::$app->user->identity; @@ -420,8 +420,8 @@ public function actionResendChange() */ public function actionCancel() { - /** @var \amnah\yii2\user\models\User $user */ - /** @var \amnah\yii2\user\models\UserToken $userToken */ + /** @var \faro\core\user\models\User $user */ + /** @var \faro\core\user\models\UserToken $userToken */ // find userToken of type email change $user = Yii::$app->user->identity; @@ -440,7 +440,7 @@ public function actionCancel() */ public function actionForgot() { - /** @var \amnah\yii2\user\models\forms\ForgotForm $model */ + /** @var \faro\core\user\models\forms\ForgotForm $model */ // load post data and send email $model = $this->module->model("ForgotForm"); @@ -459,8 +459,8 @@ public function actionForgot() */ public function actionReset($token) { - /** @var \amnah\yii2\user\models\User $user */ - /** @var \amnah\yii2\user\models\UserToken $userToken */ + /** @var \faro\core\user\models\User $user */ + /** @var \faro\core\user\models\UserToken $userToken */ // get user token and check expiration $userToken = $this->module->model("UserToken"); diff --git a/helpers/Timezone.php b/helpers/Timezone.php index ee87bf6..856d002 100644 --- a/helpers/Timezone.php +++ b/helpers/Timezone.php @@ -1,6 +1,6 @@ $userToken->token], true); diff --git a/mail/forgotPassword.php b/mail/forgotPassword.php index 9e03513..c8ddc8a 100644 --- a/mail/forgotPassword.php +++ b/mail/forgotPassword.php @@ -5,8 +5,8 @@ /** * @var string $subject - * @var \amnah\yii2\user\models\User $user - * @var \amnah\yii2\user\models\UserToken $userToken + * @var \faro\core\user\models\User $user + * @var \faro\core\user\models\UserToken $userToken */ $url = Url::toRoute(["/user/reset", "token" => $userToken->token], true); diff --git a/mail/loginToken.php b/mail/loginToken.php index 9668c56..9377737 100644 --- a/mail/loginToken.php +++ b/mail/loginToken.php @@ -5,8 +5,8 @@ /** * @var string $subject - * @var \amnah\yii2\user\models\User $user - * @var \amnah\yii2\user\models\UserToken $userToken + * @var \faro\core\user\models\User $user + * @var \faro\core\user\models\UserToken $userToken */ $url = Url::toRoute(["/user/login-callback", "token" => $userToken->token], true); diff --git a/models/Profile.php b/models/Profile.php index 5690fa9..074b64b 100644 --- a/models/Profile.php +++ b/models/Profile.php @@ -1,6 +1,6 @@ validate()) { diff --git a/models/forms/LoginEmailForm.php b/models/forms/LoginEmailForm.php index 772f89a..04996cf 100644 --- a/models/forms/LoginEmailForm.php +++ b/models/forms/LoginEmailForm.php @@ -1,6 +1,6 @@ validate()) { return false; diff --git a/models/forms/LoginForm.php b/models/forms/LoginForm.php index af39a97..e89ead8 100644 --- a/models/forms/LoginForm.php +++ b/models/forms/LoginForm.php @@ -1,6 +1,6 @@ status == $user::STATUS_INACTIVE) { - /** @var \amnah\yii2\user\models\UserToken $userToken */ + /** @var \faro\core\user\models\UserToken $userToken */ $userToken = $this->module->model("UserToken"); $userToken = $userToken::generate($user->id, $userToken::TYPE_EMAIL_ACTIVATE); $user->sendEmailConfirmation($userToken); @@ -103,7 +103,7 @@ public function validatePassword() return; } - /** @var \amnah\yii2\user\models\User $user */ + /** @var \faro\core\user\models\User $user */ // check if password is correct $user = $this->getUser(); @@ -114,7 +114,7 @@ public function validatePassword() /** * Get user based on email and/or username - * @return \amnah\yii2\user\models\User|null + * @return \faro\core\user\models\User|null */ public function getUser() { diff --git a/models/forms/ResendForm.php b/models/forms/ResendForm.php index 05d4af7..09b3104 100644 --- a/models/forms/ResendForm.php +++ b/models/forms/ResendForm.php @@ -1,6 +1,6 @@ user === false) { - /** @var \amnah\yii2\user\models\User $user */ - /** @var \amnah\yii2\user\models\UserToken $userToken */ + /** @var \faro\core\user\models\User $user */ + /** @var \faro\core\user\models\UserToken $userToken */ $user = $this->module->model("User"); $userToken = $this->module->model("UserToken"); @@ -110,7 +110,7 @@ public function sendEmail() return false; } - /** @var \amnah\yii2\user\models\UserToken $userToken */ + /** @var \faro\core\user\models\UserToken $userToken */ $user = $this->getUser(); $userToken = $this->module->model("UserToken"); diff --git a/models/search/UserSearch.php b/models/search/UserSearch.php index 7881880..3b6cc0e 100644 --- a/models/search/UserSearch.php +++ b/models/search/UserSearch.php @@ -1,14 +1,14 @@ module->model("User"); diff --git a/views/admin/_form.php b/views/admin/_form.php index 5a861ee..1ed6a35 100644 --- a/views/admin/_form.php +++ b/views/admin/_form.php @@ -5,10 +5,10 @@ /** * @var yii\web\View $this - * @var amnah\yii2\user\Module $module - * @var amnah\yii2\user\models\User $user - * @var amnah\yii2\user\models\Profile $profile - * @var amnah\yii2\user\models\Role $role + * @var faro\core\user\Module $module + * @var faro\core\user\models\User $user + * @var faro\core\user\models\Profile $profile + * @var faro\core\user\models\Role $role * @var yii\widgets\ActiveForm $form */ diff --git a/views/admin/_search.php b/views/admin/_search.php index c010fe4..cde0cee 100644 --- a/views/admin/_search.php +++ b/views/admin/_search.php @@ -5,7 +5,7 @@ /** * @var yii\web\View $this - * @var amnah\yii2\user\models\search\UserSearch $model + * @var faro\core\user\models\search\UserSearch $model * @var yii\widgets\ActiveForm $form */ ?> diff --git a/views/admin/create.php b/views/admin/create.php index 55c0e55..57b384f 100644 --- a/views/admin/create.php +++ b/views/admin/create.php @@ -4,8 +4,8 @@ /** * @var yii\web\View $this - * @var amnah\yii2\user\models\User $user - * @var amnah\yii2\user\models\Profile $profile + * @var faro\core\user\models\User $user + * @var faro\core\user\models\Profile $profile */ $this->title = Yii::t('user', 'Create {modelClass}', [ diff --git a/views/admin/index.php b/views/admin/index.php index 052e7e6..c09c3ee 100644 --- a/views/admin/index.php +++ b/views/admin/index.php @@ -6,10 +6,10 @@ /** * @var yii\web\View $this * @var yii\data\ActiveDataProvider $dataProvider - * @var amnah\yii2\user\Module $module - * @var amnah\yii2\user\models\search\UserSearch $searchModel - * @var amnah\yii2\user\models\User $user - * @var amnah\yii2\user\models\Role $role + * @var faro\core\user\Module $module + * @var faro\core\user\models\search\UserSearch $searchModel + * @var faro\core\user\models\User $user + * @var faro\core\user\models\Role $role */ $module = $this->context->module; diff --git a/views/admin/update.php b/views/admin/update.php index dd6b7e1..af64b49 100644 --- a/views/admin/update.php +++ b/views/admin/update.php @@ -4,8 +4,8 @@ /** * @var yii\web\View $this - * @var amnah\yii2\user\models\User $user - * @var amnah\yii2\user\models\Profile $profile + * @var faro\core\user\models\User $user + * @var faro\core\user\models\Profile $profile */ $this->title = Yii::t('user', 'Update {modelClass}: ', [ diff --git a/views/admin/view.php b/views/admin/view.php index 7547ceb..e00c95f 100644 --- a/views/admin/view.php +++ b/views/admin/view.php @@ -5,7 +5,7 @@ /** * @var yii\web\View $this - * @var amnah\yii2\user\models\User $user + * @var faro\core\user\models\User $user */ $this->title = $user->id; diff --git a/views/default/account.php b/views/default/account.php index d55d985..84ab683 100644 --- a/views/default/account.php +++ b/views/default/account.php @@ -6,9 +6,9 @@ /** * @var yii\web\View $this * @var yii\widgets\ActiveForm $form - * @var amnah\yii2\user\Module $module - * @var amnah\yii2\user\models\User $user - * @var amnah\yii2\user\models\UserToken $userToken + * @var faro\core\user\Module $module + * @var faro\core\user\models\User $user + * @var faro\core\user\models\UserToken $userToken */ $module = $this->context->module; diff --git a/views/default/forgot.php b/views/default/forgot.php index 7f399f4..98ff05c 100644 --- a/views/default/forgot.php +++ b/views/default/forgot.php @@ -6,7 +6,7 @@ /** * @var yii\web\View $this * @var yii\widgets\ActiveForm $form - * @var amnah\yii2\user\models\forms\ForgotForm $model + * @var faro\core\user\models\forms\ForgotForm $model */ $this->title = Yii::t('user', 'Forgot password'); diff --git a/views/default/index.php b/views/default/index.php index 56d3fa9..d3e82e3 100644 --- a/views/default/index.php +++ b/views/default/index.php @@ -4,7 +4,7 @@ /** * @var yii\web\View $this - * @var amnah\yii2\user\Module $module + * @var faro\core\user\Module $module * @var array $actions */ diff --git a/views/default/login.php b/views/default/login.php index 8be2ddd..8ba935f 100644 --- a/views/default/login.php +++ b/views/default/login.php @@ -6,7 +6,7 @@ /** * @var yii\web\View $this * @var yii\widgets\ActiveForm $form - * @var amnah\yii2\user\models\forms\LoginForm $model + * @var faro\core\user\models\forms\LoginForm $model */ $this->title = Yii::t('user', 'Login'); diff --git a/views/default/loginCallback.php b/views/default/loginCallback.php index 979e500..abeb766 100644 --- a/views/default/loginCallback.php +++ b/views/default/loginCallback.php @@ -5,10 +5,10 @@ /** * @var yii\web\View $this - * @var amnah\yii2\user\Module $module - * @var amnah\yii2\user\models\User $user - * @var amnah\yii2\user\models\Profile $profile - * @var amnah\yii2\user\models\UserToken $userToken + * @var faro\core\user\Module $module + * @var faro\core\user\models\User $user + * @var faro\core\user\models\Profile $profile + * @var faro\core\user\models\UserToken $userToken */ $module = $this->context->module; diff --git a/views/default/loginEmail.php b/views/default/loginEmail.php index 1bba583..7648031 100644 --- a/views/default/loginEmail.php +++ b/views/default/loginEmail.php @@ -5,8 +5,8 @@ /** * @var yii\web\View $this - * @var amnah\yii2\user\Module $module - * @var amnah\yii2\user\models\forms\LoginEmailForm $loginEmailForm + * @var faro\core\user\Module $module + * @var faro\core\user\models\forms\LoginEmailForm $loginEmailForm */ $module = $this->context->module; diff --git a/views/default/profile.php b/views/default/profile.php index 1272e78..ac6995f 100644 --- a/views/default/profile.php +++ b/views/default/profile.php @@ -3,12 +3,12 @@ use yii\helpers\Html; use yii\helpers\ArrayHelper; use yii\widgets\ActiveForm; -use amnah\yii2\user\helpers\Timezone; +use faro\core\user\helpers\Timezone; /** * @var yii\web\View $this * @var yii\widgets\ActiveForm $form - * @var amnah\yii2\user\models\Profile $profile + * @var faro\core\user\models\Profile $profile */ $this->title = Yii::t('user', 'Profile'); diff --git a/views/default/register.php b/views/default/register.php index b96c29c..bf70cde 100644 --- a/views/default/register.php +++ b/views/default/register.php @@ -6,9 +6,9 @@ /** * @var yii\web\View $this * @var yii\widgets\ActiveForm $form - * @var amnah\yii2\user\Module $module - * @var amnah\yii2\user\models\User $user - * @var amnah\yii2\user\models\User $profile + * @var faro\core\user\Module $module + * @var faro\core\user\models\User $user + * @var faro\core\user\models\User $profile * @var string $userDisplayName */ diff --git a/views/default/resend.php b/views/default/resend.php index b0726a1..9ef7843 100644 --- a/views/default/resend.php +++ b/views/default/resend.php @@ -6,7 +6,7 @@ /** * @var yii\web\View $this * @var yii\widgets\ActiveForm $form - * @var amnah\yii2\user\models\forms\ResendForm $model + * @var faro\core\user\models\forms\ResendForm $model */ $this->title = Yii::t('user', 'Resend'); diff --git a/views/default/reset.php b/views/default/reset.php index 2f6d62e..c15467e 100644 --- a/views/default/reset.php +++ b/views/default/reset.php @@ -6,7 +6,7 @@ /** * @var yii\web\View $this * @var yii\widgets\ActiveForm $form - * @var amnah\yii2\user\models\User $user + * @var faro\core\user\models\User $user * @var bool $success * @var bool $invalidToken */ From a0fbc34090b03328702e2c8cb5ee421f61350707 Mon Sep 17 00:00:00 2001 From: Gonzalo Bourdieu Date: Fri, 2 Jul 2021 01:13:20 -0300 Subject: [PATCH 02/18] Se refactoreo el directorio para mantener estructura --- composer.json | 2 +- Module.php => src/Module.php | 0 {components => src/components}/RedditAuth.php | 0 {components => src/components}/User.php | 0 {controllers => src/controllers}/AdminController.php | 0 {controllers => src/controllers}/AuthController.php | 0 {controllers => src/controllers}/CopyController.php | 0 {controllers => src/controllers}/DefaultController.php | 0 {helpers => src/helpers}/Timezone.php | 0 {mail => src/mail}/confirmEmail.php | 0 {mail => src/mail}/forgotPassword.php | 0 {mail => src/mail}/layouts/html.php | 0 {mail => src/mail}/loginToken.php | 0 {messages => src/messages}/de/user.php | 0 {messages => src/messages}/es/user.php | 0 {messages => src/messages}/fa/user.php | 0 {messages => src/messages}/hu/user.php | 0 {messages => src/messages}/it/user.php | 0 {messages => src/messages}/ja/user.php | 0 {messages => src/messages}/pl/user.php | 0 {messages => src/messages}/pt-BR/user.php | 0 {messages => src/messages}/pt/user.php | 0 {messages => src/messages}/ru/user.php | 0 {messages => src/messages}/sk/user.php | 0 {messages => src/messages}/th/user.php | 0 {messages => src/messages}/uk/user.php | 0 {messages => src/messages}/zh-CN/user.php | 0 {migrations => src/migrations}/m150214_044831_init_user.php | 0 {models => src/models}/Profile.php | 0 {models => src/models}/Role.php | 0 {models => src/models}/User.php | 0 {models => src/models}/UserAuth.php | 0 {models => src/models}/UserToken.php | 0 {models => src/models}/forms/ForgotForm.php | 0 {models => src/models}/forms/LoginEmailForm.php | 0 {models => src/models}/forms/LoginForm.php | 0 {models => src/models}/forms/ResendForm.php | 0 {models => src/models}/search/UserSearch.php | 0 {views => src/views}/admin/_form.php | 0 {views => src/views}/admin/_search.php | 0 {views => src/views}/admin/create.php | 0 {views => src/views}/admin/index.php | 0 {views => src/views}/admin/update.php | 0 {views => src/views}/admin/view.php | 0 {views => src/views}/default/account.php | 0 {views => src/views}/default/confirm.php | 0 {views => src/views}/default/forgot.php | 0 {views => src/views}/default/index.php | 0 {views => src/views}/default/login.php | 0 {views => src/views}/default/loginCallback.php | 0 {views => src/views}/default/loginEmail.php | 0 {views => src/views}/default/profile.php | 0 {views => src/views}/default/register.php | 0 {views => src/views}/default/resend.php | 0 {views => src/views}/default/reset.php | 0 55 files changed, 1 insertion(+), 1 deletion(-) rename Module.php => src/Module.php (100%) rename {components => src/components}/RedditAuth.php (100%) rename {components => src/components}/User.php (100%) rename {controllers => src/controllers}/AdminController.php (100%) rename {controllers => src/controllers}/AuthController.php (100%) rename {controllers => src/controllers}/CopyController.php (100%) rename {controllers => src/controllers}/DefaultController.php (100%) rename {helpers => src/helpers}/Timezone.php (100%) rename {mail => src/mail}/confirmEmail.php (100%) rename {mail => src/mail}/forgotPassword.php (100%) rename {mail => src/mail}/layouts/html.php (100%) rename {mail => src/mail}/loginToken.php (100%) rename {messages => src/messages}/de/user.php (100%) rename {messages => src/messages}/es/user.php (100%) rename {messages => src/messages}/fa/user.php (100%) rename {messages => src/messages}/hu/user.php (100%) rename {messages => src/messages}/it/user.php (100%) rename {messages => src/messages}/ja/user.php (100%) rename {messages => src/messages}/pl/user.php (100%) rename {messages => src/messages}/pt-BR/user.php (100%) rename {messages => src/messages}/pt/user.php (100%) rename {messages => src/messages}/ru/user.php (100%) rename {messages => src/messages}/sk/user.php (100%) rename {messages => src/messages}/th/user.php (100%) rename {messages => src/messages}/uk/user.php (100%) rename {messages => src/messages}/zh-CN/user.php (100%) rename {migrations => src/migrations}/m150214_044831_init_user.php (100%) rename {models => src/models}/Profile.php (100%) rename {models => src/models}/Role.php (100%) rename {models => src/models}/User.php (100%) rename {models => src/models}/UserAuth.php (100%) rename {models => src/models}/UserToken.php (100%) rename {models => src/models}/forms/ForgotForm.php (100%) rename {models => src/models}/forms/LoginEmailForm.php (100%) rename {models => src/models}/forms/LoginForm.php (100%) rename {models => src/models}/forms/ResendForm.php (100%) rename {models => src/models}/search/UserSearch.php (100%) rename {views => src/views}/admin/_form.php (100%) rename {views => src/views}/admin/_search.php (100%) rename {views => src/views}/admin/create.php (100%) rename {views => src/views}/admin/index.php (100%) rename {views => src/views}/admin/update.php (100%) rename {views => src/views}/admin/view.php (100%) rename {views => src/views}/default/account.php (100%) rename {views => src/views}/default/confirm.php (100%) rename {views => src/views}/default/forgot.php (100%) rename {views => src/views}/default/index.php (100%) rename {views => src/views}/default/login.php (100%) rename {views => src/views}/default/loginCallback.php (100%) rename {views => src/views}/default/loginEmail.php (100%) rename {views => src/views}/default/profile.php (100%) rename {views => src/views}/default/register.php (100%) rename {views => src/views}/default/resend.php (100%) rename {views => src/views}/default/reset.php (100%) diff --git a/composer.json b/composer.json index 8422d23..6bbd684 100644 --- a/composer.json +++ b/composer.json @@ -16,6 +16,6 @@ "yiisoft/yii2-authclient": "*" }, "autoload": { - "psr-4": { "faro\\core\\user\\": "" } + "psr-4": { "faro\\core\\user\\": "src" } } } \ No newline at end of file diff --git a/Module.php b/src/Module.php similarity index 100% rename from Module.php rename to src/Module.php diff --git a/components/RedditAuth.php b/src/components/RedditAuth.php similarity index 100% rename from components/RedditAuth.php rename to src/components/RedditAuth.php diff --git a/components/User.php b/src/components/User.php similarity index 100% rename from components/User.php rename to src/components/User.php diff --git a/controllers/AdminController.php b/src/controllers/AdminController.php similarity index 100% rename from controllers/AdminController.php rename to src/controllers/AdminController.php diff --git a/controllers/AuthController.php b/src/controllers/AuthController.php similarity index 100% rename from controllers/AuthController.php rename to src/controllers/AuthController.php diff --git a/controllers/CopyController.php b/src/controllers/CopyController.php similarity index 100% rename from controllers/CopyController.php rename to src/controllers/CopyController.php diff --git a/controllers/DefaultController.php b/src/controllers/DefaultController.php similarity index 100% rename from controllers/DefaultController.php rename to src/controllers/DefaultController.php diff --git a/helpers/Timezone.php b/src/helpers/Timezone.php similarity index 100% rename from helpers/Timezone.php rename to src/helpers/Timezone.php diff --git a/mail/confirmEmail.php b/src/mail/confirmEmail.php similarity index 100% rename from mail/confirmEmail.php rename to src/mail/confirmEmail.php diff --git a/mail/forgotPassword.php b/src/mail/forgotPassword.php similarity index 100% rename from mail/forgotPassword.php rename to src/mail/forgotPassword.php diff --git a/mail/layouts/html.php b/src/mail/layouts/html.php similarity index 100% rename from mail/layouts/html.php rename to src/mail/layouts/html.php diff --git a/mail/loginToken.php b/src/mail/loginToken.php similarity index 100% rename from mail/loginToken.php rename to src/mail/loginToken.php diff --git a/messages/de/user.php b/src/messages/de/user.php similarity index 100% rename from messages/de/user.php rename to src/messages/de/user.php diff --git a/messages/es/user.php b/src/messages/es/user.php similarity index 100% rename from messages/es/user.php rename to src/messages/es/user.php diff --git a/messages/fa/user.php b/src/messages/fa/user.php similarity index 100% rename from messages/fa/user.php rename to src/messages/fa/user.php diff --git a/messages/hu/user.php b/src/messages/hu/user.php similarity index 100% rename from messages/hu/user.php rename to src/messages/hu/user.php diff --git a/messages/it/user.php b/src/messages/it/user.php similarity index 100% rename from messages/it/user.php rename to src/messages/it/user.php diff --git a/messages/ja/user.php b/src/messages/ja/user.php similarity index 100% rename from messages/ja/user.php rename to src/messages/ja/user.php diff --git a/messages/pl/user.php b/src/messages/pl/user.php similarity index 100% rename from messages/pl/user.php rename to src/messages/pl/user.php diff --git a/messages/pt-BR/user.php b/src/messages/pt-BR/user.php similarity index 100% rename from messages/pt-BR/user.php rename to src/messages/pt-BR/user.php diff --git a/messages/pt/user.php b/src/messages/pt/user.php similarity index 100% rename from messages/pt/user.php rename to src/messages/pt/user.php diff --git a/messages/ru/user.php b/src/messages/ru/user.php similarity index 100% rename from messages/ru/user.php rename to src/messages/ru/user.php diff --git a/messages/sk/user.php b/src/messages/sk/user.php similarity index 100% rename from messages/sk/user.php rename to src/messages/sk/user.php diff --git a/messages/th/user.php b/src/messages/th/user.php similarity index 100% rename from messages/th/user.php rename to src/messages/th/user.php diff --git a/messages/uk/user.php b/src/messages/uk/user.php similarity index 100% rename from messages/uk/user.php rename to src/messages/uk/user.php diff --git a/messages/zh-CN/user.php b/src/messages/zh-CN/user.php similarity index 100% rename from messages/zh-CN/user.php rename to src/messages/zh-CN/user.php diff --git a/migrations/m150214_044831_init_user.php b/src/migrations/m150214_044831_init_user.php similarity index 100% rename from migrations/m150214_044831_init_user.php rename to src/migrations/m150214_044831_init_user.php diff --git a/models/Profile.php b/src/models/Profile.php similarity index 100% rename from models/Profile.php rename to src/models/Profile.php diff --git a/models/Role.php b/src/models/Role.php similarity index 100% rename from models/Role.php rename to src/models/Role.php diff --git a/models/User.php b/src/models/User.php similarity index 100% rename from models/User.php rename to src/models/User.php diff --git a/models/UserAuth.php b/src/models/UserAuth.php similarity index 100% rename from models/UserAuth.php rename to src/models/UserAuth.php diff --git a/models/UserToken.php b/src/models/UserToken.php similarity index 100% rename from models/UserToken.php rename to src/models/UserToken.php diff --git a/models/forms/ForgotForm.php b/src/models/forms/ForgotForm.php similarity index 100% rename from models/forms/ForgotForm.php rename to src/models/forms/ForgotForm.php diff --git a/models/forms/LoginEmailForm.php b/src/models/forms/LoginEmailForm.php similarity index 100% rename from models/forms/LoginEmailForm.php rename to src/models/forms/LoginEmailForm.php diff --git a/models/forms/LoginForm.php b/src/models/forms/LoginForm.php similarity index 100% rename from models/forms/LoginForm.php rename to src/models/forms/LoginForm.php diff --git a/models/forms/ResendForm.php b/src/models/forms/ResendForm.php similarity index 100% rename from models/forms/ResendForm.php rename to src/models/forms/ResendForm.php diff --git a/models/search/UserSearch.php b/src/models/search/UserSearch.php similarity index 100% rename from models/search/UserSearch.php rename to src/models/search/UserSearch.php diff --git a/views/admin/_form.php b/src/views/admin/_form.php similarity index 100% rename from views/admin/_form.php rename to src/views/admin/_form.php diff --git a/views/admin/_search.php b/src/views/admin/_search.php similarity index 100% rename from views/admin/_search.php rename to src/views/admin/_search.php diff --git a/views/admin/create.php b/src/views/admin/create.php similarity index 100% rename from views/admin/create.php rename to src/views/admin/create.php diff --git a/views/admin/index.php b/src/views/admin/index.php similarity index 100% rename from views/admin/index.php rename to src/views/admin/index.php diff --git a/views/admin/update.php b/src/views/admin/update.php similarity index 100% rename from views/admin/update.php rename to src/views/admin/update.php diff --git a/views/admin/view.php b/src/views/admin/view.php similarity index 100% rename from views/admin/view.php rename to src/views/admin/view.php diff --git a/views/default/account.php b/src/views/default/account.php similarity index 100% rename from views/default/account.php rename to src/views/default/account.php diff --git a/views/default/confirm.php b/src/views/default/confirm.php similarity index 100% rename from views/default/confirm.php rename to src/views/default/confirm.php diff --git a/views/default/forgot.php b/src/views/default/forgot.php similarity index 100% rename from views/default/forgot.php rename to src/views/default/forgot.php diff --git a/views/default/index.php b/src/views/default/index.php similarity index 100% rename from views/default/index.php rename to src/views/default/index.php diff --git a/views/default/login.php b/src/views/default/login.php similarity index 100% rename from views/default/login.php rename to src/views/default/login.php diff --git a/views/default/loginCallback.php b/src/views/default/loginCallback.php similarity index 100% rename from views/default/loginCallback.php rename to src/views/default/loginCallback.php diff --git a/views/default/loginEmail.php b/src/views/default/loginEmail.php similarity index 100% rename from views/default/loginEmail.php rename to src/views/default/loginEmail.php diff --git a/views/default/profile.php b/src/views/default/profile.php similarity index 100% rename from views/default/profile.php rename to src/views/default/profile.php diff --git a/views/default/register.php b/src/views/default/register.php similarity index 100% rename from views/default/register.php rename to src/views/default/register.php diff --git a/views/default/resend.php b/src/views/default/resend.php similarity index 100% rename from views/default/resend.php rename to src/views/default/resend.php diff --git a/views/default/reset.php b/src/views/default/reset.php similarity index 100% rename from views/default/reset.php rename to src/views/default/reset.php From 3b6c789db8618392d8989c77d96caaad18884945 Mon Sep 17 00:00:00 2001 From: Gonzalo Bourdieu Date: Fri, 2 Jul 2021 01:35:05 -0300 Subject: [PATCH 03/18] Se agregaron las dependencias --- composer.json | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 6bbd684..bd036d3 100644 --- a/composer.json +++ b/composer.json @@ -13,9 +13,32 @@ ], "require": { "yiisoft/yii2": "*", - "yiisoft/yii2-authclient": "*" + "yiisoft/yii2-authclient": "*", + "faro/core": "dev-feature-acl" }, "autoload": { "psr-4": { "faro\\core\\user\\": "src" } - } + }, + "repositories": [ + { + "type": "composer", + "url": "https://asset-packagist.org" + }, + { + "type": "vcs", + "url": "git@github.com:FARO-DataLab/faro-core.git" + }, + { + "type": "vcs", + "url": "git@github.com:FARO-DataLab/faro-media.git" + }, + { + "type": "vcs", + "url": "git@github.com:FARO-DataLab/faro-googleanalytics.git" + }, + { + "type": "vcs", + "url": "git@github.com:FARO-DataLab/yii2-user.git" + } + ] } \ No newline at end of file From 68948692963652faaefbecc62e289e23ebdb9f67 Mon Sep 17 00:00:00 2001 From: Gonzalo Bourdieu Date: Fri, 2 Jul 2021 01:35:23 -0300 Subject: [PATCH 04/18] Se agrego la migracion y los cambios de tablas --- src/migrations/m150214_044831_init_user.php | 49 +++++++++++---------- src/models/Profile.php | 9 ++++ src/models/Role.php | 10 ++++- src/models/User.php | 8 ++++ src/models/UserAuth.php | 9 ++++ 5 files changed, 61 insertions(+), 24 deletions(-) diff --git a/src/migrations/m150214_044831_init_user.php b/src/migrations/m150214_044831_init_user.php index 058f620..7041fbc 100644 --- a/src/migrations/m150214_044831_init_user.php +++ b/src/migrations/m150214_044831_init_user.php @@ -1,5 +1,8 @@ createTable('{{%role}}', [ + $this->createTable('{{%core_acl_rol}}', [ 'id' => Schema::TYPE_PK, 'name' => Schema::TYPE_STRING . ' not null', 'created_at' => Schema::TYPE_TIMESTAMP . ' null', 'updated_at' => Schema::TYPE_TIMESTAMP . ' null', 'can_admin' => Schema::TYPE_SMALLINT . ' not null default 0', ], $tableOptions); - $this->createTable('{{%user}}', [ + $this->createTable('{{%core_acl_usuario}}', [ 'id' => Schema::TYPE_PK, 'role_id' => Schema::TYPE_INTEGER . ' not null', 'status' => Schema::TYPE_SMALLINT . ' not null', @@ -37,7 +40,7 @@ public function up() 'banned_at' => Schema::TYPE_TIMESTAMP . ' null', 'banned_reason' => Schema::TYPE_STRING . ' null', ], $tableOptions); - $this->createTable('{{%user_token}}', [ + $this->createTable('{{%core_acl_usuario_token}}', [ 'id' => Schema::TYPE_PK, 'user_id' => Schema::TYPE_INTEGER . ' null', 'type' => Schema::TYPE_SMALLINT . ' not null', @@ -46,7 +49,7 @@ public function up() 'created_at' => Schema::TYPE_TIMESTAMP . ' null', 'expired_at' => Schema::TYPE_TIMESTAMP . ' null', ], $tableOptions); - $this->createTable('{{%profile}}', [ + $this->createTable('{{%core_acl_perfil}}', [ 'id' => Schema::TYPE_PK, 'user_id' => Schema::TYPE_INTEGER . ' not null', 'created_at' => Schema::TYPE_TIMESTAMP . ' null', @@ -54,7 +57,7 @@ public function up() 'full_name' => Schema::TYPE_STRING . ' null', 'timezone' => Schema::TYPE_STRING . ' null', ], $tableOptions); - $this->createTable('{{%user_auth}}', [ + $this->createTable('{{%core_acl_usuario_auth}}', [ 'id' => Schema::TYPE_PK, 'user_id' => Schema::TYPE_INTEGER . ' not null', 'provider' => Schema::TYPE_STRING . ' not null', @@ -65,20 +68,20 @@ public function up() ], $tableOptions); // add indexes for performance optimization - $this->createIndex('{{%user_email}}', '{{%user}}', 'email', true); - $this->createIndex('{{%user_username}}', '{{%user}}', 'username', true); - $this->createIndex('{{%user_token_token}}', '{{%user_token}}', 'token', true); - $this->createIndex('{{%user_auth_provider_id}}', '{{%user_auth}}', 'provider_id', false); + $this->createIndex('{{%core_acl_usuario_email}}', '{{%core_acl_usuario}}', 'email', true); + $this->createIndex('{{%core_acl_usuario_username}}', '{{%core_acl_usuario}}', 'username', true); + $this->createIndex('{{%core_acl_usuario_token_token}}', '{{%core_acl_usuario_token}}', 'token', true); + $this->createIndex('{{%core_acl_usuario_auth_provider_id}}', '{{%core_acl_usuario_auth}}', 'provider_id', false); // add foreign keys for data integrity - $this->addForeignKey('{{%user_role_id}}', '{{%user}}', 'role_id', '{{%role}}', 'id'); - $this->addForeignKey('{{%profile_user_id}}', '{{%profile}}', 'user_id', '{{%user}}', 'id'); - $this->addForeignKey('{{%user_token_user_id}}', '{{%user_token}}', 'user_id', '{{%user}}', 'id'); - $this->addForeignKey('{{%user_auth_user_id}}', '{{%user_auth}}', 'user_id', '{{%user}}', 'id'); + $this->addForeignKey('{{%core_acl_usuario_role_id}}', '{{%core_acl_usuario}}', 'role_id', '{{%core_acl_rol}}', 'id'); + $this->addForeignKey('{{%core_acl_perfil_user_id}}', '{{%core_acl_perfil}}', 'user_id', '{{%core_acl_usuario}}', 'id'); + $this->addForeignKey('{{%core_acl_usuario_token_user_id}}', '{{%core_acl_usuario_token}}', 'user_id', '{{%core_acl_usuario}}', 'id'); + $this->addForeignKey('{{%core_acl_usuario_auth_user_id}}', '{{%core_acl_usuario_auth}}', 'user_id', '{{%core_acl_usuario}}', 'id'); // insert role data $columns = ['name', 'can_admin', 'created_at']; - $this->batchInsert('{{%role}}', $columns, [ + $this->batchInsert('{{%core_acl_rol}}', $columns, [ ['Admin', 1, gmdate('Y-m-d H:i:s')], ['User', 0, gmdate('Y-m-d H:i:s')], ]); @@ -86,11 +89,11 @@ public function up() // insert admin user: neo/neo $security = Yii::$app->security; $columns = ['role_id', 'email', 'username', 'password', 'status', 'created_at', 'access_token', 'auth_key']; - $this->batchInsert('{{%user}}', $columns, [ + $this->batchInsert('{{%core_acl_usuario}}', $columns, [ [ 1, // Role::ROLE_ADMIN - 'neo@neo.com', - 'neo', + 'admin@faro.works', + 'admin', '$2y$13$dyVw4WkZGkABf2UrGWrhHO4ZmVBv.K4puhOL59Y9jQhIdj63TlV.O', // neo 1, // User::STATUS_ACTIVE gmdate('Y-m-d H:i:s'), @@ -101,7 +104,7 @@ public function up() // insert profile data $columns = ['user_id', 'full_name', 'created_at']; - $this->batchInsert('{{%profile}}', $columns, [ + $this->batchInsert('{{%core_acl_perfil}}', $columns, [ [1, 'the one', gmdate('Y-m-d H:i:s')], ]); } @@ -109,10 +112,10 @@ public function up() public function down() { // drop tables in reverse order (for foreign key constraints) - $this->dropTable('{{%user_auth}}'); - $this->dropTable('{{%profile}}'); - $this->dropTable('{{%user_token}}'); - $this->dropTable('{{%user}}'); - $this->dropTable('{{%role}}'); + $this->dropTable('{{%core_acl_usuario_auth}}'); + $this->dropTable('{{%core_acl_perfil}}'); + $this->dropTable('{{%core_acl_usuario_token}}'); + $this->dropTable('{{%core_acl_usuario}}'); + $this->dropTable('{{%core_acl_rol}}'); } } diff --git a/src/models/Profile.php b/src/models/Profile.php index 074b64b..3b2c0b5 100644 --- a/src/models/Profile.php +++ b/src/models/Profile.php @@ -24,6 +24,15 @@ class Profile extends ActiveRecord */ public $module; + /** + * @return string + */ + public static function tableName() + { + return '{{%core_acl_perfil}}'; + } + + /** * @inheritdoc */ diff --git a/src/models/Role.php b/src/models/Role.php index ea60723..402c6d2 100644 --- a/src/models/Role.php +++ b/src/models/Role.php @@ -2,8 +2,11 @@ namespace faro\core\user\models; +use faro\core\models\FaroBaseActiveRecord; use Yii; use yii\db\ActiveRecord; +use yii\helpers\Inflector; +use yii\helpers\StringHelper; /** * This is the model class for table "tbl_role". @@ -16,7 +19,7 @@ * * @property User[] $users */ -class Role extends ActiveRecord +class Role extends FaroBaseActiveRecord { /** * @var int Admin user role @@ -33,6 +36,11 @@ class Role extends ActiveRecord */ public $module; + public static function tableName() + { + return '{{%core_acl_rol}}'; + } + /** * @inheritdoc */ diff --git a/src/models/User.php b/src/models/User.php index c98c70d..d9fd44e 100644 --- a/src/models/User.php +++ b/src/models/User.php @@ -76,6 +76,14 @@ class User extends ActiveRecord implements IdentityInterface */ public $module; + /** + * @return string + */ + public static function tableName() + { + return '{{%core_acl_usuario}}'; + } + /** * @inheritdoc */ diff --git a/src/models/UserAuth.php b/src/models/UserAuth.php index a39e8b2..20bc4c4 100644 --- a/src/models/UserAuth.php +++ b/src/models/UserAuth.php @@ -25,6 +25,15 @@ class UserAuth extends ActiveRecord */ public $module; + /** + * @return string + */ + public static function tableName() + { + return '{{%core_acl_usuario_token}}'; + } + + /** * @inheritdoc */ From 004f4590d8c039572a60f9264eb2e32fd0397d33 Mon Sep 17 00:00:00 2001 From: Gonzalo Bourdieu Date: Fri, 2 Jul 2021 01:57:10 -0300 Subject: [PATCH 05/18] Se cambiaron varios campos para que funcione todo --- src/Module.php | 2 +- src/controllers/DefaultController.php | 2 + src/models/search/UserSearch.php | 2 +- src/views/admin/create.php | 8 +- src/views/admin/index.php | 25 ++--- src/views/admin/view.php | 31 +++--- src/views/default/login.php | 147 ++++++++++++++++++-------- src/views/default/profile.php | 15 +-- 8 files changed, 151 insertions(+), 81 deletions(-) diff --git a/src/Module.php b/src/Module.php index d0d58aa..81429d2 100644 --- a/src/Module.php +++ b/src/Module.php @@ -21,7 +21,7 @@ class Module extends \yii\base\Module /** * @var string Alias for module */ - public $alias = "@user"; + public $alias = "@faro/core/user"; /** * @var bool If true, users are required to enter an email diff --git a/src/controllers/DefaultController.php b/src/controllers/DefaultController.php index df8dfca..561249f 100644 --- a/src/controllers/DefaultController.php +++ b/src/controllers/DefaultController.php @@ -84,6 +84,8 @@ public function actionLogin() $returnUrl = $this->performLogin($model->getUser(), $model->rememberMe); return $this->redirect($returnUrl); } + + $this->layout = "@vendor/faro/core/src/themes/dmp2020/layouts/login"; return $this->render('login', compact("model")); } diff --git a/src/models/search/UserSearch.php b/src/models/search/UserSearch.php index 3b6cc0e..468ee36 100644 --- a/src/models/search/UserSearch.php +++ b/src/models/search/UserSearch.php @@ -17,7 +17,7 @@ class UserSearch extends User */ public static function tableName() { - return "{{%user}}"; + return "{{%core_acl_usuario}}"; } /** diff --git a/src/views/admin/create.php b/src/views/admin/create.php index 57b384f..babcd2e 100644 --- a/src/views/admin/create.php +++ b/src/views/admin/create.php @@ -1,5 +1,6 @@ title = Yii::t('user', 'Create {modelClass}', [ - 'modelClass' => 'User', + 'modelClass' => 'Usuario', ]); + $this->params['breadcrumbs'][] = ['label' => Yii::t('user', 'Users'), 'url' => ['index']]; $this->params['breadcrumbs'][] = $this->title; ?>
-

title) ?>

+ 'Agregar usuario']) ?> render('_form', [ 'user' => $user, 'profile' => $profile, ]) ?> + +
\ No newline at end of file diff --git a/src/views/admin/index.php b/src/views/admin/index.php index c09c3ee..17122d0 100644 --- a/src/views/admin/index.php +++ b/src/views/admin/index.php @@ -1,5 +1,7 @@ title = Yii::t('user', 'Users'); $this->params['breadcrumbs'][] = $this->title; ?> -
- -

title) ?>

+

+ 'User', + ]), ['create'], ['class' => 'btn btn-success']) ?> +

+
+ + 'Listado de usuarios']) ?> + render('_search', ['model' => $searchModel]); ?> -

- 'User', - ]), ['create'], ['class' => 'btn btn-success']) ?> -

- - $dataProvider, 'filterModel' => $searchModel, 'columns' => [ - ['class' => 'yii\grid\SerialColumn'], - 'id', [ 'attribute' => 'role_id', @@ -77,4 +77,5 @@ ]); ?> +
diff --git a/src/views/admin/view.php b/src/views/admin/view.php index e00c95f..3680921 100644 --- a/src/views/admin/view.php +++ b/src/views/admin/view.php @@ -1,5 +1,6 @@ title = $user->id; +$this->title = $user->email; $this->params['breadcrumbs'][] = ['label' => Yii::t('user', 'Users'), 'url' => ['index']]; $this->params['breadcrumbs'][] = $this->title; ?> -
-

title) ?>

+

+ $user->id], ['class' => 'btn btn-primary']) ?> + $user->id], [ + 'class' => 'btn btn-danger', + 'data' => [ + 'confirm' => Yii::t('user', 'Are you sure you want to delete this item?'), + 'method' => 'post', + ], + ]) ?> +

-

- $user->id], ['class' => 'btn btn-primary']) ?> - $user->id], [ - 'class' => 'btn btn-danger', - 'data' => [ - 'confirm' => Yii::t('user', 'Are you sure you want to delete this item?'), - 'method' => 'post', - ], - ]) ?> -

+
+ + 'Ver usuario']) ?> + $user, 'attributes' => [ @@ -48,5 +51,7 @@ 'banned_reason', ], ]) ?> + +
diff --git a/src/views/default/login.php b/src/views/default/login.php index 8ba935f..f9968e9 100644 --- a/src/views/default/login.php +++ b/src/views/default/login.php @@ -1,7 +1,8 @@ title = Yii::t('user', 'Login'); +FaroCoreAsset::register($this); + +$this->title = 'Login'; $this->params['breadcrumbs'][] = $this->title; + +$asset = FaroCoreAsset::register($this); +$imagen = $asset->baseUrl . "/img/logo_vertical.jpg"; + ?> -