Merge remote-tracking branch 'remotes/origin/MAGETWO-81532-Support-for-registered-customers' into MAGETWO-82674-Full-Text-Search

Author: Eric Bohanon

app/code/Magento/GraphQl/Model/EntityAttributeList.php

@@ -18,15 +18,11 @@ class EntityAttributeList
     private $management;
 
     /**
-     * EAV setup factory
-     *
      * @var EavSetupFactory
      */
     private $eavSetupFactory;
 
     /**
-     * EAV setup instance
-     *
      * @var EavSetup
      */
     private $eavSetup;

app/code/Magento/GraphQl/Model/ResolverContext.php

@@ -21,8 +21,8 @@ class ResolverContext extends \Magento\Framework\Model\AbstractExtensibleModel i
     /**#@+
      * Constants defined for type of context
      */
-    const CUSTOMER_TYPE_ID   = 'user_type';
-    const CUSTOMER_ID = 'user_id';
+    const USER_TYPE_ID   = 'user_type';
+    const USER_ID = 'user_id';
     /**#@-*/
 
     /**
@@ -87,36 +87,36 @@ public function setExtensionAttributes(\Magento\GraphQl\Model\ContextInterfaceEx
      */
     public function getUserId()
     {
-        if (!$this->getData(self::CUSTOMER_ID)) {
+        if (!$this->getData(self::USER_ID)) {
             $this->setUserId((int) $this->userContext->getUserId());
         }
-        return (int) $this->getData(self::CUSTOMER_ID);
+        return (int) $this->getData(self::USER_ID);
     }
 
     /**
      * @inheritDoc
      */
     public function setUserId(int $userId)
     {
-        return $this->setData(self::CUSTOMER_ID, $userId);
+        return $this->setData(self::USER_ID, $userId);
     }
 
     /**
      * @inheritDoc
      */
     public function getUserType()
     {
-        if (!$this->getData(self::CUSTOMER_TYPE_ID)) {
+        if (!$this->getData(self::USER_TYPE_ID)) {
             $this->setUserType($this->userContext->getUserType());
         }
-        return (int) $this->getData(self::CUSTOMER_TYPE_ID);
+        return (int) $this->getData(self::USER_TYPE_ID);
     }
 
     /**
      * @inheritDoc
      */
     public function setUserType(int $typeId)
     {
-        return $this->setData(self::CUSTOMER_ID, $typeId);
+        return $this->setData(self::USER_TYPE_ID, $typeId);
     }
 }

app/code/Magento/GraphQlCustomer/composer.json

@@ -0,0 +1,25 @@
+{
+  "name": "magento/module-graph-ql-customer",
+  "description": "N/A",
+  "type": "magento2-module",
+  "version": "100.0.0-dev",
+  "require": {
+    "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+    "magento/module-eav": "100.3.*",
+    "magento/module-customer": "100.2.*",
+    "magento/module-graph-ql": "100.0.*",
+    "magento/framework": "100.3.*"
+  },
+  "license": [
+    "OSL-3.0",
+    "AFL-3.0"
+  ],
+  "autoload": {
+    "files": [
+      "registration.php"
+    ],
+    "psr-4": {
+      "Magento\\GraphQlCustomer\\": ""
+    }
+  }
+}