Merge remote-tracking branch 'mainline/develop' into develop

Author: vpelipenko

app/code/Magento/Customer/Model/Customer/Attribute/Source/Website.php

@@ -38,7 +38,7 @@ public function __construct(
     public function getAllOptions()
     {
         if (!$this->_options) {
-            $this->_options = $this->_store->getWebsiteValuesForForm(true, true);
+            $this->_options = $this->_store->getWebsiteValuesForForm(false, true);
         }
 
         return $this->_options;

app/code/Magento/Integration/Model/Oauth/Token/Factory.php

@@ -17,7 +17,7 @@ class Provider implements TokenProviderInterface
     protected $_consumerFactory;
 
     /**
-     * @var \Magento\Integration\Model\Oauth\Token\Factory
+     * @var \Magento\Integration\Model\Oauth\TokenFactory
      */
     protected $_tokenFactory;
 
@@ -31,30 +31,22 @@ class Provider implements TokenProviderInterface
      */
     protected $_date;
 
-    /**
-     * @var Token
-     */
-    protected $token;
-
     /**
      * @param \Magento\Integration\Model\Oauth\Consumer\Factory $consumerFactory
-     * @param \Magento\Integration\Model\Oauth\Token\Factory $tokenFactory
+     * @param \Magento\Integration\Model\Oauth\TokenFactory $tokenFactory
      * @param \Magento\Integration\Helper\Oauth\Data $dataHelper
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
-     * @param Token $token
      */
     public function __construct(
         \Magento\Integration\Model\Oauth\Consumer\Factory $consumerFactory,
-        \Magento\Integration\Model\Oauth\Token\Factory $tokenFactory,
+        \Magento\Integration\Model\Oauth\TokenFactory $tokenFactory,
         \Magento\Integration\Helper\Oauth\Data $dataHelper,
-        \Magento\Framework\Stdlib\DateTime\DateTime $date,
-        Token $token
+        \Magento\Framework\Stdlib\DateTime\DateTime $date
     ) {
         $this->_consumerFactory = $consumerFactory;
         $this->_tokenFactory = $tokenFactory;
         $this->_dataHelper = $dataHelper;
         $this->_date = $date;
-        $this->token = $token;
     }
 
     /**
@@ -293,7 +285,9 @@ protected function _getToken($token)
      */
     public function getIntegrationTokenByConsumerId($consumerId)
     {
-        $token = $this->token->loadByConsumerIdAndUserType($consumerId, UserContextInterface::USER_TYPE_INTEGRATION);
+        /** @var \Magento\Integration\Model\Oauth\Token $token */
+        $token = $this->_tokenFactory->create();
+        $token->loadByConsumerIdAndUserType($consumerId, UserContextInterface::USER_TYPE_INTEGRATION);
 
         if (!$token->getId()) {
             throw new \Magento\Framework\Oauth\Exception(

app/code/Magento/Integration/Model/Oauth/Token/Provider.php

@@ -9,7 +9,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Integration\Helper\Validator;
 use Magento\Integration\Model\Oauth\Token as Token;
-use Magento\Integration\Model\Oauth\Token\Factory as TokenModelFactory;
+use Magento\Integration\Model\Oauth\TokenFactory as TokenModelFactory;
 use Magento\Integration\Model\Resource\Oauth\Token\CollectionFactory as TokenCollectionFactory;
 use Magento\User\Model\User as UserModel;
 

app/code/Magento/Integration/Service/V1/AdminTokenService.php

@@ -9,7 +9,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Integration\Helper\Validator;
 use Magento\Integration\Model\Oauth\Token as Token;
-use Magento\Integration\Model\Oauth\Token\Factory as TokenModelFactory;
+use Magento\Integration\Model\Oauth\TokenFactory as TokenModelFactory;
 use Magento\Integration\Model\Resource\Oauth\Token\CollectionFactory as TokenCollectionFactory;
 
 class CustomerTokenService implements CustomerTokenServiceInterface

app/code/Magento/Integration/Service/V1/CustomerTokenService.php

@@ -9,7 +9,7 @@
 use Magento\Integration\Model\Oauth\Consumer as ConsumerModel;
 use Magento\Integration\Model\Oauth\Consumer\Factory as ConsumerFactory;
 use Magento\Integration\Model\Oauth\Token as OauthTokenModel;
-use Magento\Integration\Model\Oauth\Token\Factory as TokenFactory;
+use Magento\Integration\Model\Oauth\TokenFactory as TokenFactory;
 use Magento\Integration\Model\Oauth\Token\Provider as TokenProvider;
 
 /**

app/code/Magento/Integration/Service/V1/Oauth.php

@@ -39,7 +39,7 @@ public function execute()
         if ($section) {
             try {
                 $path = 'tax/notification/ignore_' . $section;
-                $this->_objectManager->get('\Magento\Core\Model\Resource\Config')
+                $this->_objectManager->get('Magento\Core\Model\Resource\Config')
                     ->saveConfig($path, 1, \Magento\Framework\App\ScopeInterface::SCOPE_DEFAULT, 0);
             } catch (\Exception $e) {
                 $this->messageManager->addError($e->getMessage());

app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php

@@ -18,7 +18,7 @@ public function execute()
     {
         if ($userId = $this->getRequest()->getParam('user_id')) {
             /** @var \Magento\Integration\Service\V1\AdminTokenService $tokenService */
-            $tokenService = $this->_objectManager->get('\Magento\Integration\Service\V1\AdminTokenService');
+            $tokenService = $this->_objectManager->get('Magento\Integration\Service\V1\AdminTokenService');
             try {
                 $tokenService->revokeAdminAccessToken($userId);
                 $this->messageManager->addSuccess(__('You have revoked the user\'s tokens.'));

app/code/Magento/User/Controller/Adminhtml/User/InvalidateToken.php

@@ -43,28 +43,36 @@ class Role extends \Magento\Backend\App\AbstractAction
      */
     protected $_authSession;
 
+    /**
+     * @var \Magento\Framework\Filter\FilterManager
+     */
+    protected $_filterManager;
+
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Authorization\Model\RoleFactory $roleFactory
      * @param \Magento\User\Model\UserFactory $userFactory
      * @param \Magento\Authorization\Model\RulesFactory $rulesFactory
      * @param \Magento\Backend\Model\Auth\Session $authSession
+     * @param \Magento\Framework\Filter\FilterManager $filterManager
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Framework\Registry $coreRegistry,
         \Magento\Authorization\Model\RoleFactory $roleFactory,
         \Magento\User\Model\UserFactory $userFactory,
         \Magento\Authorization\Model\RulesFactory $rulesFactory,
-        \Magento\Backend\Model\Auth\Session $authSession
+        \Magento\Backend\Model\Auth\Session $authSession,
+        \Magento\Framework\Filter\FilterManager $filterManager
     ) {
         parent::__construct($context);
         $this->_coreRegistry = $coreRegistry;
         $this->_roleFactory = $roleFactory;
         $this->_userFactory = $userFactory;
         $this->_rulesFactory = $rulesFactory;
         $this->_authSession = $authSession;
+        $this->_filterManager = $filterManager;
     }
 
     /**

app/code/Magento/User/Controller/Adminhtml/User/Role.php

@@ -78,7 +78,7 @@ public function execute()
         }
 
         try {
-            $roleName = $this->getRequest()->getParam('rolename', false);
+            $roleName = $this->_filterManager->removeTags($this->getRequest()->getParam('rolename', false));
 
             $role->setName($roleName)
                 ->setPid($this->getRequest()->getParam('parent_id', false))