MAGETWO-43691: Custom admin path does not work correctly

 - get base url from config, not Url framework

Author: Dale Sikkema

app/code/Magento/Backend/App/Area/FrontNameResolver.php

@@ -8,7 +8,10 @@
 namespace Magento\Backend\App\Area;
 
 use Magento\Backend\Setup\ConfigOptionsList;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\DeploymentConfig;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\Store;
 
 class FrontNameResolver implements \Magento\Framework\App\Area\FrontNameResolverInterface
 {
@@ -38,24 +41,22 @@ class FrontNameResolver implements \Magento\Framework\App\Area\FrontNameResolver
      */
     protected $deploymentConfig;
 
-    /**
-     * @var \Magento\Backend\Model\UrlInterface
-     */
-    protected $backendUrl;
+    /** @var ScopeConfigInterface */
+    private $configInterface;
 
     /**
      * @param \Magento\Backend\App\Config $config
      * @param DeploymentConfig $deploymentConfig
-     * @param \Magento\Backend\Model\UrlInterface $backendUrl
+     * @param ScopeConfigInterface $configInterface
      */
     public function __construct(
         \Magento\Backend\App\Config $config,
         DeploymentConfig $deploymentConfig,
-        \Magento\Backend\Model\UrlInterface $backendUrl
+        ScopeConfigInterface $configInterface
     ) {
         $this->config = $config;
         $this->defaultFrontName = $deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_BACKEND_FRONTNAME);
-        $this->backendUrl = $backendUrl;
+        $this->configInterface = $configInterface;
     }
 
     /**
@@ -82,7 +83,8 @@ public function getFrontName($checkHost = false)
      */
     public function isHostBackend()
     {
-        $backendHost = parse_url(trim($this->backendUrl->getBaseUrl()), PHP_URL_HOST);
+        $backendUrl = $this->configInterface->getValue(Store::XML_PATH_UNSECURE_BASE_URL, ScopeInterface::SCOPE_STORE);
+        $backendHost = parse_url(trim($backendUrl), PHP_URL_HOST);
         $host = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : '';
         return (strcasecmp($backendHost, $host) === 0);
     }

app/code/Magento/Backend/Test/Unit/App/Area/FrontNameResolverTest.php

@@ -33,8 +33,8 @@ protected function setUp()
             ->with(ConfigOptionsList::CONFIG_PATH_BACKEND_FRONTNAME)
             ->will($this->returnValue($this->_defaultFrontName));
         $this->_configMock = $this->getMock('\Magento\Backend\App\Config', [], [], '', false);
-        $backendUrlMock = $this->getMock('\Magento\Backend\Model\UrlInterface', [], [], '', false);
-        $this->_model = new FrontNameResolver($this->_configMock, $deploymentConfigMock, $backendUrlMock);
+        $configMock = $this->getMock('\Magento\Framework\App\Config\ScopeConfigInterface', [], [], '', false);
+        $this->_model = new FrontNameResolver($this->_configMock, $deploymentConfigMock, $configMock);
     }
 
     public function testIfCustomPathUsed()