magento · VitaliyBoyko · Jul 24, 2018 · Jul 24, 2018 · Jul 24, 2018 · Jul 24, 2018
diff --git a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/ExtendedStoreConfigDataProvider.php b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/ExtendedStoreConfigDataProvider.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\StoreGraphQl\Model\Resolver\Store;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
+
+/**
+ * Extends default StoreConfigInterface for GraphQL request processing.
+ */
+class ExtendedStoreConfigDataProvider
+{
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var array
+     */
+    private $extendedConfigs;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     * @param array $extendedConfigs
+     */
+    public function __construct(
+        ScopeConfigInterface $scopeConfig,
+        array $extendedConfigs
+    ) {
+        $this->scopeConfig = $scopeConfig;
+        $this->extendedConfigs = $extendedConfigs;
+    }
+
+    /**
+     * Get data from ScopeConfig by path's defined in DI config
+     * @return array
+     */
+    public function getExtendedConfigs()
+    {
+        $extendedConfigsData = [];
+        foreach ($this->extendedConfigs as $key => $path) {
+            $extendedConfigsData[$key] = $this->scopeConfig->getValue($path, ScopeInterface::SCOPE_STORE);
+        }
+
+        return $extendedConfigsData;
+    }
+}
diff --git a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
@@ -9,8 +9,7 @@
 
 use Magento\Store\Api\Data\StoreConfigInterface;
 use Magento\Store\Api\StoreConfigManagerInterface;
-use Magento\Store\Api\StoreRepositoryInterface;
-use Magento\Store\Api\StoreResolverInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * StoreConfig field data provider, used for GraphQL request processing.
@@ -23,28 +22,20 @@ class StoreConfigDataProvider
     private $storeConfigManager;
 
     /**
-     * @var StoreResolverInterface
+     * @var StoreManagerInterface
      */
