Merge pull request #635 from magento-api/pull-request

[API] Bug Fixes

Author: Korshenko, Oleksii(okorshenko)

app/code/Magento/Directory/Model/Currency/Import/YahooFinance.php

@@ -15,8 +15,9 @@ class YahooFinance extends \Magento\Directory\Model\Currency\Import\AbstractImpo
      *
      * @var string
      */
-    private $currencyConverterUrl = 'http://query.yahooapis.com/v1/public/yql?format=json&q={{YQL_STRING}}'
-        .'&env=store://datatables.org/alltableswithkeys';
+    // @codingStandardsIgnoreStart
+    private $currencyConverterUrl = 'http://query.yahooapis.com/v1/public/yql?format=json&q={{YQL_STRING}}&env=store://datatables.org/alltableswithkeys';
+    // @codingStandardsIgnoreEnd
 
     /**
      * Config path for service timeout

dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/AdapterInterface.php

@@ -15,20 +15,24 @@ interface AdapterInterface
      * @param array $serviceInfo <pre>
      * array(
      *     'rest' => array(
-     *         'resourcePath' => $resourcePath, // e.g. /products/:id
-     *         'httpMethod' => $httpMethod,     // e.g. GET
+     *         'resourcePath' => $resourcePath,                 // e.g. /products/:id
+     *         'httpMethod' => $httpMethod,                     // e.g. GET
      *         'token' => '21hasbtlaqy8t3mj73kjh71cxxkqj4aq'    // optional : for token based Authentication. Will
      *                                                             override default Oauth based authentication provided
      *                                                             by test framework
      *     ),
      *     'soap' => array(
-     *         'service' => $soapService,    // soap service name with Version suffix e.g. catalogProductV1, customerV2
-     *         'operation' => $operation     // soap operation name e.g. catalogProductCreate
+     *         'service' => $soapService,                       // soap service name with Version suffix e.g.
+     *                                                             catalogProductV1, customerV2
+     *         'operation' => $operation                        // soap operation name e.g. catalogProductCreate
+     *         'token' => '21hasbtlaqy8t3mj73kjh71cxxkqj4aq'    // optional : for token based Authentication. Will
+     *                                                             override default Oauth based authentication provided
+     *                                                             by test framework
      *     ),
      *     OR
-     *     'serviceInterface' => $phpServiceInterfaceName, // e.g. \Magento\Catalog\Api\ProductInterface
-     *     'method' => $serviceMethodName                  // e.g. create
-     *     'entityId' => $entityId                         // is used in REST route placeholder (if applicable)
+     *     'serviceInterface' => $phpServiceInterfaceName,      // e.g. \Magento\Catalog\Api\ProductInterface
+     *     'method' => $serviceMethodName                       // e.g. create
+     *     'entityId' => $entityId                              // is used in REST route placeholder (if applicable)
      * );
      * </pre>
      * @param array $arguments

dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php

@@ -25,6 +25,7 @@ class CustomerRepositoryTest extends WebapiAbstract
     const SERVICE_VERSION = 'V1';
     const SERVICE_NAME = 'customerCustomerRepositoryV1';
     const RESOURCE_PATH = '/V1/customers';
+    const RESOURCE_PATH_CUSTOMER_TOKEN = "/V1/integration/customer/token";
 
     /**
      * Sample values for testing
@@ -141,6 +142,55 @@ public function tearDown()
         unset($this->customerRepository);
     }
 
+    /**
+     * Validate update by invalid customer.
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage Consumer is not authorized to access %resources
+     */
+    public function testInvalidCustomerUpdate()
+    {
+        $this->_markTestAsRestOnly();
+
+        //Create first customer and retrieve customer token.
+        $firstCustomerData = $this->_createCustomer();
+
+        // get customer ID token
+        /** @var \Magento\Integration\Api\CustomerTokenServiceInterface $customerTokenService */
+        //$customerTokenService = $this->objectManager->create(CustomerTokenServiceInterface::class);
+        $customerTokenService = Bootstrap::getObjectManager()->create(
+            'Magento\Integration\Api\CustomerTokenServiceInterface'
+        );
+        $token = $customerTokenService->createCustomerAccessToken($firstCustomerData[Customer::EMAIL], 'test@123');
+
+        //Create second customer and update lastname.
+        $customerData = $this->_createCustomer();
+        $existingCustomerDataObject = $this->_getCustomerData($customerData[Customer::ID]);
+        $lastName = $existingCustomerDataObject->getLastname();
+        $customerData[Customer::LASTNAME] = $lastName . 'Updated';
+        $newCustomerDataObject = $this->customerDataFactory->create();
+        $this->dataObjectHelper->populateWithArray(
+            $newCustomerDataObject,
+            $customerData,
+            '\Magento\Customer\Api\Data\CustomerInterface'
+        );
+
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::RESOURCE_PATH . "/{$customerData[Customer::ID]}",
+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT,
+                'token' => $token,
+            ]
+        ];
+
+        $newCustomerDataObject = $this->dataObjectProcessor->buildOutputDataArray(
+            $newCustomerDataObject,
+            'Magento\Customer\Api\Data\CustomerInterface'
+        );
+        $requestData = ['customer' => $newCustomerDataObject];
+        $this->_webApiCall($serviceInfo, $requestData);
+    }
+
     public function testDeleteCustomer()
     {
         $customerData = $this->_createCustomer();