Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into MAGETWO-49453

Author: YevSent

app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php

@@ -9,9 +9,27 @@
 use Magento\Framework\Exception\AuthenticationException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\State\UserLockedException;
 
 class Save extends \Magento\Backend\Controller\Adminhtml\System\Account
 {
+    /**
+     * @var \Magento\Security\Helper\SecurityCookie
+     */
+    protected $securityCookieHelper;
+
+    /**
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Security\Helper\SecurityCookie $securityCookieHelper
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Security\Helper\SecurityCookie $securityCookieHelper
+    ) {
+        parent::__construct($context);
+        $this->securityCookieHelper = $securityCookieHelper;
+    }
+
     /**
      * Saving edited user information
      *
@@ -43,21 +61,22 @@ public function execute()
         /** Before updating admin user data, ensure that password of current admin user is entered and is correct */
         $currentUserPasswordField = \Magento\User\Block\User\Edit\Tab\Main::CURRENT_USER_PASSWORD_FIELD;
         $currentUserPassword = $this->getRequest()->getParam($currentUserPasswordField);
-        $isCurrentUserPasswordValid = !empty($currentUserPassword) && is_string($currentUserPassword);
         try {
-            if (!($isCurrentUserPasswordValid && $user->verifyIdentity($currentUserPassword))) {
-                throw new AuthenticationException(__('You have entered an invalid password for current user.'));
-            }
+            $user->performIdentityCheck($currentUserPassword);
             if ($password !== '') {
                 $user->setPassword($password);
                 $user->setPasswordConfirmation($passwordConfirmation);
             }
             $user->save();
-            /** Send password reset email notification only when password was changed */
-            if ($password !== '') {
-                $user->sendPasswordResetNotificationEmail();
-            }
+
+            $user->sendNotificationEmailsIfRequired();
+
             $this->messageManager->addSuccess(__('You saved the account.'));
+        } catch (UserLockedException $e) {
+            $this->_auth->logout();
+            $this->securityCookieHelper->setLogoutReasonCookie(
+                \Magento\Security\Model\AdminSessionsManager::LOGOUT_REASON_USER_LOCKED
+            );
         } catch (ValidatorException $e) {
             $this->messageManager->addMessages($e->getMessages());
             if ($e->getMessage()) {

app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php

@@ -42,6 +42,9 @@ class SaveTest extends \PHPUnit_Framework_TestCase
     /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\TranslateInterface */
     protected $_translatorMock;
 
+    /** @var \PHPUnit_Framework_MockObject_MockObject |\Magento\Framework\Event\ManagerInterface */
+    protected $eventManagerMock;
+
     protected function setUp()
     {
         $this->_requestMock = $this->getMockBuilder('Magento\Framework\App\Request\Http')
@@ -76,7 +79,7 @@ protected function setUp()
         $this->_userMock = $this->getMockBuilder('Magento\User\Model\User')
             ->disableOriginalConstructor()
             ->setMethods(
-                ['load', 'save', 'sendPasswordResetNotificationEmail', 'verifyIdentity', '__sleep', '__wakeup']
+                ['load', 'save', 'sendNotificationEmailsIfRequired', 'performIdentityCheck', '__sleep', '__wakeup']
             )
             ->getMock();
 
@@ -190,10 +193,9 @@ public function testSaveAction()
         );
 
         $this->_userMock->setUserId($userId);
-
+        $this->_userMock->expects($this->once())->method('performIdentityCheck')->will($this->returnValue(true));
         $this->_userMock->expects($this->once())->method('save');
-        $this->_userMock->expects($this->once())->method('verifyIdentity')->will($this->returnValue(true));
-        $this->_userMock->expects($this->once())->method('sendPasswordResetNotificationEmail');
+        $this->_userMock->expects($this->once())->method('sendNotificationEmailsIfRequired');
 
         $this->_requestMock->setParams($requestParams);
 

app/code/Magento/Backend/composer.json

@@ -13,6 +13,7 @@
         "magento/module-quote": "100.0.*",
         "magento/module-catalog": "100.0.*",
         "magento/module-user": "100.0.*",
+        "magento/module-security": "100.0.*",
         "magento/module-backup": "100.0.*",
         "magento/module-customer": "100.0.*",
         "magento/module-translation": "100.0.*",

app/code/Magento/Backend/etc/adminhtml/system.xml

@@ -368,12 +368,6 @@
                     <label>Forgot and Reset Email Sender</label>
                     <source_model>Magento\Config\Model\Config\Source\Email\Identity</source_model>
                 </field>
-                <field id="password_reset_link_expiration_period" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0">
-                    <label>Recovery Link Expiration Period (days)</label>
-                    <comment>Please enter a number 1 or greater in this field.</comment>
-                    <validate>required-entry integer validate-greater-than-zero</validate>
-                    <backend_model>Magento\Config\Model\Config\Backend\Admin\Password\Link\Expirationperiod</backend_model>
-                </field>
             </group>
             <group id="startup" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
                 <label>Startup Page</label>
@@ -414,6 +408,12 @@
             </group>
             <group id="security" translate="label" type="text" sortOrder="35" showInDefault="1" showInWebsite="0" showInStore="0">
                 <label>Security</label>
+                <field id="password_reset_link_expiration_period" translate="label comment" type="text" sortOrder="7" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Recovery Link Expiration Period (hours)</label>
+                    <comment>Please enter a number 1 or greater in this field.</comment>
+                    <validate>required-entry integer validate-greater-than-zero</validate>
+                    <backend_model>Magento\Config\Model\Config\Backend\Admin\Password\Link\Expirationperiod</backend_model>
+                </field>
                 <field id="use_form_key" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Add Secret Key to URLs</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>

app/code/Magento/BraintreeTwo/Test/Unit/Gateway/Http/Client/TransactionSubmitForSettlementTest.php

@@ -69,7 +69,7 @@ public function testPlaceRequestWithException()
     }
 
     /**
-     * @covers \Magento\BraintreeTwo\Gateway\Http\Client\TransactionSubmitForSettlement::placeRequest
+     * @covers \Magento\BraintreeTwo\Gateway\Http\Client\TransactionSubmitForSettlement::process
      */
     public function testPlaceRequest()
     {

app/code/Magento/BraintreeTwo/view/adminhtml/layout/braintreetwo_report_index.xml

@@ -7,6 +7,13 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
+        <referenceContainer name="page.main.actions">
+            <block class="Magento\Backend\Block\Template" name="adminhtml.report.grid.braintreetwo.tooltip" template="Magento_BraintreeTwo::grid/tooltip.phtml">
+                <arguments>
+                    <argument name="tooltip_content" xsi:type="string" translate="true">Apply filters in order to get results. Only first 100 records will be displayed in the grid, you will be able to download full version of the report in .csv format.</argument>
+                </arguments>
+            </block>
+        </referenceContainer>
         <referenceContainer name="content">
             <uiComponent name="braintreetwo_report"/>
         </referenceContainer>

app/code/Magento/BraintreeTwo/view/adminhtml/templates/form/vault.phtml

@@ -23,7 +23,7 @@ $id = $block->escapeHtml($block->getData('id'));
         <img src="<?php echo $block->escapeUrl($icon['url']); ?>"
              width="<?php echo $block->escapeHtml($icon['width']); ?>"
              height="<?php echo $block->escapeHtml($icon['height']); ?>"
-            >
+             class="payment-icon" >
         <span><?php echo $block->escapeHtml(__('ending'));?></span>
         <span><?php echo $block->escapeHtml($details['maskedCC']); ?></span>
         (<span><?php echo $block->escapeHtml(__('expires'));?></span>:

app/code/Magento/BraintreeTwo/view/adminhtml/templates/grid/tooltip.phtml

@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @var \Magento\Backend\Block\Template $block
+ */
+echo $block->escapeHtml($block->getData('tooltip_content'));

app/code/Magento/BraintreeTwo/view/frontend/web/js/view/payment/method-renderer/hosted-fields.js

@@ -112,11 +112,12 @@ define([
                     self.selectedCardType(null);
                 }
 
-                if (!event.isValid) {
-                    return false;
-                }
-
-                if (event.card) {
+                if (event.target.fieldKey === 'number' && event.card) {
+                    if (event.isValid) {
+                        self.cardNumber = event.card;
+                    } else {
+                        self.cardNumber = null;
+                    }
                     self.selectedCardType(
                         validator.getMageCardType(event.card.type, self.getCcAvailableTypes())
                     );

app/code/Magento/BraintreeTwo/view/frontend/web/js/view/payment/method-renderer/paypal.js

@@ -9,8 +9,9 @@ define([
     'underscore',
     'Magento_Checkout/js/view/payment/default',
     'Magento_BraintreeTwo/js/view/payment/adapter',
-    'Magento_Checkout/js/model/quote'
-], function ($, _, Component, Braintree, quote) {
+    'Magento_Checkout/js/model/quote',
+    'Magento_Checkout/js/model/full-screen-loader'
+], function ($, _, Component, Braintree, quote, fullScreenLoader) {
     'use strict';
 
     var checkout;
@@ -35,6 +36,7 @@ define([
                  */
                 onReady: function (integration) {
                     checkout = integration;
+                    this.enableButton();
                 },
 
                 /**
@@ -160,6 +162,7 @@ define([
             checkout.teardown(function () {
                 checkout = null;
             });
+            this.disableButton();
             this.clientConfig.paypal.amount = this.grandTotalAmount;
 
             Braintree.setConfig(this.clientConfig);
@@ -267,6 +270,22 @@ define([
         getPaymentAcceptanceMarkSrc: function () {
 
             return window.checkoutConfig.payment[this.getCode()].paymentAcceptanceMarkSrc;
+        },
+
+        /**
+         * Disable submit button
+         */
+        disableButton: function () {
+            fullScreenLoader.startLoader();
+            $('[data-button="place"]').attr('disabled', 'disabled');
+        },
+
+        /**
+         * Enable submit button
+         */
+        enableButton: function () {
+            $('[data-button="place"]').removeAttr('disabled');
+            fullScreenLoader.stopLoader();
         }
     });
 });