Merge branch 'MC-17502' of https://github.com/magento-mpi/magento2ce into MPI_PR_2019_06_21

Author: ArtemVasyliev

lib/web/mage/common.js

@@ -18,10 +18,21 @@ define([
         'form',
         function (e) {
             var formKeyElement,
+                existingFormKeyElement,
+                isKeyPresentInForm,
                 form = $(e.target),
                 formKey = $('input[name="form_key"]').val();
 
-            if (formKey && !form.find('input[name="form_key"]').length && form[0].method !== 'get') {
+            existingFormKeyElement = form.find('input[name="form_key"]');
+            isKeyPresentInForm = existingFormKeyElement.length;
+
+            /* Verifies that existing auto-added form key is a direct form child element,
+               protection from a case when one form contains another form. */
+            if (isKeyPresentInForm && existingFormKeyElement.attr('auto-added-form-key') === '1') {
+                isKeyPresentInForm = form.find('> input[name="form_key"]').length;
+            }
+
+            if (formKey && !isKeyPresentInForm && form[0].method !== 'get') {
                 formKeyElement = document.createElement('input');
                 formKeyElement.setAttribute('type', 'hidden');
                 formKeyElement.setAttribute('name', 'form_key');