MC-32873: Product stock alert - unsubscribe for the product not working (logged out user)

tsviklinskyi · tsviklinskyi · commit bbbca238fcb9 · 2020-04-01T09:29:37.000+03:00
diff --git a/app/code/Magento/ProductAlert/Controller/Add.php b/app/code/Magento/ProductAlert/Controller/Add.php
@@ -10,6 +10,9 @@
 use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Framework\App\RequestInterface;
 
+/**
+ * Abstract controller for notifying.
+ */
 abstract class Add extends Action
 {
     /**
@@ -39,8 +42,8 @@ public function dispatch(RequestInterface $request)
     {
         if (!$this->customerSession->authenticate()) {
             $this->_actionFlag->set('', 'no-dispatch', true);
-            if (!$this->customerSession->getBeforeUrl()) {
-                $this->customerSession->setBeforeUrl($this->_redirect->getRefererUrl());
+            if (!$this->customerSession->getBeforeAuthUrl()) {
+                $this->customerSession->setBeforeAuthUrl($this->_redirect->getRefererUrl());
             }
         }
         return parent::dispatch($request);
diff --git a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Email.php b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Email.php
@@ -8,18 +8,19 @@
 
 namespace Magento\ProductAlert\Controller\Unsubscribe;
 
+use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\Action\HttpGetActionInterface;
-use Magento\Framework\App\Action\Action;
 use Magento\Framework\View\Result\Page;
 use Magento\Framework\View\Result\PageFactory;
+use Magento\ProductAlert\Controller\Unsubscribe as UnsubscribeController;
 
 /**
  * Unsubscribing from 'Back in stock Alert'.
  *
  * Is used to transform a Get request that triggered in the email into the Post request endpoint
  */
-class Email extends Action implements HttpGetActionInterface
+class Email extends UnsubscribeController implements HttpGetActionInterface
 {
     /**
      * @var PageFactory
@@ -29,13 +30,15 @@ class Email extends Action implements HttpGetActionInterface
     /**
      * @param Context $context
      * @param PageFactory $resultPageFactory
+     * @param CustomerSession $customerSession
      */
     public function __construct(
         Context $context,
-        PageFactory $resultPageFactory
+        PageFactory $resultPageFactory,
+        CustomerSession $customerSession
     ) {
         $this->resultPageFactory = $resultPageFactory;
-        parent::__construct($context);
+        parent::__construct($context, $customerSession);
     }
 
     /**
diff --git a/app/code/Magento/ProductAlert/view/frontend/layout/productalert_unsubscribe_email.xml b/app/code/Magento/ProductAlert/view/frontend/layout/productalert_unsubscribe_email.xml
@@ -8,7 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="content">
-            <block class="Magento\Framework\View\Element\Template" name="unsubscription_form" template="Magento_ProductAlert::email/email.phtml" />
+            <block class="Magento\Framework\View\Element\Template" name="unsubscription_form" cacheable="false" template="Magento_ProductAlert::email/email.phtml" />
         </referenceContainer>
     </body>
 </page>

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,9 @@`
`10`	`10`	`use Magento\Customer\Model\Session as CustomerSession;`
`11`	`11`	`use Magento\Framework\App\RequestInterface;`
`12`	`12`
	`13`	`+/**`
	`14`	`+ * Abstract controller for notifying.`
	`15`	`+ */`
`13`	`16`	`abstract class Add extends Action`
`14`	`17`	`{`
`15`	`18`	`/**`
`@@ -39,8 +42,8 @@ public function dispatch(RequestInterface $request)`
`39`	`42`	`{`
`40`	`43`	`if (!$this->customerSession->authenticate()) {`
`41`	`44`	`$this->_actionFlag->set('', 'no-dispatch', true);`
`42`		`- if (!$this->customerSession->getBeforeUrl()) {`
`43`		`- $this->customerSession->setBeforeUrl($this->_redirect->getRefererUrl());`
	`45`	`+ if (!$this->customerSession->getBeforeAuthUrl()) {`
	`46`	`+ $this->customerSession->setBeforeAuthUrl($this->_redirect->getRefererUrl());`
`44`	`47`	`}`
`45`	`48`	`}`
`46`	`49`	`return parent::dispatch($request);`