-    private $storeResolver;
-
-    /**
-     * @var StoreRepositoryInterface
-     */
-    private $storeRepository;
+    private $storeManager;
 
     /**
      * @param StoreConfigManagerInterface $storeConfigManager
-     * @param StoreResolverInterface $storeResolver
-     * @param StoreRepositoryInterface $storeRepository
+     * @param StoreManagerInterface $storeManager
      */
     public function __construct(
         StoreConfigManagerInterface $storeConfigManager,
-        StoreResolverInterface $storeResolver,
-        StoreRepositoryInterface $storeRepository
+        StoreManagerInterface $storeManager
     ) {
         $this->storeConfigManager = $storeConfigManager;
-        $this->storeResolver = $storeResolver;
-        $this->storeRepository = $storeRepository;
+        $this->storeManager = $storeManager;
     }
 
     /**
@@ -54,8 +45,7 @@ public function __construct(
      */
     public function getStoreConfig() : array
     {
-        $storeId = $this->storeResolver->getCurrentStoreId();
-        $store = $this->storeRepository->getById($storeId);
+        $store = $this->storeManager->getStore();
         $storeConfig = current($this->storeConfigManager->getStoreConfigs([$store->getCode()]));
 
         return $this->hidrateStoreConfig($storeConfig);

diff --git a/app/code/Magento/StoreGraphQl/Model/Resolver/StoreConfigResolver.php b/app/code/Magento/StoreGraphQl/Model/Resolver/StoreConfigResolver.php
@@ -12,6 +12,7 @@
 use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\StoreGraphQl\Model\Resolver\Store\ExtendedStoreConfigDataProvider;
 use Magento\StoreGraphQl\Model\Resolver\Store\StoreConfigDataProvider;
 
 /**
@@ -24,21 +25,29 @@ class StoreConfigResolver implements ResolverInterface
      */
     private $storeConfigDataProvider;
 
+    /**
+     * @var ExtendedStoreConfigDataProvider
+     */
+    private $extendedStoreConfigsDataProvider;
+
     /**
      * @var ValueFactory
      */
     private $valueFactory;
 
     /**
      * @param StoreConfigDataProvider $storeConfigsDataProvider
+     * @param ExtendedStoreConfigDataProvider $extendedStoreConfigsDataProvider
      * @param ValueFactory $valueFactory
      */
     public function __construct(
         StoreConfigDataProvider $storeConfigsDataProvider,
+        ExtendedStoreConfigDataProvider $extendedStoreConfigsDataProvider,
         ValueFactory $valueFactory
     ) {
         $this->valueFactory = $valueFactory;
         $this->storeConfigDataProvider = $storeConfigsDataProvider;
+        $this->extendedStoreConfigsDataProvider = $extendedStoreConfigsDataProvider;
     }
 
     /**
@@ -52,7 +61,10 @@ public function resolve(
         array $args = null
     ) : Value {
 
-        $storeConfigData = $this->storeConfigDataProvider->getStoreConfig();
+        $storeConfigData = array_merge(
+            $this->storeConfigDataProvider->getStoreConfig(),
+            $this->extendedStoreConfigsDataProvider->getExtendedConfigs()
+        );
 
         $result = function () use ($storeConfigData) {
             return !empty($storeConfigData) ? $storeConfigData : [];

diff --git a/app/code/Magento/StoreGraphQl/etc/graphql/di.xml b/app/code/Magento/StoreGraphQl/etc/graphql/di.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\StoreGraphQl\Model\Resolver\Store\ExtendedStoreConfigDataProvider">
+        <arguments>
+            <argument name="extendedConfigs" xsi:type="array">
+                <!-- Begin Store Configuration Web Default Pages -->
+                <item name="front" xsi:type="string">web/default/front</item>
+                <item name="cms_home_page" xsi:type="string">web/default/cms_home_page</item>
+                <item name="no_route" xsi:type="string">web/default/no_route</item>
+                <item name="cms_no_route" xsi:type="string">web/default/cms_no_route</item>
+                <item name="cms_no_cookies" xsi:type="string">web/default/cms_no_cookies</item>
+                <item name="show_cms_breadcrumbs" xsi:type="string">web/default/show_cms_breadcrumbs</item>
+                <!-- End Store Configuration Web Default Pages -->
+                <!-- Begin Design Configuration HTML Head Section-->
+                <item name="head_shortcut_icon" xsi:type="string">design/head/head_shortcut_icon</item>
+                <item name="default_title" xsi:type="string">design/head/default_title</item>
+                <item name="title_prefix" xsi:type="string">design/head/title_prefix</item>
+                <item name="title_suffix" xsi:type="string">design/head/title_suffix</item>
+                <item name="default_description" xsi:type="string">design/head/default_description</item>
+                <item name="default_keywords" xsi:type="string">design/head/default_keywords</item>
+                <item name="head_includes" xsi:type="string">design/head/includes</item>
+                <item name="demonotice" xsi:type="string">design/head/demonotice</item>
+                <!-- End Design Configuration HTML Head Section -->
+                <!-- Begin Design Configuration Header Section-->
+                <item name="header_logo_src" xsi:type="string">design/header/header_logo_src</item>
+                <item name="logo_width" xsi:type="string">design/header/logo_width</item>
+                <item name="logo_height" xsi:type="string">design/header/logo_height</item>
+                <item name="welcome" xsi:type="string">design/header/welcome</item>
+                <item name="logo_alt" xsi:type="string">design/header/logo_alt</item>
+                <!-- End Design Configuration Header Section -->
+                <!-- Begin Design Configuration Footer Section-->
+                <item name="copyright" xsi:type="string">design/footer/copyright</item>
+                <item name="absolute_footer" xsi:type="string">design/footer/absolute_footer</item>
+                <!-- End Design Configuration Footer Section -->
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/StoreGraphQl/etc/schema.graphqls b/app/code/Magento/StoreGraphQl/etc/schema.graphqls
@@ -30,4 +30,25 @@ type StoreConfig @doc(description: "The type contains information about a store
     secure_base_link_url : String @doc(description: "Secure base link URL for the store")
     secure_base_static_url : String @doc(description: "Secure base static URL for the store")
     secure_base_media_url : String @doc(description: "Secure base media URL for the store")
+    front : String @doc(description: "Default Web URL")
+    cms_home_page : String @doc(description: "CMS Home Page")
+    no_route : String @doc(description: "Default No-route URL")
+    cms_no_route : String @doc(description: "CMS No Route Page")
+    cms_no_cookies : String @doc(description: "CMS No Cookies Page")
+    show_cms_breadcrumbs : Int @doc(description: "Show Breadcrumbs for CMS Pages")
+    head_shortcut_icon : String @doc(description: "Favicon Icon")
+    default_title : String @doc(description: "Default Page Title")
+    title_prefix : String @doc(description: "Page Title Prefix")
+    title_suffix : String @doc(description: "Page Title Suffix")
+    default_description : String @doc(description: "Default Meta Description")
+    default_keywords : String @doc(description: "Default Meta Keywords")
+    head_includes : String @doc(description: "Scripts and Style Sheets")
+    demonotice : Int @doc(description: "Display Demo Store Notice")
+    header_logo_src : String @doc(description: "Logo Image")
+    logo_width : Int @doc(description: "Logo Attribute Width")
+    logo_height : Int @doc(description: "Logo Attribute Height")
+    welcome : String @doc(description: "Welcome Text")
+    logo_alt : String @doc(description: "Logo Image Alt")
+    absolute_footer : String @doc(description: "Footer Miscellaneous HTML")
+    copyright : String @doc(description: "Copyright")
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
@@ -90,4 +90,31 @@ public function testGetStoreConfig()
         );
         $this->assertEquals($storeConfig->getSecureBaseMediaUrl(), $response['storeConfig']['secure_base_media_url']);
     }
+
+    /**
+     * @magentoConfigFixture default_store web/default/front 'test_page'
+     * @magentoConfigFixture default_store design/head/default_title 'Test Title'
+     * @magentoConfigFixture default_store design/footer/copyright 'Test Copyright'
+     */
+    public function testExtendedStoreConfig()
+    {
+        $front = 'test_page';
+        $default_title = 'Test Title';
+        $copyright = 'Test Copyright';
+
+        $query = <<<QUERY
+{
+  storeConfig{
+    front,
+    default_title,
+    copyright
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+        $this->assertArrayHasKey('storeConfig', $response);
+        $this->assertEquals($front, $response['storeConfig']['front']);
+        $this->assertEquals($default_title, $response['storeConfig']['default_title']);
+        $this->assertEquals($copyright, $response['storeConfig']['copyright']);
+    }
 }