🔃 [EngCom] Public Pull Requests - 2.1-develop

Accepted Public Pull Requests:
 - #13486: [Backport 2.1-develop] Change the store code in Swagger based on a param (by @JeroenVanLeusden)


Fixed GitHub Issues:
 - #13474: [2.1.10] Swagger not working for multistore installs?  (reported by @zack6849) has been fixed in #13486 by @JeroenVanLeusden in 2.1-develop branch
   Related commits:
     1. 9e49ae7

Author: magento-engcom-team

app/code/Magento/Swagger/Block/Index.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Swagger\Block;
+
+use Magento\Framework\View\Element\Template;
+
+/**
+ * Class Index
+ *
+ * @api
+ */
+class Index extends Template
+{
+    /**
+     * @return mixed|string
+     */
+    private function getParamStore()
+    {
+        return $this->getRequest()->getParam('store') ?: 'all';
+    }
+
+    /**
+     * @return string
+     */
+    public function getSchemaUrl()
+    {
+        return rtrim($this->getBaseUrl(), '/') . '/rest/' . $this->getParamStore() . '/schema?services=all';
+    }
+}

app/code/Magento/Swagger/view/frontend/layout/swagger_index_index.xml

@@ -41,7 +41,7 @@
         <referenceContainer name="page.wrapper" remove="true"/>
         <referenceBlock name="requirejs-config" remove="true"/>
         <referenceContainer name="root">
-            <block name="swaggerUiContent" class="Magento\Framework\View\Element\Template" template="Magento_Swagger::swagger-ui/index.phtml"/>
+            <block name="swaggerUiContent" class="Magento\Swagger\Block\Index" template="Magento_Swagger::swagger-ui/index.phtml"/>
         </referenceContainer>
     </body>
 </page>

app/code/Magento/Swagger/view/frontend/templates/swagger-ui/index.phtml

@@ -1,5 +1,8 @@
 <?php
 /**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ *
  * swagger-ui - Swagger UI is a dependency-free collection of HTML, JavaScript, and CSS
  * assets that dynamically generate beautiful documentation from a Swagger-compliant API
  *
@@ -9,12 +12,12 @@
  *
  * The original name of this file, as part of the swagger-ui package, was dist/index.html.
  *
- * Modified by Magento, Modifications Copyright © Magento, Inc.
+ * Modified by Magento, Modifications Copyright © Magento, Inc. All rights reserved.
  */
 
-/** @var \Magento\Framework\View\Element\Template $block */
+/** @var \Magento\Swagger\Block\Index $block */
 
-$schemaUrl = rtrim($block->getBaseUrl(), '/') . '/rest/default/schema?services=all';
+$schemaUrl = $block->getSchemaUrl();
 ?>
 
 <div id='header'>