Merge pull request #9677 from magento-gl/MCLOUD-13500_regression_issue_fix

MCLOUD-13500 - Unable to open backend with 2.4.8-beta134 in cloud instance

Author: glo71317

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

@@ -117,6 +117,9 @@ public function getFrontName($checkHost = false)
     /**
      * Return whether the host from request is the backend host
      *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @return bool
      */
     public function isHostBackend()
@@ -128,10 +131,11 @@ public function isHostBackend()
         if ($this->scopeConfig->getValue(self::XML_PATH_USE_CUSTOM_ADMIN_URL, ScopeInterface::SCOPE_STORE)) {
             $backendUrl = $this->scopeConfig->getValue(self::XML_PATH_CUSTOM_ADMIN_URL, ScopeInterface::SCOPE_STORE);
         } else {
-            $backendUrl = $this->config->getValue(Store::XML_PATH_UNSECURE_BASE_URL);
+            $xmlPath = $this->request->isSecure() ? Store::XML_PATH_SECURE_BASE_URL : Store::XML_PATH_UNSECURE_BASE_URL;
+            $backendUrl = $this->config->getValue($xmlPath);
             if ($backendUrl === null) {
                 $backendUrl = $this->scopeConfig->getValue(
-                    Store::XML_PATH_UNSECURE_BASE_URL,
+                    $xmlPath,
                     ScopeInterface::SCOPE_STORE
                 );
             }

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

@@ -129,6 +129,7 @@ public function testIsHostBackend(
             ->willReturnMap(
                 [
                     [Store::XML_PATH_UNSECURE_BASE_URL, ScopeInterface::SCOPE_STORE, null, $url],
+                    [Store::XML_PATH_SECURE_BASE_URL, ScopeInterface::SCOPE_STORE, null, $url],
                     [
                         FrontNameResolver::XML_PATH_USE_CUSTOM_ADMIN_URL,
                         ScopeInterface::SCOPE_STORE,
@@ -160,7 +161,6 @@ public function testIsHostBackend(
                     ->setHost(parse_url($url, PHP_URL_HOST))
                     ->setPort(parse_url($url, PHP_URL_PORT))
             );
-
         $this->assertEquals($expectedValue, $this->model->isHostBackend());
     }
 

app/code/Magento/Search/Test/Mftf/Data/SearchTermData.xml

@@ -11,7 +11,7 @@
     <entity name="SearchTerm" type="searchTerm">
         <data key="query_text" unique="suffix">Query text</data>
         <data key="store_id">1</data>
-        <data key="redirect" unique="suffix">http://example.com/</data>
+        <data key="redirect" unique="suffix">https://example.com/</data>
         <data key="display_in_terms">0</data>
     </entity>
     <entity name="UpdatedSearchTermData1" type="searchTerm">