Merge remote-tracking branch 'folks/bugs' into MAGETWO-37728-lost-option-in-generator

Author: Olga Kopylova

app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js

@@ -110,6 +110,9 @@ define(
                 this.source.set('params.invalid', false);
                 fields.trigger('change');
                 this.source.trigger('billingAddress.data.validate');
+                if (!customer.isLoggedIn()()) {
+                    this.source.trigger('customerDetails.data.validate');
+                }
                 this.validateAdditionalAddressFields();
             },
             validateAdditionalAddressFields: function() {

app/code/Magento/Customer/Block/CustomerData.php

@@ -18,4 +18,15 @@ public function getCookieLifeTime()
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
+
+    /**
+     * Get url for customer data ajax requests. Returns url with protocol matching used to request page.
+     *
+     * @param string $route
+     * @return string Customer data url.
+     */
+    public function getCustomerDataUrl($route)
+    {
+        return $this->getUrl($route, ['_secure' => $this->getRequest()->isSecure()]);
+    }
 }

app/code/Magento/Customer/etc/frontend/di.xml

@@ -11,6 +11,9 @@
             <argument name="secureUrlList" xsi:type="array">
                 <item name="customer" xsi:type="string">/customer/</item>
             </argument>
+            <argument name="excludedUrlList" xsi:type="array">
+                <item name="customer_sections" xsi:type="string">/customer/section/load</item>
+            </argument>
         </arguments>
     </type>
     <type name="Magento\Framework\View\Layout">

app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml

@@ -11,7 +11,7 @@
 <?php
     echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode([
         '*' => ['Magento_Customer/js/customer-data' => [
-            'sectionLoadUrl' => $block->getUrl('customer/section/load'),
+            'sectionLoadUrl' => $block->getCustomerDataUrl('customer/section/load'),
             'cookieLifeTime' => $block->getCookieLifeTime(),
         ]],
     ]);

lib/internal/Magento/Framework/Url/SecurityInfo.php

@@ -16,6 +16,11 @@ class SecurityInfo implements \Magento\Framework\Url\SecurityInfoInterface
      */
     protected $secureUrlsList = [];
 
+    /**
+     * List of patterns excluded form secure url list
+     */
+    protected $excludedUrlsList = [];
+
     /**
      * List of already checked urls
      *
@@ -25,10 +30,12 @@ class SecurityInfo implements \Magento\Framework\Url\SecurityInfoInterface
 
     /**
      * @param string[] $secureUrlList
+     * @param string[] $excludedUrlList
      */
-    public function __construct($secureUrlList = [])
+    public function __construct($secureUrlList = [], $excludedUrlList = [])
     {
         $this->secureUrlsList = $secureUrlList;
+        $this->excludedUrlsList = $excludedUrlList;
     }
 
     /**
@@ -41,6 +48,11 @@ public function isSecure($url)
     {
         if (!isset($this->secureUrlsCache[$url])) {
             $this->secureUrlsCache[$url] = false;
+            foreach ($this->excludedUrlsList as $match) {
+                if (strpos($url, (string)$match) === 0) {
+                    return $this->secureUrlsCache[$url];
+                }
+            }
             foreach ($this->secureUrlsList as $match) {
                 if (strpos($url, (string)$match) === 0) {
                     $this->secureUrlsCache[$url] = true;

lib/internal/Magento/Framework/Url/Test/Unit/SecurityInfoTest.php

@@ -19,7 +19,7 @@ class SecurityInfoTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->_model = new \Magento\Framework\Url\SecurityInfo(['/account', '/cart']);
+        $this->_model = new \Magento\Framework\Url\SecurityInfo(['/account', '/cart'], ['/cart/remove', 'customer']);
     }
 
     /**
@@ -39,7 +39,9 @@ public function secureUrlDataProvider()
             ['/product', false],
             ['/product/12312', false],
             ['/cart', true],
-            ['/cart/add', true]
+            ['/cart/add', true],
+            ['/cart/remove', false],
+            ['/customer', false]
         ];
     }
 }