MAGETWO-51586: Category page cached for different users from one web client

Author: RuslanKostiv1

app/code/Magento/Catalog/Block/Category/Plugin/PriceBoxTags.php

@@ -12,6 +12,7 @@
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\Pricing\Render\PriceBox;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Tax\Model\Calculation as TaxCalculation;
 
 class PriceBoxTags
 {
@@ -35,31 +36,37 @@ class PriceBoxTags
      */
     private $scopeResolver;
 
+    /**
+     * @var TaxCalculation
+     */
+    private $taxCalculation;
+
     /**
      * PriceBoxTags constructor.
      * @param PriceCurrencyInterface $priceCurrency
      * @param TimezoneInterface $dateTime
      * @param ScopeResolverInterface $scopeResolver
      * @param Session $customerSession
+     * @param TaxCalculation $taxCalculation
      */
     public function __construct(
         PriceCurrencyInterface $priceCurrency,
         TimezoneInterface $dateTime,
         ScopeResolverInterface $scopeResolver,
-        Session $customerSession
+        Session $customerSession,
+        TaxCalculation $taxCalculation
     ) {
         $this->dateTime = $dateTime;
         $this->customerSession = $customerSession;
         $this->priceCurrency = $priceCurrency;
         $this->scopeResolver = $scopeResolver;
+        $this->taxCalculation = $taxCalculation;
     }
 
     /**
      * @param PriceBox $subject
      * @param string $result
      * @return string
-     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function afterGetCacheKey(PriceBox $subject, $result)
     {
@@ -71,7 +78,44 @@ public function afterGetCacheKey(PriceBox $subject, $result)
                 $this->dateTime->scopeDate($this->scopeResolver->getScope()->getId())->format('Ymd'),
                 $this->scopeResolver->getScope()->getId(),
                 $this->customerSession->getCustomerGroupId(),
+                $this->getTaxRateIds($subject),
             ]
         );
     }
+
+    /**
+     * @param PriceBox $subject
+     * @return string
+     */
+    private function getTaxRateIds(PriceBox $subject)
+    {
+        $rateIds = [];
+
+        $customerSession = $this->customerSession;
+        $billingAddress = $customerSession->getDefaultTaxBillingAddress();
+        $shippingAddress = $customerSession->getDefaultTaxShippingAddress();
+        $customerTaxClassId = $customerSession->getCustomerTaxClassId();
+
+        if (!empty($billingAddress)) {
+            $billingAddress = new \Magento\Framework\DataObject($billingAddress);
+        }
+        if (!empty($shippingAddress)) {
+            $shippingAddress = new \Magento\Framework\DataObject($shippingAddress);
+        }
+
+        if (!empty($billingAddress) || !empty($shippingAddress)) {
+            $rateRequest = $this->taxCalculation->getRateRequest(
+                $billingAddress,
+                $shippingAddress,
+                $customerTaxClassId,
+                $this->scopeResolver->getScope()->getId(),
+                $this->customerSession->getCustomerId()
+            );
+
+            $rateRequest->setProductClassId($subject->getSaleableItem()->getTaxClassId());
+            $rateIds = $this->taxCalculation->getResource()->getRateIds($rateRequest);
+        }
+
+        return implode('_', $rateIds);
+    }
 }