Merge remote-tracking branch 'arcticfoxes/B2B-2224' into B2B-2204

Author: joanhe

app/code/Magento/DirectoryGraphQl/Controller/HttpHeaderProcessor/CurrencyProcessor.php

@@ -30,6 +30,7 @@ class CurrencyProcessor implements HttpHeaderProcessorInterface
 
     /**
      * @var SessionManagerInterface
+     * @deprecated
      */
     private $session;
 
@@ -65,37 +66,21 @@ public function __construct(
     public function processHeaderValue(string $headerValue) : void
     {
         try {
-            if (!empty($headerValue)) {
-                $headerCurrency = strtoupper(ltrim(rtrim($headerValue)));
-                /** @var \Magento\Store\Model\Store $currentStore */
-                $currentStore = $this->storeManager->getStore();
-                if (in_array($headerCurrency, $currentStore->getAvailableCurrencyCodes(true))) {
-                    $currentStore->setCurrentCurrencyCode($headerCurrency);
-                } else {
-                    /** @var \Magento\Store\Model\Store $store */
-                    $store = $this->storeManager->getStore() ?? $this->storeManager->getDefaultStoreView();
-                    //skip store not found exception as it will be handled in graphql validation
-                    $this->logger->warning(__('Currency not allowed for store %1', [$store->getCode()]));
-                    $this->httpContext->setValue(
-                        HttpContext::CONTEXT_CURRENCY,
-                        $headerCurrency,
-                        $store->getDefaultCurrency()->getCode()
-                    );
-                }
+            $currentStore = $this->storeManager->getStore();
+            $defaultCode = $currentStore->getDefaultCurrency()->getCode();
+            if (empty($headerValue)) {
+                $this->httpContext->setValue(
+                    HttpContext::CONTEXT_CURRENCY,
+                    $currentStore->getCurrentCurrency()->getCode(),
+                    $defaultCode
+                );
             } else {
-                if ($this->session->getCurrencyCode()) {
-                    /** @var \Magento\Store\Model\Store $currentStore */
-                    $currentStore = $this->storeManager->getStore() ?? $this->storeManager->getDefaultStoreView();
-                    $currentStore->setCurrentCurrencyCode($this->session->getCurrencyCode());
-                } else {
-                    /** @var \Magento\Store\Model\Store $store */
-                    $store = $this->storeManager->getStore() ?? $this->storeManager->getDefaultStoreView();
-                    $this->httpContext->setValue(
-                        HttpContext::CONTEXT_CURRENCY,
-                        $store->getCurrentCurrency()->getCode(),
-                        $store->getDefaultCurrency()->getCode()
-                    );
+                $headerCurrency = strtoupper(trim($headerValue));
+                if (!in_array($headerCurrency, $currentStore->getAvailableCurrencyCodes(true))) {
+                    //skip store not found exception as it will be handled in graphql validation
+                    $this->logger->warning(__('Currency not allowed for store %1', [$currentStore->getCode()]));
                 }
+                $this->httpContext->setValue(HttpContext::CONTEXT_CURRENCY, $headerCurrency, $defaultCode);
             }
         } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
             //skip store not found exception as it will be handled in graphql validation

app/code/Magento/DirectoryGraphQl/etc/graphql/di.xml

@@ -16,4 +16,9 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\DirectoryGraphQl\Controller\HttpHeaderProcessor\CurrencyProcessor">
+        <arguments>
+            <argument name="session" xsi:type="object">Magento\Framework\Session\Generic\Proxy</argument>
+        </arguments>
+    </type>
 </config>