Helper removed

Author: alex-79

Helper/Data.php

@@ -15,31 +15,30 @@ class RedirectWithoutStoreCode implements \Magento\Framework\Event\ObserverInter
     protected $storeManager;
 
     /**
-     * @var \Noon\HideDefaultStoreCode\Helper\Data
+     * @var \Noon\HideDefaultStoreCode\Service\Config
      */
-    protected $helper;
+    protected $config;
 
     /**
      * @var \Magento\Framework\UrlInterface
      */
     protected $url;
 
     /**
-     *
      * @param \Magento\Framework\App\ActionFlag $actionFlag
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Noon\HideDefaultStoreCode\Helper\Data $helper
+     * @param \Noon\HideDefaultStoreCode\Service\Config $config
      * @param \Magento\Framework\UrlInterface $url
      */
     public function __construct(
         \Magento\Framework\App\ActionFlag $actionFlag,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Noon\HideDefaultStoreCode\Helper\Data $helper,
+        \Noon\HideDefaultStoreCode\Service\Config $config,
         \Magento\Framework\UrlInterface $url
     ) {
         $this->actionFlag = $actionFlag;
         $this->storeManager = $storeManager;
-        $this->helper = $helper;
+        $this->config = $config;
         $this->url = $url;
     }
 
@@ -58,9 +57,9 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             $pos = strpos($url, $this->storeManager->getStore()->getBaseUrl() . $defaultStore->getCode());
 
             if (
-                $this->helper->isHideDefaultStoreCode() &&
+                $this->config->isHideDefaultStoreCode() &&
                 $pos !== false &&
-                $code = $this->helper->getRedirectCode()
+                $code = $this->config->getRedirectCode()
             ) {
                 $controller = $observer->getData('controller_action');
                 $url = str_replace('/' . $defaultStore->getCode() . '/', '/', $url);

Observer/RedirectWithoutStoreCode.php

@@ -6,9 +6,9 @@ class HideDefaultStoreCode
 {
     /**
      *
-     * @var \Noon\HideDefaultStoreCode\Helper\Data
+     * @var \Noon\HideDefaultStoreCode\Service\Config
      */
-    protected $helper;
+    protected $config;
 
     /**
      *
@@ -18,14 +18,14 @@ class HideDefaultStoreCode
 
     /**
      *
-     * @param \Noon\HideDefaultStoreCode\Helper\Data $helper
+     * @param \Noon\HideDefaultStoreCode\Service\Config $config
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
-        \Noon\HideDefaultStoreCode\Helper\Data $helper,
+        \Noon\HideDefaultStoreCode\Service\Config $config,
         \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
-        $this->helper = $helper;
+        $this->config = $config;
         $this->storeManager = $storeManager;
     }
 
@@ -39,7 +39,7 @@ public function afterGetBaseUrl(\Magento\Store\Model\Store $subject, $url)
     {
         $websiteId = $this->storeManager->getStore()->getWebsiteId();
         $defaultStore = $this->storeManager->getWebsite($websiteId)->getDefaultStore();
-        if ($this->helper->isHideDefaultStoreCode() && !is_null($defaultStore)) {
+        if ($this->config->isHideDefaultStoreCode() && !is_null($defaultStore)) {
             $url = str_replace('/' . $defaultStore->getCode() . '/', '/', $url);
         }
         return $url;

Plugin/Model/HideDefaultStoreCode.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace Noon\HideDefaultStoreCode\Service;
+
+class Config
+{
+    const XML_PATH_HIDE_DEFAULT_STORE_CODE = 'web/url/hide_default_store_code';
+    const XML_PATH_REDIRECT_TO_URL_WITHOUT_STORE_CODE = 'web/url/redirect_to_url_without_store_code';
+
+    const NO_REDIRECT = 0;
+    const PERMANENT_REDIRECT = 301;
+    const TEMPORARY_REDIRECT = 302;
+
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * Config constructor.
+     *
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+    ) {
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * @param $field
+     * @param null $storeId
+     * @return mixed
+     */
+    private function getConfigValue($field, $storeId = null)
+    {
+        return $this->scopeConfig->getValue(
+            $field,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
+    }
+
+    /**
+     * @param null $storeId
+     * @return mixed
+     */
+    public function isHideDefaultStoreCode($storeId = null)
+    {
+        return $this->getConfigValue(self::XML_PATH_HIDE_DEFAULT_STORE_CODE, $storeId);
+    }
+
+    /**
+     * @param null $storeId
+     * @return int
+     */
+    public function getRedirectCode($storeId = null)
+    {
+        $code = $this->getConfigValue(self::XML_PATH_REDIRECT_TO_URL_WITHOUT_STORE_CODE, $storeId);
+
+        if ($code == 301) {
+            return self::PERMANENT_REDIRECT;
+        }
+
+        if ($code == 1) {
+            return self::TEMPORARY_REDIRECT;
+        }
+
+        return self::NO_REDIRECT;
+    }
+}