Merge remote-tracking branch 'af/MC-13855' into MC-13852

Author: rganin

app/code/Magento/Customer/Api/AccountManagementInterface.php

@@ -31,15 +31,13 @@ interface AccountManagementInterface
      * @param \Magento\Customer\Api\Data\CustomerInterface $customer
      * @param string $password
      * @param string $redirectUrl
-     * @param string[] $extensions
      * @return \Magento\Customer\Api\Data\CustomerInterface
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function createAccount(
         \Magento\Customer\Api\Data\CustomerInterface $customer,
         $password = null,
-        $redirectUrl = '',
-        $extensions = []
+        $redirectUrl = ''
     );
 
     /**
@@ -50,7 +48,6 @@ public function createAccount(
      * @param string $hash Password hash that we can save directly
      * @param string $redirectUrl URL fed to welcome email templates. Can be used by templates to, for example, direct
      *                            the customer to a product they were looking at after pressing confirmation link.
-     * @param string[] $extensions
      * @return \Magento\Customer\Api\Data\CustomerInterface
      * @throws \Magento\Framework\Exception\InputException If bad input is provided
      * @throws \Magento\Framework\Exception\State\InputMismatchException If the provided email is already used
@@ -59,8 +56,7 @@ public function createAccount(
     public function createAccountWithPasswordHash(
         \Magento\Customer\Api\Data\CustomerInterface $customer,
         $hash,
-        $redirectUrl = '',
-        $extensions = []
+        $redirectUrl = ''
     );
 
     /**

app/code/Magento/Customer/Model/AccountManagement.php

@@ -815,7 +815,7 @@ public function getConfirmationStatus($customerId)
     /**
      * @inheritdoc
      */
