CORE-1743: Use existing logic for restore link generation

spryker · Aug 14, 2017 · 325d675 · 325d675
1 parent 394a6dd
commit 325d675
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/Spryker/Zed/Customer/Business/Customer/Customer.php b/src/Spryker/Zed/Customer/Business/Customer/Customer.php
@@ -187,8 +187,14 @@ public function register(CustomerTransfer $customerTransfer)
     {
         $customerResponseTransfer = $this->add($customerTransfer);
 
-        if ($customerResponseTransfer->getIsSuccess()) {
-            $this->sendRegistrationToken($customerTransfer);
+        if (!$customerResponseTransfer->getIsSuccess()) {
+            return $customerResponseTransfer;
+        }
+
+        $this->sendRegistrationToken($customerTransfer);
+
+        if ($customerTransfer->getSendPasswordToken()) {
+            $this->sendPasswordRestoreMail($customerTransfer);
         }
 
         return $customerResponseTransfer;
@@ -231,10 +237,10 @@ protected function generateKey()
     protected function sendPasswordRestoreToken(CustomerTransfer $customerTransfer)
     {
         $customerTransfer = $this->get($customerTransfer);
-        $confirmationLink = $this->customerConfig
+        $restorePasswordLink = $this->customerConfig
             ->getCustomerPasswordRestoreTokenUrl($customerTransfer->getRestorePasswordKey());
 
-        $customerTransfer->setConfirmationLink($confirmationLink);
+        $customerTransfer->setRestorePasswordLink($restorePasswordLink);
 
         $mailTransfer = new MailTransfer();
         $mailTransfer->setType(CustomerRestorePasswordMailTypePlugin::MAIL_TYPE);

diff --git a/src/Spryker/Zed/Customer/Presentation/Mail/customer_restore_password.html.twig b/src/Spryker/Zed/Customer/Presentation/Mail/customer_restore_password.html.twig
@@ -1,4 +1,4 @@
 <div style="text-align: center;">
     {{ 'mail.customer.restore_password.text' | trans }}<br>
-    <a href="{{ mail.customer.restorePasswordLink|replace({'token-placeholder': mail.customer.restorePasswordKey}) }}">{{ 'customer.password.update'| trans }}</a>
+    <a href="{{ mail.customer.restorePasswordLink }}">{{ 'customer.password.update'| trans }}</a>
 </div>