added RBAC

lib/User/Bootstrap.php

@@ -1,6 +1,8 @@
 <?php
 namespace Da\User;
 
+use Da\User\Component\AuthDbManagerComponent;
+use Da\User\Contracts\AuthManagerInterface;
 use Da\User\Helper\ClassMapHelper;
 use Da\User\Model\User;
 use Da\User\Validator\TimeZoneValidator;
@@ -22,7 +24,7 @@ class Bootstrap implements BootstrapInterface
     {
         if ($app->hasModule('user') && $app->getModule('user') instanceof Module) {
             $map = $this->buildClassMap($app->getModule('user')->classMap);
-            $this->initContainer($app,$map);
+            $this->initContainer($app, $map);
             $this->initTranslations($app);
             $this->initMailServiceConfiguration($app, $app->getModule('user'));
 
@@ -30,6 +32,7 @@ class Bootstrap implements BootstrapInterface
                 $this->initControllerNamespace($app);
                 $this->initUrlRoutes($app);
                 $this->initAuthCollection($app);
+                $this->initAuthManager($app);
             } else {
                 /** @var $app ConsoleApplication */
                 $this->initConsoleCommands($app);
@@ -66,6 +69,7 @@ class Bootstrap implements BootstrapInterface
             $di->set(Helper\AuthHelper::class);
             $di->set(Helper\GravatarHelper::class);
             $di->set(Helper\SecurityHelper::class);
+            $di->set(Helper\TimezoneHelper::class);
 
             // services
             $di->set(Service\AccountConfirmationService::class);
@@ -143,6 +147,23 @@ class Bootstrap implements BootstrapInterface
         }
     }
 
