Merge branch 'MAGETWO-71639' into 'SPRINT-41'

MAGETWO-71639: Parent ID is hardcoded as "1" in the \Magento\Setup\Fixtures\AdminUsersFixture

See merge request !277

Author: kalashnikau-uladzimir

setup/src/Magento/Setup/Fixtures/AdminUsersFixture.php

@@ -6,6 +6,14 @@
 
 namespace Magento\Setup\Fixtures;
 
+use Magento\Authorization\Model\Acl\Role\Group;
+use Magento\Authorization\Model\RoleFactory;
+use Magento\Authorization\Model\RulesFactory;
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\Framework\Acl\RootResource;
+use Magento\User\Model\ResourceModel\User\CollectionFactory as UserCollectionFactory;
+use Magento\User\Model\UserFactory;
+
 /**
  * Generate admin users
  *
@@ -21,36 +29,52 @@ class AdminUsersFixture extends Fixture
     protected $priority = 5;
 
     /**
-     * @var \Magento\User\Model\UserFactory
+     * @var UserFactory
      */
     private $userFactory;
 
     /**
-     * @var \Magento\Authorization\Model\RoleFactory
+     * @var RoleFactory
      */
     private $roleFactory;
 
     /**
-     * @var \Magento\User\Model\ResourceModel\User\CollectionFactory
+     * @var UserCollectionFactory
      */
     private $userCollectionFactory;
 
     /**
-     * @param \Magento\User\Model\UserFactory $userFactory
-     * @param \Magento\User\Model\ResourceModel\User\CollectionFactory $userCollectionFactory
-     * @param \Magento\Authorization\Model\RoleFactory $roleFactory
+     * @var RulesFactory
+     */
+    private $rulesFactory;
+
+    /**
+     * @var RootResource
+     */
+    private $rootResource;
+
+    /**
      * @param FixtureModel $fixtureModel
+     * @param UserFactory $userFactory
+     * @param UserCollectionFactory $userCollectionFactory
+     * @param RoleFactory $roleFactory
+     * @param RulesFactory $rulesFactory
+     * @param RootResource $rootResource
      */
     public function __construct(
-        \Magento\User\Model\UserFactory $userFactory,
-        \Magento\User\Model\ResourceModel\User\CollectionFactory $userCollectionFactory,
-        \Magento\Authorization\Model\RoleFactory $roleFactory,
-        FixtureModel $fixtureModel
+        FixtureModel $fixtureModel,
+        UserFactory $userFactory,
+        UserCollectionFactory $userCollectionFactory,
+        RoleFactory $roleFactory,
+        RulesFactory $rulesFactory,
+        RootResource $rootResource
     ) {
         parent::__construct($fixtureModel);
         $this->userFactory = $userFactory;
         $this->roleFactory = $roleFactory;
         $this->userCollectionFactory = $userCollectionFactory;
+        $this->rulesFactory = $rulesFactory;
+        $this->rootResource = $rootResource;
     }
 
     /**
@@ -65,30 +89,18 @@ public function execute()
             return;
         }
 
-        $defaultAdminUser = $this->userFactory->create()->loadByUsername('admin');
-        $defaultAdminRole = $this->roleFactory->create()->load($defaultAdminUser->getAclRole());
+        $role = $this->createAdministratorRole();
 
         for ($i = $adminUsersStartIndex; $i <= $adminUsersNumber; $i++) {
             $adminUser = $this->userFactory->create();
-            $adminUser
+            $adminUser->setRoleId($role->getId())
                 ->setEmail('admin' . $i . '@example.com')
                 ->setFirstName('Firstname')
                 ->setLastName('Lastname')
                 ->setUserName('admin' . $i)
                 ->setPassword('123123q')
                 ->setIsActive(1);
             $adminUser->save();
-
-            $role = $this->roleFactory->create();
-            $role
-                ->setUserId($adminUser->getId())
-                ->setRoleName('admin')
-                ->setRoleType($defaultAdminRole->getRoleType())
-                ->setUserType($defaultAdminRole->getUserType())
-                ->setTreeLevel($defaultAdminRole->getTreeLevel())
-                ->setSortOrder($defaultAdminRole->getSortOrder())
-                ->setParentId(1);
-            $role->save();
         }
     }
 
@@ -109,4 +121,32 @@ public function introduceParamLabels()
             'admin_users' => 'Admin Users'
         ];
     }
+
+    /**
+     * Create administrator role with all privileges.
+     *
+     * @return \Magento\Authorization\Model\Role
+     */
+    private function createAdministratorRole()
+    {
+        $role = $this->roleFactory->create();
+        $role->setParentId(0)
+            ->setTreeLevel(1)
+            ->setSortOrder(1)
+            ->setRoleType(Group::ROLE_TYPE)
+            ->setUserId(0)
+            ->setUserType(UserContextInterface::USER_TYPE_ADMIN)
+            ->setRoleName('Example Administrator');
+        $role->save();
+
+        /** @var \Magento\Authorization\Model\Rules $rule */
+        $rule = $this->rulesFactory->create();
+        $rule->setRoleId($role->getId())
+            ->setResourceId($this->rootResource->getId())
+            ->setPrivilegies(null)
+            ->setPermission('allow');
+        $rule->save();
+
+        return $role;
+    }
 }