user folder creation

components/TranslationEventHandler.php

@@ -15,4 +15,5 @@ class TranslationEventHandler
         ];
         $event->translatedMessage = Yii::t($event->category, $event->message);
     }
-}
+
+}

config/web.php

@@ -79,13 +79,11 @@ $config = [
                 'pay/<action:[\w\-]+>' => 'pay/<action>',
                 'history/<action:[\w\-]+>' => 'history/<action>',
                 //'user/admin/<action:\w+>' => 'user/admin/<action>',
+
                 'user/<controller:[\w\-]+>/<action:[\w\-]+>' => 'user/<controller>/<action>',
-                /*'<controller>/<action>' => '<controller>/<action>',
-                '<controller:\w+>/<action:\w+>' => '<controller>/<action>',
-                '<controller:\w+>/<action:\w+>/<id:\d+>' => '<controller>/<action>',*/
+
                 //'login' => 'user/security/login',
                 '<alias:logout|login>' => 'user/security/<alias>',
-                //'<alias:logout|login>' => 'user/security/<alias>',
 
                 //'api/<action:\w+>' => 'api/<action>',
                 //'api/<action:[\w\-]+>/<id:\d+>' => 'api/<action>'
@@ -132,20 +130,24 @@ $config = [
         'user' => [
             'class' => 'dektrium\user\Module',
             'enableRegistration' => false,
-            'enablePasswordRecovery' => false,
+            'enablePasswordRecovery' => true,
             'enableConfirmation' => false,
-            'adminPermission' => 'admin',
+            //'adminPermission' => 'admin',
             //'admins' => ['ptenchik0'],
             'rememberFor' => 86400,
-            /*'modelMap' => [
+            'debug' => true,
+            'controllerMap' => [
+                'settings' => 'app\controllers\ProfileController'
+            ],
+            'modelMap' => [
                 //'RecoveryForm' => 'app\models\security\RecoveryForm',
                 //'RegistrationForm' => 'app\models\security\RegistrationForm',
                 'User' => 'app\models\user\User',
-                'UserSearch' => 'app\models\search\Users',
-                'LoginForm' => 'app\models\security\LoginForm',
+                //'UserSearch' => 'app\models\search\Users',
+                'LoginForm' => 'app\models\user\LoginForm',
                 //'Profile' => 'app\models\user\Profile',
                 //'SettingsForm' => 'app\models\user\SettingsForm',
-            ],*/
+            ],
         ],
         'api' => [
             'class' => 'app\modules\api\Module',
@@ -153,7 +155,22 @@ $config = [
     ],
     'params' => $params,
     'on beforeAction' => function ($event) {
-        if (Yii::$app->user->isGuest) Yii::$app->layout = 'guest';
+        if (Yii::$app->user->isGuest) :
+            Yii::$app->layout = 'guest';
+        else:
+            $email = substr(Yii::$app->user->identity->email, strripos(Yii::$app->user->identity->email, '@') + 1 );
+
+            if('example.com' === $email){
+                $pass_link = \yii\bootstrap4\Html::a('Змінити', \yii\helpers\Url::to(['profile/account']), ['class'=>'text-uppercase']);
+                Yii::$app->session->setFlash('warning', 'Для можливості відновлення паролю, будь-ласка, змініть свій <strong>Email</strong>. ' . $pass_link);
+            }
+
+            if(Yii::$app->user->identity->created_at == Yii::$app->user->identity->updated_at){
+                $pass_link = \yii\bootstrap4\Html::a('Змінити', \yii\helpers\Url::to(['profile/account']), ['class'=>'text-white text-uppercase']);
+                Yii::$app->session->setFlash('danger', '<strong>Ваш пароль є тимчасовым</strong>. З розумінь безпеки, будь-ласка, змініть свій пароль. ' . $pass_link);
+            }
+        endif;
+
     },
     'as globalAccess' => [
         'class' => app\components\GlobalAccessBehavior::class,
@@ -164,7 +181,7 @@ $config = [
                 'roles' => ["?","@"],
             ],
             [
-                'actions' => ['login'],
+                'actions' => ['login', 'request'],
                 'allow' => true,
                 'roles' => ['?'],
             ],
@@ -173,18 +190,19 @@ $config = [
                 'allow' => true,
                 'roles' => ['@'],
             ],
+            /*
             [
                 'controllers' => ['api/user'],
                 'allow' => true,
                 'roles' => ['?'],
-            ],
+            ],*/
             [
                 'controllers' => ['user/admin'],
                 'allow' => true,
                 'roles' => ['admin'],
             ],
             [
-                'controllers' => ['user/admin'],
+                'controllers' => ['user/admin', 'user/settings', 'user/profile'],
                 'allow' => false,
             ],
             [

controllers/ProfileController.php

@@ -4,10 +4,36 @@
 namespace app\controllers;
 
 
-use yii\web\Controller;
+use dektrium\user\controllers\SettingsController as BaseSettingsController;
+use yii\filters\AccessControl;
+use yii\filters\VerbFilter;
 
-class ProfileController extends Controller
+class ProfileController extends BaseSettingsController
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function behaviors()
+    {
+        return [
+            'access' => [
+                'class' => AccessControl::class,
+                'rules' => [
+                    /*[
+                        'actions' => ['edit'],
+                        'allow' => true,
+                        'roles' => ['@'],
+                    ],*/
+                ],
+            ],
+            'verbs' => [
+                'class' => VerbFilter::class,
+                'actions' => [
+                    //'edit' => ['post'],
+                ],
+            ],
+        ];
+    }
 
     public function actionIndex(){
         $_u = \Yii::$app->user->identity;

controllers/SiteController.php

@@ -64,65 +64,4 @@ class SiteController extends Controller
         return $this->render('index');
     }
 
-    /**
-     * Login action.
-     *
-     * @return Response|string
-     */
-    public function actionLogin()
-    {
-        if (!Yii::$app->user->isGuest) {
-            return $this->goHome();
-        }
-
-        $model = new LoginForm();
-        if ($model->load(Yii::$app->request->post()) && $model->login()) {
-            return $this->goBack();
-        }
-
-        $model->password = '';
-        return $this->render('login', [
-            'model' => $model,
-        ]);
-    }
-
-    /**
-     * Logout action.
-     *
-     * @return Response
-     */
-    public function actionLogout()
-    {
-        Yii::$app->user->logout();
-
-        return $this->goHome();
-    }
-
-    /**
-     * Displays contact page.
-     *
-     * @return Response|string
-     */
-    public function actionContact()
-    {
-        $model = new ContactForm();
-        if ($model->load(Yii::$app->request->post()) && $model->contact(Yii::$app->params['adminEmail'])) {
-            Yii::$app->session->setFlash('contactFormSubmitted');
-
-            return $this->refresh();
-        }
-        return $this->render('contact', [
-            'model' => $model,
-        ]);
-    }
-
-    /**
-     * Displays about page.
-     *
-     * @return string
-     */
-    public function actionAbout()
-    {
-        return $this->render('about');
-    }
 }

messages/ru/user.php

@@ -1,6 +1,8 @@
 <?php
 return [
+    'Login' => 'Логин',
     'Nomer Dogovora' => 'Номер договора',
+    'Sign in' => 'Авторизоваться',
     'Fio' => 'ФИО',
     'Company name' => 'Название компании',
     'Phone' => 'Телефон',

models/user/LoginForm.php

@@ -0,0 +1,175 @@
+<?php
+
+namespace app\models\user;
+
+use dektrium\user\Finder;
+use dektrium\user\helpers\Password;
+use dektrium\user\traits\ModuleTrait;
+use yii\helpers\ArrayHelper;
+use yii\helpers\Html;
+use Yii;
+use yii\base\Model;
+
+/**
+ * LoginForm get user's login and password, validates them and logs the user in. If user has been blocked, it adds
+ * an error to login form.
+ *
+ * @author Dmitry Erofeev <dmeroff@gmail.com>
+ */
+class LoginForm extends Model
+{
+    use ModuleTrait;
+
+    /** @var string User's email or username */
+    public $login;
+
+    /** @var string User's uuid */
+    public $uuid;
+
+    /** @var string User's plain password */
+    public $password;
+
+    /** @var string Whether to remember the user */
+    public $rememberMe = false;
+
+    /** @var User */
+    protected $user;
+
+    /** @var Finder */
+    protected $finder;
+
+    /**
+     * @param Finder $finder
+     * @param array  $config
+     */
+    public function __construct(Finder $finder, $config = [])
+    {
+        $this->finder = $finder;
+        parent::__construct($config);
+    }
+
+    /**
+     * Gets all users to generate the dropdown list when in debug mode.
+     *
+     * @return array
+     */
+    public static function loginList()
+    {
+        /** @var \dektrium\user\Module $module */
+        $module = \Yii::$app->getModule('user');
+
+        $userModel = $module->modelMap['User'];
+
+        return ArrayHelper::map($userModel::find()->where(['blocked_at' => null])->all(), 'username', function ($user) {
+            return sprintf('%s (%s)', Html::encode($user->username), Html::encode($user->email));
+        });
+    }
+
+    /** @inheritdoc */
+    public function attributeLabels()
+    {
+        return [
+            'login'      => Yii::t('user', 'Login'),
+            'uuid'      => Yii::t('user', 'Nomer Dogovora'),
+            'password'   => Yii::t('user', 'Password'),
+            'rememberMe' => Yii::t('user', 'Remember me next time'),
+        ];
+    }
+
+    /** @inheritdoc */
+    public function rules()
+    {
+        $rules = [
+            'uuidTrim' => ['uuid', 'trim'],
+            'requiredFields' => [['uuid'], 'required'],
+            'confirmationValidate' => [
+                'login',
+                function ($attribute) {
+                    if ($this->user !== null) {
+                        $confirmationRequired = $this->module->enableConfirmation
+                            && !$this->module->enableUnconfirmedLogin;
+                        if ($confirmationRequired && !$this->user->getIsConfirmed()) {
+                            $this->addError($attribute, Yii::t('user', 'You need to confirm your email address'));
+                        }
+                        if ($this->user->getIsBlocked()) {
+                            $this->addError($attribute, Yii::t('user', 'Your account has been blocked'));
+                        }
+                    }
+                }
+            ],
+            'rememberMe' => ['rememberMe', 'boolean'],
+        ];
+
+        if (!$this->module->debug) {
+            $rules = array_merge($rules, [
+                'requiredFields' => [['uuid', 'password'], 'required'],
+                'passwordValidate' => [
+                    'password',
+                    function ($attribute) {
+                        if ($this->user === null || !Password::validate($this->password, $this->user->password_hash)) {
+                            $this->addError($attribute, Yii::t('user', 'Invalid login or password'));
+                        }
+                    }
+                ]
+            ]);
+        }
+
+        return $rules;
+    }
+
+    /**
+     * Validates if the hash of the given password is identical to the saved hash in the database.
+     * It will always succeed if the module is in DEBUG mode.
+     *
+     * @return void
+     */
+    public function validatePassword($attribute, $params)
+    {
+      if ($this->user === null || !Password::validate($this->password, $this->user->password_hash))
+        $this->addError($attribute, Yii::t('user', 'Invalid login or password'));
+    }
+
+    /**
+     * Validates form and logs the user in.
+     *
+     * @return bool whether the user is logged in successfully
+     */
+    public function login()
+    {
+        if ($this->validate() && $this->user) {
+            $isLogged = Yii::$app->getUser()->login($this->user, $this->rememberMe ? $this->module->rememberFor : 0);
+
+            if ($isLogged) {
+                $this->user->updateAttributes(['last_login_at' => time()]);
+            }
+
+            return $isLogged;
+        }
+
+        return false;
+    }
+
+
+    /** @inheritdoc */
+    public function formName()
+    {
+        return 'login-form';
+    }
+
+    /** @inheritdoc */
+    public function beforeValidate()
+    {
+        if (parent::beforeValidate()) {
+
+            if (filter_var($this->login, FILTER_VALIDATE_EMAIL)) {
+                return $this->findUserByEmail($this->login);
+            }else{
+                $this->user = $this->finder->findUser(["uuid"=>$this->uuid])->one();
+            }
+
+            return true;
+        } else {
+            return false;
+        }
+    }
+}

modules/api/controllers/UserController.php

@@ -18,9 +18,17 @@ class UserController extends ActiveController
 
         $errs['err'] = array();
 
+        $path = \Yii::getAlias('@webroot') . '/invoices';
+        //if(!is_dir($path)) \yii\helpers\FileHelper::createDirectory($path, $mode = 0775);
+
+
         foreach ($requestParams as $param){
             $model = $this->modelClass::find()->where(['uuid'=>$param['uuid']])->one() ?? new $this->modelClass;
 
+            $userFolderPath = $path . '/' . $param['uuid'];
+            \yii\helpers\FileHelper::createDirectory($userFolderPath . '/schet', $mode = 0775, $recursive = true);
+            \yii\helpers\FileHelper::createDirectory($userFolderPath . '/act', $mode = 0775, $recursive = true);
+
             //$model->setScenario('api');
             $model->attributes = $param;
             if (!$model->save()) {

views/layouts/guest.php

@@ -33,7 +33,7 @@ Html::addCssClass($bodyClass, ['hold-transition']);
 </main>
 
 <footer class="small text-muted text-center">
-    <p class="pull-left">&copy; <?= Yii::$app->name; ?> <?= date('Y') ?></p>
+    <p class="pull-left mb-0 mt-3">&copy; <?= Yii::$app->name; ?> <?= date('Y') ?></p>
 </footer>
 
 <?php $this->endBody() ?>

views/layouts/main.php

@@ -55,7 +55,7 @@ Html::addCssClass($bodyClass, ['hold-transition', 'sidebar-mini', 'layout-fixed'
 
     $menuItems = [
         [
-            'label' => FAS::icon('users', ['class' => ['nav-icon']]) . ' Пользователи',
+            'label' => FAS::icon('users', ['class' => ['nav-icon']]) . ' <span class="d-none d-sm-inline-block">Пользователи</span>',
             'raw' => true,
             'url' => ['/user/admin/index'],
             'active' => Yii::$app->controller->module->id == 'user',
@@ -160,6 +160,7 @@ Html::addCssClass($bodyClass, ['hold-transition', 'sidebar-mini', 'layout-fixed'
                              'icon' => FAS::icon('user-alt', ['class' => ['nav-icon']]),
                              'label' => 'Профіль',
                              'url' => ['/profile/index'],
+                             'active' => Yii::$app->controller->id === 'profile',
                          ],
                          [
                              'icon' => FAS::icon('sign-out-alt', ['class' => ['nav-icon']]),

views/profile/account.php

@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of the Dektrium project.
+ *
+ * (c) Dektrium project <http://github.com/dektrium>
+ *
+ * For the full copyright and license information, please view the LICENSE.md
+ * file that was distributed with this source code.
+ */
+
+use yii\helpers\Html;
+use yii\bootstrap4\ActiveForm;
+
+/**
+ * @var yii\web\View $this
+ * @var yii\widgets\ActiveForm $form
+ * @var dektrium\user\models\SettingsForm $model
+ */
+
+$this->title = Yii::t('user', 'Account settings');
+$this->params['breadcrumbs'][] = ['label' => 'Профіль', 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+
+<? //echo $this->render('@app/views/user/_alert', ['module' => Yii::$app->getModule('user')]) ?>
+
+<!-- Profile Box -->
+<div class="card card-gray">
+    <div class="card-header">
+        <h3 class="card-title"><?= Html::encode($this->title) ?></h3>
+        <div class="card-tools"><span data-toggle="tooltip" title="Номер договору" class="badge bg-white"># </span></div>
+    </div>
+    <div class="card-body box-profile">
+        <?php $form = ActiveForm::begin([
+            'id' => 'account-form',
+            'options' => ['class' => 'form-horizontal'],
+            'fieldConfig' => [
+                'template' => "{label}\n<div class=\"col-lg-9\">{input}</div>\n<div class=\"col-sm-offset-3 col-lg-9\">{error}\n{hint}</div>",
+                'labelOptions' => ['class' => 'col-lg-3 control-label'],
+            ],
+            'enableAjaxValidation' => true,
+            'enableClientValidation' => false,
+        ]); ?>
+
+        <?= $form->field($model, 'email') ?>
+
+        <?/*= $form->field($model, 'username') */?>
+
+        <?= $form->field($model, 'new_password')->passwordInput() ?>
+
+        <hr/>
+
+        <?= $form->field($model, 'current_password')->passwordInput() ?>
+
+        <div class="form-group">
+            <div class="col-lg-offset-3 col-lg-9">
+                <?= Html::submitButton(Yii::t('user', 'Save'), ['class' => 'btn btn-block btn-success']) ?>
+            </div>
+        </div>
+
+        <?php ActiveForm::end(); ?>
+    </div>
+</div>

views/profile/index.php

@@ -42,6 +42,9 @@ $this->params['breadcrumbs'][] = $this->title;
                 </ul>
             </div>
             <!-- /.card-body -->
+            <div class="card-footer">
+                <?= \yii\bootstrap4\Html::a(Yii::t('user', 'Account settings'), \yii\helpers\Url::to(['profile/account']), ['class'=>'btn btn-warning btn-block']) ?>
+            </div>
         </div>
         <!-- /.card -->
     </div>

views/profile/show.php

@@ -1,48 +0,0 @@
-<?php
-
-/*
- * This file is part of the Dektrium project.
- *
- * (c) Dektrium project <http://github.com/dektrium>
- *
- * For the full copyright and license information, please view the LICENSE.md
- * file that was distributed with this source code.
- */
-
-use yii\helpers\Html;
-
-/**
- * @var \yii\web\View $this
- * @var \dektrium\user\models\Profile $profile
- */
-
-$this->title = empty($profile->name) ? Html::encode($profile->user->username) : Html::encode($profile->name);
-$this->params['breadcrumbs'][] = $this->title;
-?>
-<div class="row">
-    <div class="col-xs-12 col-sm-6 col-md-6">
-        <div class="row">
-            <div class="col-sm-6 col-md-4">
-
-            </div>
-            <div class="col-sm-6 col-md-8">
-                <h4><?= $this->title ?></h4>
-                <ul style="padding: 0; list-style: none outside none;">
-                    <?php if (!empty($profile->location)): ?>
-                        <li><i class="glyphicon glyphicon-map-marker text-muted"></i> <?= Html::encode($profile->location) ?></li>
-                    <?php endif; ?>
-                    <?php if (!empty($profile->website)): ?>
-                        <li><i class="glyphicon glyphicon-globe text-muted"></i> <?= Html::a(Html::encode($profile->website), Html::encode($profile->website)) ?></li>
-                    <?php endif; ?>
-                    <?php if (!empty($profile->public_email)): ?>
-                        <li><i class="glyphicon glyphicon-envelope text-muted"></i> <?= Html::a(Html::encode($profile->public_email), 'mailto:' . Html::encode($profile->public_email)) ?></li>
-                    <?php endif; ?>
-                    <li><i class="glyphicon glyphicon-time text-muted"></i> <?= Yii::t('user', 'Joined on {0, date}', $profile->user->created_at) ?></li>
-                </ul>
-                <?php if (!empty($profile->bio)): ?>
-                    <p><?= Html::encode($profile->bio) ?></p>
-                <?php endif; ?>
-            </div>
-        </div>
-    </div>
-</div>

views/user/_alert.php

@@ -16,7 +16,7 @@ use yii\bootstrap\Alert;
  */
 ?>
 
-<?php if ($module->enableFlashMessages): ?>
+<?php /*if ($module->enableFlashMessages): ?>
     <div class="row">
         <div class="col-xs-12">
             <?php foreach (Yii::$app->session->getAllFlashes() as $type => $message): ?>
@@ -29,4 +29,4 @@ use yii\bootstrap\Alert;
             <?php endforeach ?>
         </div>
     </div>
-<?php endif ?>
+<?php endif */?>

views/user/admin/update.php

@@ -26,13 +26,13 @@ $this->params['breadcrumbs'][] = $this->title;
 
 <?= $this->render('_menu') ?>
 
-<div class="row">
+<div class="row mt-3">
     <div class="col-md-3">
         <div class="panel panel-default">
             <div class="panel-body">
                 <?= Nav::widget([
                     'options' => [
-                        'class' => 'nav-pills nav-stacked',
+                        'class' => 'nav nav-pills flex-column',
                     ],
                     'items' => [
                         [

views/user/recovery/request.php

@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the Dektrium project.
+ *
+ * (c) Dektrium project <http://github.com/dektrium>
+ *
+ * For the full copyright and license information, please view the LICENSE.md
+ * file that was distributed with this source code.
+ */
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/**
+ * @var yii\web\View $this
+ * @var yii\widgets\ActiveForm $form
+ * @var dektrium\user\models\RecoveryForm $model
+ */
+
+$this->title = Yii::t('user', 'Recover your password');
+$this->params['breadcrumbs'][] = $this->title;
+$this->params['body-class']['class'] = 'login-page';
+?>
+<div class="login-box">
+    <div class="login-logo">
+        <?= Html::encode($this->title) ?>
+    </div>
+    <!-- /.login-logo -->
+    <div class="card">
+        <div class="card-body login-card-body">
+
+            <?= $this->render('/_alert', ['module' => Yii::$app->getModule('user')]) ?>
+
+            <?php $form = ActiveForm::begin([
+                'id' => 'password-recovery-form',
+                'enableAjaxValidation' => true,
+                'enableClientValidation' => false,
+            ]); ?>
+
+            <?= $form->field($model, 'email')->textInput(['autofocus' => true]) ?>
+
+            <?= Html::submitButton(Yii::t('user', 'Continue'), ['class' => 'btn btn-primary btn-block']) ?>
+
+            <?php ActiveForm::end(); ?>
+
+        </div>
+        <!-- /.login-card-body -->
+    </div>
+</div>

views/user/recovery/reset.php

@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Dektrium project.
+ *
+ * (c) Dektrium project <http://github.com/dektrium>
+ *
+ * For the full copyright and license information, please view the LICENSE.md
+ * file that was distributed with this source code.
+ */
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/**
+ * @var yii\web\View $this
+ * @var yii\widgets\ActiveForm $form
+ * @var dektrium\user\models\RecoveryForm $model
+ */
+
+$this->title = Yii::t('user', 'Reset your password');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="row">
+    <div class="col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3">
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <h3 class="panel-title"><?= Html::encode($this->title) ?></h3>
+            </div>
+            <div class="panel-body">
+                <?php $form = ActiveForm::begin([
+                    'id' => 'password-recovery-form',
+                    'enableAjaxValidation' => true,
+                    'enableClientValidation' => false,
+                ]); ?>
+
+                <?= $form->field($model, 'password')->passwordInput() ?>
+
+                <?= Html::submitButton(Yii::t('user', 'Finish'), ['class' => 'btn btn-success btn-block']) ?><br>
+
+                <?php ActiveForm::end(); ?>
+            </div>
+        </div>
+    </div>
+</div>

views/user/security/login.php

@@ -20,7 +20,7 @@ use yii\widgets\ActiveForm;
  * @var dektrium\user\Module $module
  */
 
-$this->title = Yii::t('user', 'Sign in');
+$this->title = \Yii::t('user', 'Sign in');
 $this->params['breadcrumbs'][] = $this->title;
 $this->params['body-class']['class'] = 'login-page';
 ?>
@@ -55,7 +55,7 @@ $this->params['body-class']['class'] = 'login-page';
 
             <?php else: ?>
 
-                <?= $form->field($model, 'login', ['inputOptions' => ['autofocus' => 'autofocus', 'class' => 'form-control', 'tabindex' => '1']]); ?>
+                <?= $form->field($model, 'uuid', ['inputOptions' => ['autofocus' => 'autofocus', 'class' => 'form-control', 'tabindex' => '1']]); ?>
 
             <?php endif ?>