+    /**
+     * Ensures the auth manager is the one provided by the library.
+     *
+     * @param Application $app
+     */
+    protected function initAuthModule(Application $app)
+    {
+        if (!($app->getAuthManager() instanceof AuthManagerInterface)) {
+            $app->set(
+                'authManager',
+                [
+                    'class' => AuthDbManagerComponent::class
+                ]
+            );
+        }
+    }
+
     /**
      * Initializes web url routes (rules in Yii2)
      *
@@ -170,7 +191,7 @@ class Bootstrap implements BootstrapInterface
      * Ensures required mail parameters needed for the mail service.
      *
      * @param Application $app
-     * @param Module $module
+     * @param Module|\yii\base\Module $module
      */
     protected function initMailServiceConfiguration(Application $app, Module $module)
     {

lib/User/Component/AuthDbManagerComponent.php

@@ -0,0 +1,75 @@
+<?php
+namespace Da\User\Component;
+
+
+use Da\User\Contracts\AuthManagerInterface;
+use yii\db\Query;
+use yii\rbac\DbManager;
+
+class AuthDbManagerComponent extends DbManager implements AuthManagerInterface
+{
+    /**
+     * @param int|null $type If null will return all auth items.
+     * @param array $excludeItems Items that should be excluded from result array.
+     *
+     * @return array
+     */
+    public function getItems($type = null, $excludeItems = [])
+    {
+        $query = (new Query())->from($this->itemTable);
+
+        if ($type !== null) {
+            $query->where(['type' => $type]);
+        } else {
+            $query->orderBy('type');
+        }
+
+        foreach ($excludeItems as $name) {
+            $query->andWhere('name <> :item', ['item' => $name]);
+        }
+
+        $items = [];
+
+        foreach ($query->all($this->db) as $row) {
+            $items[$row['name']] = $this->populateItem($row);
+        }
+
+        return $items;
+    }
+
+    /**
+     * Returns both roles and permissions assigned to user.
+     *
+     * @param  integer $userId
+     *
+     * @return array
+     */
+    public function getItemsByUser($userId)
+    {
+        if (empty($userId)) {
+            return [];
+        }
+
+        $query = (new Query())
+            ->select('b.*')
+            ->from(['a' => $this->assignmentTable, 'b' => $this->itemTable])
+            ->where('{{a}}.[[item_name]]={{b}}.[[name]]')
+            ->andWhere(['a.user_id' => (string)$userId]);
+
+        $roles = [];
+        foreach ($query->all($this->db) as $row) {
+            $roles[$row['name']] = $this->populateItem($row);
+            $roles[$row['name']] = $this->populateItem($row);
+        }
+
+        return $roles;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getItem($name)
+    {
+        return parent::getItem($name);
+    }
+}

lib/User/Contracts/AuthManagerInterface.php

@@ -0,0 +1,29 @@
+<?php
+namespace Da\User\Contracts;
+
+use yii\rbac\ManagerInterface;
+
+interface AuthManagerInterface extends ManagerInterface
+{
+    /**
+     * @param  integer|null $type
+     * @param  array $excludeItems
+     *
+     * @return mixed
+     */
+    public function getItems($type = null, $excludeItems = []);
+
+    /**
+     * @param  integer $userId
+     *
+     * @return mixed
+     */
+    public function getItemsByUser($userId);
+
+    /**
+     * @param  string $name
+     *
+     * @return mixed
+     */
+    public function getItem($name);
+}

lib/User/Controller/AbstractAuthItemController.php

@@ -0,0 +1,168 @@
+<?php
+namespace Da\User\Controller;
+
+use Da\User\Filter\AccessRuleFilter;
+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\Validator\AjaxRequestModelValidator;
+use Yii;
+use yii\filters\AccessControl;
+use yii\web\Controller;
+
+abstract class AbstractAuthItemController extends Controller
+{
+    use ContainerTrait;
+
+    protected $modelClass;
+    protected $searchModelClass;
+    protected $authHelper;
+
+    /**
+     * AbstractAuthItemController constructor.
+     *
+     * @param string $id
+     * @param Module $module
+     * @param AuthHelper $authHelper
+     * @param array $config
+     */
+    public function __construct($id, Module $module, AuthHelper $authHelper, array $config = [])
+    {
+        $this->authHelper = $authHelper;
+        parent::__construct($id, $module, $config);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function behaviors()
+    {
+        return [
+            'access' => [
+                'class' => AccessControl::className(),
+                'ruleConfig' => [
+                    'class' => AccessRuleFilter::className(),
+                ],
+                'rules' => [
+                    [
+                        'allow' => true,
+                        'roles' => ['admin'],
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    public function actionIndex()
+    {
+        $searchModel = $this->make($this->getSearchModelClass());
+
+        return $this->render(
+            'index',
+            [
+                'searchModel' => $searchModel,
+                'dataProvider' => $searchModel->search(Yii::$app->request->get())
+            ]
+        );
+    }
+
+    public function actionCreate()
+    {
+        /** @var AbstractAuthItem $model */
+        $model = $this->make($this->getModelClass(), [], ['scenario' => 'create']);
+
+        $this->make(AjaxRequestModelValidator::class, [$model])->validate();
+
+        if ($model->load(Yii::$app->request->post())) {
+            if ($this->make(AuthItemEditionService::class, [$model])->run()) {
+                Yii::$app
+                    ->getSession()
+                    ->setFlash('success', Yii::t('user', 'Authorization item successfully created.'));
+
+                return $this->redirect(['index']);
+
+            } else {
+                Yii::$app->getSession()->setFlash('danger', Yii::t('user', 'Unable to create authorization item.'));
+            }
+        }
+
+        return $this->render(
+            'create',
+            [
+                'model' => $model,
+                'unassignedItems' => $this->authHelper->getUnassignedItems($model)
+            ]
+        );
+    }
+
+    public function actionUpdate($name)
+    {
+        $authItem = $this->getItem($name);
+
+        /** @var AbstractAuthItem $model */
+        $model = $this->make($this->getModelClass(), [], ['scenario' => 'update', 'item' => $authItem]);
+
+        $this->make(AjaxRequestModelValidator::class, [$model])->validate();
+
+        if ($model->load(Yii::$app->request->post())) {
+
+            if ($this->make(AuthItemEditionService::class, [$model])->run()) {
+                Yii::$app
+                    ->getSession()
+                    ->setFlash('success', Yii::t('user', 'Authorization item successfully updated.'));
+
+                return $this->redirect(['index']);
+
+            } else {
+                Yii::$app->getSession()->setFlash('danger', Yii::t('user', 'Unable to update authorization item.'));
+            }
+        }
+
+        return $this->render(
+            'update',
+            [
+                'model' => $model,
+                'unassignedItems' => $this->authHelper->getUnassignedItems($model)
+            ]
+        );
+    }
+
+    public function actionDelete($name)
+    {
+        $item = $this->getItem($name);
+
+        if ($this->authHelper->remove($item)) {
+            Yii::$app->getSession()->setFlash('success', Yii::t('user', 'Authorization item successfully removed.'));
+        } else {
+            Yii::$app->getSession()->setFlash('success', Yii::t('user', 'Unable to remove authorization item.'));
+        }
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * The fully qualified class name of the model
+     *
+     * @return string
+     */
+    abstract protected function getModelClass();
+
+    /**
+     * The fully qualified class name of the search model
+     *
+     * @return string
+     */
+    abstract protected function getSearchModelClass();
+
+    /**
+     * Returns the an auth item
+     *
+     * @param string $name
+     *
+     * @return \yii\rbac\Role|\yii\rbac\Permission|\yii\rbac\Rule
+     */
+    abstract protected function getItem($name);
+
+}

lib/User/Controller/AdminController.php

@@ -208,6 +208,7 @@ class AdminController extends Controller
             '_assignments',
             [
                 'user' => $user,
+                'params' => Yii::$app->request->post()
             ]
         );
     }

lib/User/Controller/PermissionController.php

@@ -0,0 +1,41 @@
+<?php
+namespace Da\User\Controller;
+
+
+use Da\User\Model\Permission;
+use Da\User\Search\PermissionSearch;
+use yii\web\NotFoundHttpException;
+
+class PermissionController extends AbstractAuthItemController
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getModelClass()
+    {
+        return Permission::class;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getSearchModelClass()
+    {
+        return PermissionSearch::class;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getItem($name)
+    {
+        $authItem = $this->authHelper->getPermission($name);
+
+        if ($authItem !== null) {
+            return $authItem;
+        }
+
+        throw new NotFoundHttpException();
+    }
+
+}

lib/User/Controller/ProfileController.php

@@ -58,6 +58,7 @@ class ProfileController extends Controller
     public function actionShow($id)
     {
         $profile = $this->profileQuery->whereId($id)->one();
+
         if ($profile === null) {
             throw new NotFoundHttpException();
         }

lib/User/Controller/RoleController.php

@@ -0,0 +1,40 @@
+<?php
+namespace Da\User\Controller;
+
+use Da\User\Model\Role;
+use Da\User\Search\RoleSearch;
+use yii\web\NotFoundHttpException;
+
+class RoleController extends AbstractAuthItemController
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getModelClass()
+    {
+        return Role::class;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getSearchModelClass()
+    {
+        return RoleSearch::class;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getItem($name)
+    {
+        $authItem = $this->authHelper->getRole($name);
+
+        if ($authItem !== null) {
+            return $authItem;
+        }
+
+        throw new NotFoundHttpException();
+    }
+
+}

lib/User/Factory/AuthItemFactory.php

@@ -0,0 +1,50 @@
+<?php
+namespace Da\User\Factory;
+
+use Yii;
+use yii\rbac\Item;
+use Exception;
+
+class AuthItemFactory
+{
+    protected static $map = [
+        Item::TYPE_ROLE => 'makeRole',
+        Item::TYPE_PERMISSION => 'makePermission'
+    ];
+
+    /**
+     * @param $name
+     *
+     * @return \yii\rbac\Permission
+     */
+    public static function makePermission($name)
+    {
+        return Yii::$app->getAuthManager()->createPermission($name);
+    }
+
+    /**
+     * @param $name
+     *
+     * @return \yii\rbac\Role
+     */
+    public static function makeRole($name)
+    {
+        return Yii::$app->getAuthManager()->createRole($name);
+    }
+
+    /**
+     * @param $type
+     * @param $name
+     *
+     * @return \yii\rbac\Role|\yii\rbac\Permission
+     * @throws Exception
+     */
+    public static function makeByType($type, $name)
+    {
+        if (array_key_exists($type, self::$map)) {
+            return call_user_func([self::class, self::$map[$type]], $name);
+        }
+
+        throw new Exception('Unknown strategy type');
+    }
+}

lib/User/Helper/AuthHelper.php

@@ -1,30 +1,31 @@
 <?php
 namespace Da\User\Helper;
 
+use Da\User\Model\AbstractAuthItem;
 use Da\User\Module;
+use Da\User\Traits\AuthManagerTrait;
 use Yii;
+use yii\helpers\ArrayHelper;
+use yii\rbac\Permission;
+use yii\rbac\Role;
+use yii\rbac\Rule;
 
-/**
- *
- * RoleHelper.php
- *
- * Date: 3/12/16
- * Time: 15:11
- * @author Antonio Ramirez <hola@2amigos.us>
- */
 class AuthHelper
 {
+    use AuthManagerTrait;
+
     /**
-     * Checks whether
+     * Checks whether a user has certain role
      *
+     * @param $userId
      * @param $role
      *
      * @return bool
      */
     public function hasRole($userId, $role)
     {
-        if (Yii::$app->getAuthManager()) {
+        if ($this->getAuthManager()) {
-            $roles = array_keys(Yii::$app->getAuthManager()->getRolesByUser($userId));
+            $roles = array_keys($this->getAuthManager()->getRolesByUser($userId));
 
             return in_array($role, $roles, true);
         }
@@ -41,11 +42,61 @@ class AuthHelper
     {
         /** @var Module $module */
         $module = Yii::$app->getModule('user');
-        $hasAdministratorPermissionName = Yii::$app->getAuthManager() && $module->administratorPermissionName
+        $hasAdministratorPermissionName = $this->getAuthManager() && $module->administratorPermissionName
             ? Yii::$app->getUser()->can($module->administratorPermissionName)
             : false;
 
         return $hasAdministratorPermissionName || in_array($username, $module->administrators);
     }
 
+    /**
+     * @param $name
+     *
+     * @return null|\yii\rbac\Item|Permission
+     */
+    public function getPermission($name)
+    {
+        return $this->getAuthManager()->getPermission($name);
+    }
+
+    /**
+     * @param $name
+     *
+     * @return null|\yii\rbac\Item|Role
+     */
+    public function getRole($name)
+    {
+        return $this->getAuthManager()->getRole($name);
+    }
+
+    /**
+     * Removes a role, permission or rule from the RBAC system.
+     *
+     * @param Role|Permission|Rule $object
+     *
+     * @return bool whether the role, permission or rule is successfully removed
+     */
+    public function remove($object)
+    {
+        return $this->getAuthManager()->remove($object);
+    }
+
+    /**
+     * @param AbstractAuthItem $model
+     *
+     * @return array
+     */
+    public function getUnassignedItems(AbstractAuthItem $model)
+    {
+        $excludeItems = $model->item !== null ? [$model->item->name] : [];
+        $items = $this->getAuthManager()->getItems($model->getType(), $excludeItems);
+
+        return ArrayHelper::map(
+            $items,
+            'name',
+            function ($item) {
+                return empty($item->description) ? $item->name : "{$item->name} ({$item->description})";
+            }
+        );
+    }
 }

lib/User/Helper/TimezoneHelper.php

@@ -0,0 +1,35 @@
+<?php
+namespace Da\User\Helper;
+
+use DateTimeZone;
+use yii\helpers\ArrayHelper;
+use DateTime;
+
+
+class TimezoneHelper
+{
+    /**
+     * Get all of the time zones with the offsets sorted by their offset
+     *
+     * @return array
+     */
+    public static function getAll()
+    {
+        $timeZones = [];
+        $timeZoneIdentifiers = DateTimeZone::listIdentifiers();
+
+        foreach ($timeZoneIdentifiers as $timeZone) {
+            $date = new DateTime('now', new DateTimeZone($timeZone));
+            $offset = $date->getOffset() / 60 / 60;
+            $timeZones[] = [
+                'timezone' => $timeZone,
+                'name' => "{$timeZone} (UTC " . ($offset > 0 ? '+' : '') . "{$offset})",
+                'offset' => $offset
+            ];
+        }
+
+        ArrayHelper::multisort($timeZones, 'offset', SORT_DESC, SORT_NUMERIC);
+
+        return $timeZones;
+    }
+}

lib/User/Model/AbstractAuthItem.php

@@ -0,0 +1,120 @@
+<?php
+namespace Da\User\Model;
+
+use Da\User\Traits\AuthManagerTrait;
+use Da\User\Validator\RbacItemsValidator;
+use Da\User\Validator\RbacRuleValidator;
+use yii\base\Model;
+use yii\rbac\Item;
+use Yii;
+
+abstract class AbstractAuthItem extends Model
+{
+    use AuthManagerTrait;
+
+    /**
+     * @var string
+     */
+    public $itemName;
+    /**
+     * @var string
+     */
+    public $name;
+    /**
+     * @var string
+     */
+    public $description;
+    /**
+     * @var string
+     */
+    public $rule;
+    /**
+     * @var string[]
+     */
+    public $children;
+    /**
+     * @var \yii\rbac\Role|\yii\rbac\Permission
+     */
+    public $item;
+
+    /**
+     * @inheritdoc
+     */
+    public function init()
+    {
+        parent::init();
+
+        if ($this->item instanceof Item) {
+            $this->itemName = $this->item->name;
+            $this->name = $this->item->name;
+            $this->description = $this->item->description;
+            $this->children = array_keys($this->getAuthManager()->getChildren($this->item->name));
+            if ($this->item->ruleName !== null) {
+                $this->rule = get_class($this->getAuthManager()->getRule($this->item->ruleName));
+            }
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'name' => Yii::t('user', 'Name'),
+            'description' => Yii::t('user', 'Description'),
+            'children' => Yii::t('user', 'Children'),
+            'rule' => Yii::t('user', 'Rule'),
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        return [
+            'create' => ['name', 'description', 'children', 'rule'],
+            'update' => ['name', 'description', 'children', 'rule'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            ['itemName', 'safe'],
+            ['name', 'required'],
+            ['name', 'match', 'pattern' => '/^[\w][\w-.:]+[\w]$/'],
+            [['name', 'description', 'rule'], 'trim'],
+            [
+                'name',
+                function () {
+                    if ($this->getAuthManager()->getItem($this->name) !== null) {
+                        $this->addError('name', Yii::t('user', 'Auth item with such name already exists'));
+                    }
+                },
+                'when' => function () {
+                    return $this->scenario == 'create' || $this->item->name != $this->name;
+                }
+            ],
+            ['children', RbacItemsValidator::class],
+            ['rule', RbacRuleValidator::class],
+        ];
+    }
+
+    /**
+     * @return bool
+     */
+    public function getIsNewRecord()
+    {
+        return $this->item === null;
+    }
+
+    /**
+     * @return Item
+     */
+    abstract public function getType();
+}

lib/User/Model/Assignment.php

@@ -0,0 +1,54 @@
+<?php
+namespace Da\User\Model;
+
+use Da\User\Traits\AuthManagerTrait;
+use Da\User\Validator\RbacItemsValidator;
+use yii\base\InvalidConfigException;
+use yii\base\Model;
+use Yii;
+
+class Assignment extends Model
+{
+    use AuthManagerTrait;
+
+    public $items = [];
+    public $user_id;
+    public $updated = false;
+
+    /**
+     * @inheritdoc
+     * @throws InvalidConfigException
+     */
+    public function init()
+    {
+        parent::init();
+
+        if($this->user_id === null) {
+            throw new InvalidConfigException('"user_id" must be set.');
+        }
+
+        $this->items = array_keys($this->getAuthManager()->getItemsByUser($this->user_id));
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'items' => Yii::t('user', 'Items')
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            ['user_id', 'required'],
+            ['items', RbacItemsValidator::class],
+            ['user_id', 'integer']
+        ];
+    }
+}

lib/User/Model/Permission.php

@@ -0,0 +1,12 @@
+<?php
+namespace Da\User\Model;
+
+use yii\rbac\Item;
+
+class Permission extends AbstractAuthItem
+{
+    public function getType()
+    {
+        return Item::TYPE_PERMISSION;
+    }
+}

lib/User/Model/Role.php

@@ -0,0 +1,13 @@
+<?php
+namespace Da\User\Model;
+
+use yii\rbac\Item;
+
+
+class Role extends AbstractAuthItem
+{
+    public function getType()
+    {
+        return Item::TYPE_ROLE;
+    }
+}

lib/User/Search/AbstractAuthItemSearch.php

@@ -0,0 +1,65 @@
+<?php
+namespace Da\User\Search;
+
+use Da\User\Traits\AuthManagerTrait;
+use Da\User\Traits\ContainerTrait;
+use yii\base\Model;
+use yii\data\ArrayDataProvider;
+use yii\db\Query;
+
+abstract class AbstractAuthItemSearch extends Model
+{
+    use AuthManagerTrait;
+    use ContainerTrait;
+
+    /**
+     * @var string
+     */
+    public $name;
+    /**
+     * @var string
+     */
+    public $description;
+    /**
+     * @var string
+     */
+    public $rule_name;
+
+    /**
+     * @return integer
+     */
+    abstract public function getType();
+
+    /**
+     * @return array
+     */
+    public function scenarios()
+    {
+        return [
+            'default' => ['name', 'description', 'rule_name'],
+        ];
+    }
+
+    public function search($params = [])
+    {
+        /** @var ArrayDataProvider $dataProvider */
+        $dataProvider = $this->make(ArrayDataProvider::class);
+
+        $query = (new Query())
+            ->select(['name', 'description', 'rule_name'])
+            ->andWhere(['type' => $this->getType()])
+            ->from($this->getAuthManager()->itemTable);
+
+        if ($this->load($params) && $this->validate()) {
+            $query
+                ->andFilterWhere(['like', 'name', $this->name])
+                ->andFilterWhere(['like', 'description', $this->description])
+                ->andFilterWhere(['like', 'rule_name', $this->rule_name]);
+        }
+
+        $dataProvider->allModels = $query->all($this->getAuthManager()->db);
+
+        return $dataProvider;
+
+    }
+}

lib/User/Search/PermissionSearch.php

@@ -0,0 +1,16 @@
+<?php
+namespace Da\User\Search;
+
+use yii\rbac\Item;
+
+class PermissionSearch extends AbstractAuthItemSearch
+{
+    /**
+     * @inheritdoc
+     */
+    public function getType()
+    {
+        return Item::TYPE_PERMISSION;
+    }
+
+}

lib/User/Search/RoleSearch.php

@@ -0,0 +1,15 @@
+<?php
+namespace Da\User\Search;
+
+use yii\rbac\Item;
+
+class RoleSearch extends AbstractAuthItemSearch
+{
+    /**
+     * @inheritdoc
+     */
+    public function getType()
+    {
+        return Item::TYPE_ROLE;
+    }
+}

lib/User/Service/AuthItemEditionService.php

@@ -0,0 +1,95 @@
+<?php
+namespace Da\User\Service;
+
+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 Exception;
+
+class AuthItemEditionService implements ServiceInterface
+{
+    use AuthManagerTrait;
+    use ContainerTrait;
+
+    protected $model;
+
+    public function __construct(AbstractAuthItem $model)
+    {
+        $this->model = $model;
+    }
+
+    public function run()
+    {
+        if (!$this->model->validate()) {
+            return false;
+        }
+        try {
+            if ($this->model->getIsNewRecord()) {
+                $item = AuthItemFactory::makeByType($this->model->getType(), $this->model->name);
+            } else {
+                $item = $this->model->item;
+            }
+
+            $item->name = $this->model->name;
+            $item->description = $this->model->description;
+
+            if (!empty($this->model->rule)) {
+                $rule = $this->make($this->model->rule);
+                if (null === $this->getAuthManager()->getRule($rule->name)) {
+                    $this->getAuthManager()->add($rule);
+                }
+                $item->ruleName = $rule->name;
+            } else {
+                $item->ruleName = null;
+            }
+
+            if ($this->model->getIsNewRecord()) {
+                $this->getAuthManager()->add($item);
+            } else {
+                $this->getAuthManager()->update($this->model->itemName, $item);
+                $this->model->itemName = $item->name;
+            }
+
+            $this->model->item = $item;
+
+            return $this->updateChildren();
+
+        } catch (Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * Updates Auth Item children
+     *
+     * @return bool
+     */
+    protected function updateChildren()
+    {
+        $children = $this->getAuthManager()->getChildren($this->model->item->name);
+        $childrenNames = array_keys($children);
+
+        if (is_array($this->model->children)) {
+
+            // remove those not linked anymore
+            foreach (array_diff($childrenNames, $this->model->children) as $item) {
+                if (!$this->getAuthManager()->removeChild($this->model->item, $children[$item])) {
+                    return false;
+                }
+
+            }
+            // add new children
+            foreach (array_diff($this->model->children, $childrenNames) as $item) {
+                if (!$this->getAuthManager()->addChild($this->model->item, $this->getAuthManager()->getItem($item))) {
+                    return false;
+                }
+            }
+        } else {
+            return $this->getAuthManager()->removeChildren($this->model->item);
+        }
+
+        return true;
+    }
+}

lib/User/Service/UpdateAuthAssignmentsService.php

@@ -0,0 +1,44 @@
+<?php
+namespace Da\User\Service;
+
+
+use Da\User\Contracts\ServiceInterface;
+use Da\User\Model\Assignment;
+use Da\User\Traits\AuthManagerTrait;
+
+class UpdateAuthAssignmentsService implements ServiceInterface
+{
+    use AuthManagerTrait;
+
+    protected $model;
+
+    public function __construct(Assignment $model)
+    {
+        $this->model = $model;
+    }
+
+    public function run()
+    {
+        if ($this->model->validate()) {
+            return false;
+        }
+
+        if (!is_array($this->model->items)) {
+            $this->model->items = [];
+        }
+
+        $assignedItems = $this->getAuthManager()->getItemsByUser($this->model->user_id);
+        $assignedItemsNames = array_keys($assignedItems);
+
+        foreach (array_diff($assignedItemsNames, $this->model->items) as $item) {
+            $this->model->getAuthManager()->revoke($assignedItems[$item], $this->model->user_id);
+        }
+
+        foreach (array_diff($this->model->items, $assignedItemsNames) as $item) {
+            $this->getAuthManager()->assign($this->getAuthManager()->getItem($item), $this->model->user_id);
+        }
+
+        return $this->model->updated = true;
+
+    }
+}

lib/User/Traits/AuthManagerTrait.php

@@ -0,0 +1,16 @@
+<?php
+namespace Da\User\Traits;
+
+use Da\User\Component\AuthDbManagerComponent;
+use Yii;
+
+trait AuthManagerTrait
+{
+    /**
+     * @return AuthDbManagerComponent|\yii\rbac\ManagerInterface
+     */
+    public function getAuthManager() {
+
+        return Yii::$app->getAuthManager();
+    }
+}

lib/User/Validator/RbacItemsValidator.php

@@ -0,0 +1,25 @@
+<?php
+namespace Da\User\Validator;
+
+use Da\User\Traits\AuthManagerTrait;
+use Yii;
+use yii\validators\Validator;
+
+class RbacItemsValidator extends Validator
+{
+    use AuthManagerTrait;
+
+    protected function validateValue($value)
+    {
+        if (!is_array($value)) {
+            return [Yii::t('item', 'Invalid value'), []];
+        }
+
+        foreach ($value as $item) {
+            if ($this->getAuthManager()->getItem($item) == null) {
+                return [Yii::t('user', 'There is neither role nor permission with name "{0}"', [$item]), []];
+            }
+        }
+    }
+
+}

lib/User/Validator/RbacRuleValidator.php

@@ -0,0 +1,26 @@
+<?php
+namespace Da\User\Validator;
+
+use ReflectionClass;
+use Exception;
+use yii\validators\Validator;
+use Yii;
+
+class RbacRuleValidator extends Validator
+{
+    protected function validateValue($value)
+    {
+        try {
+            $class = new ReflectionClass($value);
+        } catch (Exception $e) {
+            return [Yii::t('user', 'Class "{0}" does not exist', $value), []];
+        }
+
+        if ($class->isInstantiable() == false) {
+            return [Yii::t('user', 'Rule class can not be instantiated'), []];
+        }
+        if ($class->isSubclassOf('\yii\rbac\Rule') == false) {
+            return [Yii::t('user', 'Rule class must extend "yii\rbac\Rule"'), []];
+        }
+    }
+}

lib/User/Widget/AssignmentsWidget.php

@@ -2,44 +2,68 @@
 
 namespace Da\User\Widget;
 
-use dektrium\rbac\components\DbManager;
+use Da\User\Model\Assignment;
-use dektrium\rbac\models\Assignment;
+use Da\User\Service\UpdateAuthAssignmentsService;
-use Yii;
+use Da\User\Traits\AuthManagerTrait;
+use Da\User\Traits\ContainerTrait;
 use yii\base\InvalidConfigException;
 use yii\base\Widget;
+use yii\helpers\ArrayHelper;
 
 class AssignmentsWidget extends Widget
 {
-    /** @var integer ID of the user to whom auth items will be assigned. */
+    use AuthManagerTrait;
+    use ContainerTrait;
+
+    /**
+     * @var integer ID of the user to whom auth items will be assigned.
+     */
     public $userId;
+    /**
+     * @var string[] the post parameters
+     */
+    public $params = [];
 
-    /** @var DbManager */
+    /**
-    protected $manager;
+     * @inheritdoc
-
+     * @throws InvalidConfigException
-    /** @inheritdoc */
+     */
     public function init()
     {
         parent::init();
-        $this->manager = Yii::$app->authManager;
         if ($this->userId === null) {
-            throw new InvalidConfigException('You should set ' . __CLASS__ . '::$userId');
+            throw new InvalidConfigException( __CLASS__ . '::$userId is required');
         }
     }
 
-    /** @inheritdoc */
+    /**
+     * @inheritdoc
+     */
     public function run()
     {
-        $model = Yii::createObject([
+        $model = $this->make(Assignment::class, [], ['user_id' => $this->userId]);
-            'class'   => Assignment::className(),
-            'user_id' => $this->userId,
-        ]);
 
-        if ($model->load(\Yii::$app->request->post())) {
+        if ($model->load($this->params)) {
-            $model->updateAssignments();
+            $this->make(UpdateAuthAssignmentsService::class, [$model])->run();
         }
 
         return $this->render('/widgets/assignments/form', [
             'model' => $model,
+            'availableItems' => $this->getAvailableItems()
         ]);
     }
+
+    /**
+     * Returns all available auth items to be attached to the user
+     *
+     * @return array
+     */
+    protected function getAvailableItems()
+    {
+        return ArrayHelper::map($this->getAuthManager()->getItems(), 'name', function ($item) {
+            return empty($item->description)
+                ? $item->name
+                : $item->name . ' (' . $item->description . ')';
+        });
+    }
 }

lib/User/resources/views/admin/_assignments.php

@@ -5,6 +5,7 @@ use Da\User\Widget\AssignmentsWidget;
 /**
  * @var yii\web\View $this
  * @var \Da\User\Model\User $user
+ * @var string[] $params
  */
 
 ?>
@@ -20,6 +21,6 @@ use Da\User\Widget\AssignmentsWidget;
     ]
 ) ?>
 
-<?= AssignmentsWidget::widget(['userId' => $user->id]) ?>
+<?= AssignmentsWidget::widget(['userId' => $user->id, 'params' => $params]) ?>
 
 <?php $this->endContent() ?>

lib/User/resources/views/admin/create.php

@@ -14,7 +14,7 @@ $this->params['breadcrumbs'][] = ['label' => Yii::t('user', 'Users'), 'url' => [
 $this->params['breadcrumbs'][] = $this->title;
 
 ?>
-
+<div class="clearfix"></div>
 <?= $this->render(
     '/shared/_alert',
     [
@@ -22,9 +22,15 @@ $this->params['breadcrumbs'][] = $this->title;
     ]
 ) ?>
 
-<?= $this->render('_menu') ?>
-
 <div class="row">
+    <div class="col-md-12">
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <h3 class="panel-title"><?= Html::encode($this->title) ?></h3>
+            </div>
+            <div class="panel-body">
+                <?= $this->render('/shared/_menu') ?>
+                <div class="row">
                     <div class="col-md-3">
                         <div class="panel panel-default">
                             <div class="panel-body">
@@ -34,7 +40,10 @@ $this->params['breadcrumbs'][] = $this->title;
                                             'class' => 'nav-pills nav-stacked',
                                         ],
                                         'items' => [
-                            ['label' => Yii::t('user', 'Account details'), 'url' => ['/user/admin/create']],
+                                            [
+                                                'label' => Yii::t('user', 'Account details'),
+                                                'url' => ['/user/admin/create']
+                                            ],
                                             [
                                                 'label' => Yii::t('user', 'Profile details'),
                                                 'options' => [
@@ -79,7 +88,10 @@ $this->params['breadcrumbs'][] = $this->title;
 
                                 <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']) ?>
+                                        <?= Html::submitButton(
+                                            Yii::t('user', 'Save'),
+                                            ['class' => 'btn btn-block btn-success']
+                                        ) ?>
                                     </div>
                                 </div>
 
@@ -87,4 +99,9 @@ $this->params['breadcrumbs'][] = $this->title;
                             </div>
                         </div>
                     </div>
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
+

lib/User/resources/views/admin/index.php

@@ -17,14 +17,7 @@ $this->title = Yii::t('user', 'Manage users');
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 
-<?= $this->render(
+<?php $this->beginContent('@Da/User/resources/views/shared/admin_layout.php') ?>
-    '/shared/_alert',
-    [
-        'module' => Yii::$app->getModule('user'),
-    ]
-) ?>
-
-<?= $this->render('/admin/_menu') ?>
 
 <?php Pjax::begin() ?>
 
@@ -113,3 +106,5 @@ $this->params['breadcrumbs'][] = $this->title;
 ); ?>
 
 <?php Pjax::end() ?>
+
+<?php $this->endContent() ?>

lib/User/resources/views/admin/update.php

@@ -3,6 +3,7 @@
 use Da\User\Model\User;
 use yii\bootstrap\Nav;
 use yii\web\View;
+use yii\helpers\Html;
 
 /**
  * @var View $this
@@ -15,7 +16,7 @@ $this->params['breadcrumbs'][] = ['label' => Yii::t('user', 'Users'), 'url' => [
 $this->params['breadcrumbs'][] = $this->title;
 
 ?>
-
+<div class="clearfix"></div>
 <?= $this->render(
     '/shared/_alert',
     [
@@ -23,9 +24,15 @@ $this->params['breadcrumbs'][] = $this->title;
     ]
 ) ?>
 
-<?= $this->render('_menu') ?>
-
 <div class="row">
+    <div class="col-md-12">
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <h3 class="panel-title"><?= Html::encode($this->title) ?></h3>
+            </div>
+            <div class="panel-body">
+                <?= $this->render('/shared/_menu') ?>
+                <div class="row">
                     <div class="col-md-3">
                         <div class="panel panel-default">
                             <div class="panel-body">
@@ -59,7 +66,10 @@ $this->params['breadcrumbs'][] = $this->title;
                                                 'linkOptions' => [
                                                     'class' => 'text-success',
                                                     'data-method' => 'post',
-                                    'data-confirm' => Yii::t('user', 'Are you sure you want to confirm this user?'),
+                                                    'data-confirm' => Yii::t(
+                                                        'user',
+                                                        'Are you sure you want to confirm this user?'
+                                                    ),
                                                 ],
                                             ],
                                             [
@@ -69,7 +79,10 @@ $this->params['breadcrumbs'][] = $this->title;
                                                 'linkOptions' => [
                                                     'class' => 'text-danger',
                                                     'data-method' => 'post',
-                                    'data-confirm' => Yii::t('user', 'Are you sure you want to block this user?'),
+                                                    'data-confirm' => Yii::t(
+                                                        'user',
+                                                        'Are you sure you want to block this user?'
+                                                    ),
                                                 ],
                                             ],
                                             [
@@ -79,7 +92,10 @@ $this->params['breadcrumbs'][] = $this->title;
                                                 'linkOptions' => [
                                                     'class' => 'text-success',
                                                     'data-method' => 'post',
-                                    'data-confirm' => Yii::t('user', 'Are you sure you want to unblock this user?'),
+                                                    'data-confirm' => Yii::t(
+                                                        'user',
+                                                        'Are you sure you want to unblock this user?'
+                                                    ),
                                                 ],
                                             ],
                                             [
@@ -88,7 +104,10 @@ $this->params['breadcrumbs'][] = $this->title;
                                                 'linkOptions' => [
                                                     'class' => 'text-danger',
                                                     'data-method' => 'post',
-                                    'data-confirm' => Yii::t('user', 'Are you sure you want to delete this user?'),
+                                                    'data-confirm' => Yii::t(
+                                                        'user',
+                                                        'Are you sure you want to delete this user?'
+                                                    ),
                                                 ],
                                             ],
                                         ],
@@ -104,4 +123,8 @@ $this->params['breadcrumbs'][] = $this->title;
                             </div>
                         </div>
                     </div>
+                </div>
+            </div>
+        </div>
+    </div>
 </div>

lib/User/resources/views/permission/_form.php

@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * @var $this  yii\web\View
+ * @var $model \Da\User\Model\Permission
+ * @var $unassignedItems string[]
+ */
+
+use kartik\select2\Select2;
+use yii\widgets\ActiveForm;
+use yii\helpers\Html;
+
+?>
+
+<?php $form = ActiveForm::begin([
+    'enableClientValidation' => false,
+    'enableAjaxValidation'   => true,
+]) ?>
+
+<?= $form->field($model, 'name') ?>
+
+<?= $form->field($model, 'description') ?>
+
+<?= $form->field($model, 'rule') ?>
+
+<?= $form->field($model, 'children')->widget(Select2::className(), [
+    'data' => $unassignedItems,
+    'options' => [
+        'id' => 'children',
+        'multiple' => true
+    ],
+]) ?>
+
+<?= Html::submitButton(Yii::t('user', 'Save'), ['class' => 'btn btn-success btn-block']) ?>
+
+<?php ActiveForm::end() ?>

lib/User/resources/views/permission/create.php

@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * @var $model \Da\User\Model\Permission
+ * @var $this  yii\web\View
+ * @var $unassignedItems string[]
+ */
+
+$this->title = Yii::t('user', 'Create new permission');
+$this->params['breadcrumbs'][] = $this->title;
+
+?>
+
+<?php $this->beginContent('@Da/User/resources/views/shared/admin_layout.php') ?>
+
+<?= $this->render(
+    '_form',
+    [
+        'model' => $model,
+        'unassignedItems' => $unassignedItems
+    ]
+) ?>
+
+<?php $this->endContent() ?>

lib/User/resources/views/permission/index.php

@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * @var $dataProvider array
+ * @var $this         yii\web\View
+ * @var $searchModel  \Da\User\Search\PermissionSearch
+ */
+
+use yii\grid\ActionColumn;
+use yii\grid\GridView;
+use yii\helpers\Url;
+
+$this->title = Yii::t('user', 'Permissions');
+$this->params['breadcrumbs'][] = $this->title;
+
+?>
+
+<?php $this->beginContent('@Da/User/resources/views/shared/admin_layout.php') ?>
+
+<?= GridView::widget(
+    [
+        'dataProvider' => $dataProvider,
+        'filterModel' => $searchModel,
+        'layout' => "{items}\n{pager}",
+        'columns' => [
+            [
+                'attribute' => 'name',
+                'header' => Yii::t('user', 'Name'),
+                'options' => [
+                    'style' => 'width: 20%'
+                ],
+            ],
+            [
+                'attribute' => 'description',
+                'header' => Yii::t('user', 'Description'),
+                'options' => [
+                    'style' => 'width: 55%'
+                ],
+            ],
+            [
+                'attribute' => 'rule_name',
+                'header' => Yii::t('user', 'Rule name'),
+                'options' => [
+                    'style' => 'width: 20%'
+                ],
+            ],
+            [
+                'class' => ActionColumn::className(),
+                'template' => '{update} {delete}',
+                'urlCreator' => function ($action, $model) {
+                    return Url::to(['/user/permission/' . $action, 'name' => $model['name']]);
+                },
+                'options' => [
+                    'style' => 'width: 5%'
+                ],
+            ]
+        ],
+    ]
+) ?>
+<?php $this->endContent() ?>

lib/User/resources/views/permission/update.php

@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * @var $model \Da\User\Model\Permission
+ * @var $this  yii\web\View
+ * @var $unassignedItems string[]
+ */
+
+$this->title = Yii::t('user', 'Update permission');
+$this->params['breadcrumbs'][] = $this->title;
+
+?>
+
+<?php $this->beginContent('@Da/User/resources/views/shared/admin_layout.php') ?>
+
+<?= $this->render(
+    '_form',
+    [
+        'model' => $model,
+        'unassignedItems' => $unassignedItems
+    ]
+) ?>
+
+<?php $this->endContent() ?>
+

lib/User/resources/views/registration/register.php

@@ -1,14 +1,5 @@
 <?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;
 

lib/User/resources/views/role/_form.php

@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * @var $this  yii\web\View
+ * @var $model \Da\User\Model\Role
+ */
+use Da\User\Helper\AuthHelper;
+use kartik\select2\Select2;
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+$unassignedItems = Yii::$container->get(AuthHelper::class)->getUnassignedItems($model);
+?>
+
+<?php $form = ActiveForm::begin(
+    [
+        'enableClientValidation' => false,
+        'enableAjaxValidation' => true,
+    ]
+) ?>
+
+<?= $form->field($model, 'name') ?>
+
+<?= $form->field($model, 'description') ?>
+
+<?= $form->field($model, 'rule') ?>
+
+<?= $form->field($model, 'children')->widget(
+    Select2::className(),
+    [
+        'data' => $unassignedItems,
+        'options' => [
+            'id' => 'children',
+            'multiple' => true
+        ],
+    ]
+) ?>
+
+<?= Html::submitButton(Yii::t('user', 'Save'), ['class' => 'btn btn-success btn-block']) ?>
+
+<?php ActiveForm::end() ?>

lib/User/resources/views/role/create.php

@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * @var $model \Da\User\Model\Role
+ * @var $this  yii\web\View
+ * @var $unassignedItems string[]
+ */
+
+$this->title = Yii::t('user', 'Create new role');
+$this->params['breadcrumbs'][] = $this->title;
+
+?>
+
+<?php $this->beginContent('@Da/User/resources/views/shared/admin_layout.php') ?>
+
+<?= $this->render(
+    '_form',
+    [
+        'model' => $model,
+        'unassignedItems' => $unassignedItems
+    ]
+) ?>
+
+<?php $this->endContent() ?>

lib/User/resources/views/role/index.php

@@ -0,0 +1,61 @@
+<?php
+use yii\grid\ActionColumn;
+use yii\grid\GridView;
+use yii\helpers\Url;
+
+/**
+ * @var $dataProvider array
+ * @var $searchModel  \Da\User\Search\RoleSearch
+ * @var $this         yii\web\View
+ */
+
+
+$this->title = Yii::t('user', 'Roles');
+$this->params['breadcrumbs'][] = $this->title;
+
+?>
+
+<?php $this->beginContent('@Da/User/resources/views/shared/admin_layout.php') ?>
+
+<?= GridView::widget(
+    [
+        'dataProvider' => $dataProvider,
+        'filterModel' => $searchModel,
+        'layout' => "{items}\n{pager}",
+        'columns' => [
+            [
+                'attribute' => 'name',
+                'header' => Yii::t('user', 'Name'),
+                'options' => [
+                    'style' => 'width: 20%'
+                ],
+            ],
+            [
+                'attribute' => 'description',
+                'header' => Yii::t('user', 'Description'),
+                'options' => [
+                    'style' => 'width: 55%'
+                ],
+            ],
+            [
+                'attribute' => 'rule_name',
+                'header' => Yii::t('user', 'Rule name'),
+                'options' => [
+                    'style' => 'width: 20%'
+                ],
+            ],
+            [
+                'class' => ActionColumn::className(),
+                'template' => '{update} {delete}',
+                'urlCreator' => function ($action, $model) {
+                    return Url::to(['/user/role/' . $action, 'name' => $model['name']]);
+                },
+                'options' => [
+                    'style' => 'width: 5%'
+                ],
+            ]
+        ],
+    ]
+) ?>
+
+<?php $this->endContent() ?>

lib/User/resources/views/role/update.php

@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * @var $model \Da\User\Model\Role
+ * @var $this  yii\web\View
+ * @var $unassignedItems string[]
+ */
+
+$this->title = Yii::t('user', 'Update role');
+$this->params['breadcrumbs'][] = $this->title;
+
+?>
+
+<?php $this->beginContent('@Da/User/resources/views/shared/admin_layout.php') ?>
+
+<?= $this->render(
+    '_form',
+    [
+        'model' => $model,
+        'unassignedItems' => $unassignedItems
+    ]
+) ?>
+
+<?php $this->endContent() ?>

lib/User/resources/views/settings/account.php

@@ -12,6 +12,7 @@ use yii\widgets\ActiveForm;
 $this->title = Yii::t('user', 'Account settings');
 $this->params['breadcrumbs'][] = $this->title;
 ?>
+<div class="clearfix"></div>
 
 <?= $this->render('/shared/_alert', ['module' => Yii::$app->getModule('user')]) ?>
 

lib/User/resources/views/settings/networks.php

@@ -13,6 +13,8 @@ $this->title = Yii::t('user', 'Networks');
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 
+<div class="clearfix"></div>
+
 <?= $this->render('/shared/_alert', ['module' => Yii::$app->getModule('user')]) ?>
 
 <div class="row">
@@ -28,12 +30,14 @@ $this->params['breadcrumbs'][] = $this->title;
                 <div class="alert alert-info">
                     <p><?= Yii::t('user', 'You can connect multiple accounts to be able to log in using them') ?>.</p>
                 </div>
-                <?php $auth = ConnectWidget::begin([
+                <?php $auth = ConnectWidget::begin(
+                    [
                         'baseAuthUrl' => ['/user/security/auth'],
                         'accounts' => $user->socialNetworkAccounts,
                         'autoRender' => false,
                         'popupMode' => false,
-                ]) ?>
+                    ]
+                ) ?>
                 <table class="table">
                     <?php foreach ($auth->getClients() as $client): ?>
                         <tr>
@@ -45,13 +49,21 @@ $this->params['breadcrumbs'][] = $this->title;
                             </td>
                             <td style="width: 120px">
                                 <?= $auth->isConnected($client) ?
-                                    Html::a(Yii::t('user', 'Disconnect'), $auth->createClientUrl($client), [
+                                    Html::a(
+                                        Yii::t('user', 'Disconnect'),
+                                        $auth->createClientUrl($client),
+                                        [
                                             'class' => 'btn btn-danger btn-block',
                                             'data-method' => 'post',
-                                    ]) :
+                                        ]
-                                    Html::a(Yii::t('user', 'Connect'), $auth->createClientUrl($client), [
+                                    ) :
+                                    Html::a(
+                                        Yii::t('user', 'Connect'),
+                                        $auth->createClientUrl($client),
+                                        [
                                             'class' => 'btn btn-success btn-block',
-                                    ])
+                                        ]
+                                    )
                                 ?>
                             </td>
                         </tr>

lib/User/resources/views/settings/profile.php

@@ -1,26 +1,24 @@
 <?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;
+use yii\helpers\ArrayHelper;
+use Da\User\Helper\TimezoneHelper;
 
 /**
  * @var yii\web\View $this
  * @var yii\widgets\ActiveForm $form
- * @var dektrium\user\models\Profile $profile
+ * @var \Da\User\Model\Profile $model
+ * @var TimezoneHelper $timezoneHelper
  */
 
 $this->title = Yii::t('user', 'Profile settings');
 $this->params['breadcrumbs'][] = $this->title;
+$timezoneHelper = $model->make(TimezoneHelper::class);
 ?>
 
+<div class="clearfix"></div>
+
 <?= $this->render('/shared/_alert', ['module' => Yii::$app->getModule('user')]) ?>
 
 <div class="row">
@@ -33,8 +31,9 @@ $this->params['breadcrumbs'][] = $this->title;
                 <?= Html::encode($this->title) ?>
             </div>
             <div class="panel-body">
-                <?php $form = \yii\widgets\ActiveForm::begin([
+                <?php $form = ActiveForm::begin(
-                    'id' => 'profile-form',
+                    [
+                        'id' => $model->formName(),
                         '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>",
@@ -43,7 +42,8 @@ $this->params['breadcrumbs'][] = $this->title;
                         'enableAjaxValidation' => true,
                         'enableClientValidation' => false,
                         'validateOnBlur' => false,
-                ]); ?>
+                    ]
+                ); ?>
 
                 <?= $form->field($model, 'name') ?>
 
@@ -55,18 +55,12 @@ $this->params['breadcrumbs'][] = $this->title;
 
                 <?= $form
                     ->field($model, 'timezone')
-                    ->dropDownList(
+                    ->dropDownList(ArrayHelper::map($timezoneHelper->getAll(),'timezone','name'));
-                        \yii\helpers\ArrayHelper::map(
+                ?>
-                            \dektrium\user\helpers\Timezone::getAll(),
-                            'timezone',
-                            'name'
-                        )
-                    ); ?>
-
                 <?= $form
                     ->field($model, 'gravatar_email')
                     ->hint(
-                        \yii\helpers\Html::a(
+                        Html::a(
                             Yii::t('user', 'Change your avatar at Gravatar.com'),
                             'http://gravatar.com'
                         )
@@ -76,14 +70,12 @@ $this->params['breadcrumbs'][] = $this->title;
 
                 <div class="form-group">
                     <div class="col-lg-offset-3 col-lg-9">
-                        <?= \yii\helpers\Html::submitButton(
+                        <?= Html::submitButton(Yii::t('user', 'Save'), ['class' => 'btn btn-block btn-success']) ?>
-                            Yii::t('user', 'Save'),
+                        <br>
-                            ['class' => 'btn btn-block btn-success']
-                        ) ?><br>
                     </div>
                 </div>
 
-                <?php \yii\widgets\ActiveForm::end(); ?>
+                <?php ActiveForm::end(); ?>
             </div>
         </div>
     </div>

lib/User/resources/views/shared/_menu.php

@@ -17,11 +17,11 @@ use yii\bootstrap\Nav;
             ],
             [
                 'label' => Yii::t('user', 'Roles'),
-                'url' => ['/rbac/role/index']
+                'url' => ['/user/role/index']
             ],
             [
                 'label' => Yii::t('user', 'Permissions'),
-                'url' => ['/rbac/permission/index']
+                'url' => ['/user/permission/index']
             ],
             [
                 'label' => Yii::t('user', 'Create'),
@@ -32,11 +32,11 @@ use yii\bootstrap\Nav;
                     ],
                     [
                         'label' => Yii::t('user', 'New role'),
-                        'url' => ['/rbac/role/create']
+                        'url' => ['/user/role/create']
                     ],
                     [
                         'label' => Yii::t('user', 'New permission'),
-                        'url' => ['/rbac/permission/create']
+                        'url' => ['/user/permission/create']
                     ],
                 ],
             ],

lib/User/resources/views/shared/admin_layout.php

@@ -0,0 +1,25 @@
+<?php
+
+use yii\helpers\Html;
+
+?>
+<div class="clearfix"></div>
+<?= $this->render(
+    '/shared/_alert',
+    [
+        'module' => Yii::$app->getModule('user'),
+    ]
+) ?>
+<div class="row">
+    <div class="col-md-12">
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <h3 class="panel-title"><?= Html::encode($this->title) ?></h3>
+            </div>
+            <div class="panel-body">
+                <?= $this->render('_menu') ?>
+                <?= $content ?>
+            </div>
+        </div>
+    </div>
+</div>

lib/User/resources/views/widgets/assignments/form.php

@@ -1,22 +1,13 @@
 <?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 dektrium\rbac\models\Assignment;
 use kartik\select2\Select2;
 use yii\bootstrap\Alert;
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 
 /**
- * @var $model Assignment
+ * @var $model \Da\User\Model\Assignment
+ * @var $availableItems string[]
  */
 
 ?>
@@ -27,7 +18,7 @@ use yii\widgets\ActiveForm;
     'options' => [
         'class' => 'alert-success'
     ],
-    'body' => Yii::t('rbac', 'Assignments have been updated'),
+    'body' => Yii::t('user', 'Assignments have been updated'),
 ]) ?>
 
 <?php endif ?>
@@ -40,14 +31,14 @@ use yii\widgets\ActiveForm;
 <?= Html::activeHiddenInput($model, 'user_id') ?>
 
 <?= $form->field($model, 'items')->widget(Select2::className(), [
-    'data' => $model->getAvailableItems(),
+    'data' => $availableItems,
     'options' => [
         'id' => 'items',
         'multiple' => true
     ],
 ]) ?>
 
-<?= Html::submitButton(Yii::t('rbac', 'Update assignments'), ['class' => 'btn btn-success btn-block']) ?>
+<?= Html::submitButton(Yii::t('user', 'Update assignments'), ['class' => 'btn btn-success btn-block']) ?>
 
 <?php ActiveForm::end() ?>