-    public function createAccount(CustomerInterface $customer, $password = null, $redirectUrl = '', $extensions = [])
+    public function createAccount(CustomerInterface $customer, $password = null, $redirectUrl = '')
     {
         if ($password !== null) {
             $this->checkPasswordStrength($password);
@@ -831,20 +831,16 @@ public function createAccount(CustomerInterface $customer, $password = null, $re
         } else {
             $hash = null;
         }
-        return $this->createAccountWithPasswordHash($customer, $hash, $redirectUrl, $extensions);
+        return $this->createAccountWithPasswordHash($customer, $hash, $redirectUrl);
     }
 
     /**
      * @inheritdoc
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    public function createAccountWithPasswordHash(
-        CustomerInterface $customer,
-        $hash,
-        $redirectUrl = '',
-        $extensions = []
-    ) {
+    public function createAccountWithPasswordHash(CustomerInterface $customer, $hash, $redirectUrl = '')
+    {
         // This logic allows an existing customer to be added to a different store.  No new account is created.
         // The plan is to move this logic into a new method called something like 'registerAccountWithStore'
         if ($customer->getId()) {
@@ -917,7 +913,7 @@ public function createAccountWithPasswordHash(
         $customer = $this->customerRepository->getById($customer->getId());
         $newLinkToken = $this->mathRandom->getUniqueHash();
         $this->changeResetPasswordLinkToken($customer, $newLinkToken);
-        $this->sendEmailConfirmation($customer, $redirectUrl, $extensions);
+        $this->sendEmailConfirmation($customer, $redirectUrl);
 
         return $customer;
     }
@@ -945,12 +941,11 @@ public function getDefaultShippingAddress($customerId)
      *
      * @param CustomerInterface $customer
      * @param string $redirectUrl
-     * @param array $extensions
      * @return void
      * @throws LocalizedException
      * @throws NoSuchEntityException
      */
-    protected function sendEmailConfirmation(CustomerInterface $customer, $redirectUrl, $extensions = [])
+    protected function sendEmailConfirmation(CustomerInterface $customer, $redirectUrl)
     {
         try {
             $hash = $this->customerRegistry->retrieveSecureData($customer->getId())->getPasswordHash();
@@ -960,14 +955,7 @@ protected function sendEmailConfirmation(CustomerInterface $customer, $redirectU
             } elseif ($hash == '') {
                 $templateType = self::NEW_ACCOUNT_EMAIL_REGISTERED_NO_PASSWORD;
             }
-            $this->getEmailNotification()->newAccount(
-                $customer,
-                $templateType,
-                $redirectUrl,
-                $customer->getStoreId(),
-                null,
-                $extensions
-            );
+            $this->getEmailNotification()->newAccount($customer, $templateType, $redirectUrl, $customer->getStoreId());
         } catch (MailException $e) {
             // If we are not able to send a new account email, this should be ignored
             $this->logger->critical($e);

app/code/Magento/Customer/Model/EmailNotification.php

@@ -17,7 +17,7 @@
 use Magento\Framework\Exception\LocalizedException;
 
 /**
- * Class for notification customer.
+ * Customer email notification
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -65,8 +65,6 @@ class EmailNotification implements EmailNotificationInterface
         self::NEW_ACCOUNT_EMAIL_CONFIRMATION => self::XML_PATH_CONFIRM_EMAIL_TEMPLATE,
     ];
 
-    const CUSTOMER_CONFIRM_URL = 'customer/account/confirm/';
-
     /**#@-*/
 
     /**#@-*/
@@ -366,7 +364,6 @@ public function passwordResetConfirmation(CustomerInterface $customer)
      * @param string $backUrl
      * @param string $storeId
      * @param string $sendemailStoreId
-     * @param array $extensions
      * @return void
      * @throws LocalizedException
      */
@@ -375,8 +372,7 @@ public function newAccount(
         $type = self::NEW_ACCOUNT_EMAIL_REGISTERED,
         $backUrl = '',
         $storeId = 0,
-        $sendemailStoreId = null,
-        $extensions = []
+        $sendemailStoreId = null
     ) {
         $types = self::TEMPLATE_TYPES;
 
@@ -394,26 +390,11 @@ public function newAccount(
 
         $customerEmailData = $this->getFullCustomerObject($customer);
 
-        $templateVars = [
-            'customer' => $customerEmailData,
-            'back_url' => $backUrl,
-            'store' => $store
-        ];
-        if ($type == self::NEW_ACCOUNT_EMAIL_CONFIRMATION) {
-            if (empty($extensions)) {
-                $templateVars['url'] = self::CUSTOMER_CONFIRM_URL;
-                $templateVars['extensions'] = $extensions;
-            } else {
-                $templateVars['url'] = $extensions['url'];
-                $templateVars['extensions'] = $extensions['extension_info'];
-            }
-        }
-
         $this->sendEmailTemplate(
             $customer,
             $types[$type],
             self::XML_PATH_REGISTER_EMAIL_IDENTITY,
-            $templateVars,
+            ['customer' => $customerEmailData, 'back_url' => $backUrl, 'store' => $store],
             $storeId
         );
     }

app/code/Magento/Customer/view/frontend/email/account_new_confirmation.html

@@ -9,9 +9,7 @@
 "var this.getUrl($store, 'customer/account/confirm/', [_query:[id:$customer.id, key:$customer.confirmation, back_url:$back_url]])":"Account Confirmation URL",
 "var this.getUrl($store, 'customer/account/')":"Customer Account URL",
 "var customer.email":"Customer Email",
-"var customer.name":"Customer Name",
-"var extensions":"Extensions",
-"var url":"Url"
+"var customer.name":"Customer Name"
 } @-->
 
 {{template config_path="design/email/header_template"}}
@@ -25,7 +23,7 @@
             <table class="inner-wrapper" border="0" cellspacing="0" cellpadding="0" align="center">
                 <tr>
                     <td align="center">
-                        <a href="{{var this.getUrl($store,$url,[_query:[id:$customer.id,key:$customer.confirmation,extensions:$extensions,back_url:$back_url],_nosid:1])}}" target="_blank">{{trans "Confirm Your Account"}}</a>
+                        <a href="{{var this.getUrl($store,'customer/account/confirm/',[_query:[id:$customer.id,key:$customer.confirmation,back_url:$back_url],_nosid:1])}}" target="_blank">{{trans "Confirm Your Account"}}</a>
                     </td>
                 </tr>
             </table>