Fix/pass authorization headers

.gitignore

@@ -8,3 +8,5 @@ composer.lock
 *.sublime-workspace
 *.phar
 *.log
+
+.env

README.md

@@ -36,6 +36,7 @@ try {
 
  $query = $client->get('query', [
  'query' => 'Hello',
+ 'sessionId' => '13371337'
  ]);
 
  $response = json_decode((string) $query->getBody(), true);

codeception.yml

@@ -0,0 +1,10 @@
+paths:
+ tests: tests
+ output: tests/_output
+ data: tests/_data
+ support: tests/_support
+ envs: tests/_envs
+actor_suffix: Tester
+extensions:
+ enabled:
+ - Codeception\Extension\RunFailed

composer.json

@@ -25,5 +25,9 @@
  "require": {
  "php": ">=5.5.0",
  "guzzlehttp/guzzle": "^6.2"
+ },
+ "require-dev": {
+ "codeception/codeception": "^2.4",
+ "vlucas/phpdotenv": "^2.5"
  }
-}
+}

src/Client.php

@@ -3,7 +3,7 @@
 namespace DialogFlow;
 
 use DialogFlow\HttpClient\HttpClient;
-use DialogFlow\HttpClient\GuzzleHttpClient;
+use GuzzleHttp\Client as GuzzleClient;
 use DialogFlow\Exception\BadResponseException;
 use GuzzleHttp\Promise\PromiseInterface;
 use function GuzzleHttp\Promise\rejection_for;
@@ -101,7 +101,14 @@ public function __construct($accessToken, HttpClient $httpClient = null, $apiLan
  */
  private function defaultHttpClient()
  {
- return new GuzzleHttpClient();
+ return new GuzzleClient([
+ 'base_uri' => Client::API_BASE_URI . Client::DEFAULT_API_ENDPOINT,
+ 'timeout' => Client::DEFAULT_TIMEOUT,
+ 'connect_timeout' => Client::DEFAULT_TIMEOUT,
+ 'headers' => [
+ 'Authorization' => sprintf('Bearer %s', $this->accessToken),
+ ],
+ ]);
  }
 
  /**
@@ -144,7 +151,7 @@ public function getLastResponse()
  */
  public function get($uri, array $params = [])
  {
- return $this->send('GET', $uri, null, $params);
+ return $this->send('GET', $uri, $params);
  }
 
  /**
@@ -190,14 +197,15 @@ public function postAsync($uri, array $params = [])
  *
  * @return ResponseInterface
  */
- public function send($method, $uri, $body = null, array $query = [], array $headers = [], array $options = [])
+ public function send($method, $uri, array $query = [])
  {
  $this->validateMethod($method);
 
  $query = array_merge($this->getDefaultQuery(), $query);
- $headers = array_merge($this->getDefaultHeaders(), $headers);
 
- $this->lastResponse = $this->client->send($method, $uri, $body, $query, $headers, $options);
+ $this->lastResponse = $this->client->request($method, $uri, [
+ 'query' => $query,
+ ]);
 
  $this->validateResponse($this->lastResponse);
 

src/HttpClient/GuzzleHttpClient.php

@@ -24,12 +24,13 @@ class GuzzleHttpClient implements HttpClient
  *
  * @param ClientInterface|null $guzzleClient
  */
- public function __construct(ClientInterface $guzzleClient = null)
+ public function __construct(ClientInterface $guzzleClient = null, $headers)
  {
  $this->guzzleClient = $guzzleClient ?: new GuzzleClient([
  'base_uri' => Client::API_BASE_URI . Client::DEFAULT_API_ENDPOINT,
  'timeout' => Client::DEFAULT_TIMEOUT,
  'connect_timeout' => Client::DEFAULT_TIMEOUT,
+ 'headers' => $headers,
  ]);
  }
 

tests/_output/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

tests/_support/AcceptanceTester.php

@@ -0,0 +1,26 @@
+<?php
+
+
+/**
+ * Inherited Methods
+ * @method void wantToTest($text)
+ * @method void wantTo($text)
+ * @method void execute($callable)
+ * @method void expectTo($prediction)
+ * @method void expect($prediction)
+ * @method void amGoingTo($argumentation)
+ * @method void am($role)
+ * @method void lookForwardTo($achieveValue)
+ * @method void comment($description)
+ * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
+ *
+ * @SuppressWarnings(PHPMD)
+*/
+class AcceptanceTester extends \Codeception\Actor
+{
+ use _generated\AcceptanceTesterActions;
+
+ /**
+ * Define custom actions here
+ */
+}

tests/_support/FunctionalTester.php

@@ -0,0 +1,26 @@
+<?php
+
+
+/**
+ * Inherited Methods
+ * @method void wantToTest($text)
+ * @method void wantTo($text)
+ * @method void execute($callable)
+ * @method void expectTo($prediction)
+ * @method void expect($prediction)
+ * @method void amGoingTo($argumentation)
+ * @method void am($role)
+ * @method void lookForwardTo($achieveValue)
+ * @method void comment($description)
+ * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
+ *
+ * @SuppressWarnings(PHPMD)
+*/
+class FunctionalTester extends \Codeception\Actor
+{
+ use _generated\FunctionalTesterActions;
+
+ /**
+ * Define custom actions here
+ */
+}

tests/_support/Helper/Acceptance.php

@@ -0,0 +1,10 @@
+<?php
+namespace Helper;
+
+// here you can define custom actions
+// all public methods declared in helper class will be available in $I
+
+class Acceptance extends \Codeception\Module
+{
+
+}

tests/_support/Helper/Functional.php

@@ -0,0 +1,10 @@
+<?php
+namespace Helper;
+
+// here you can define custom actions
+// all public methods declared in helper class will be available in $I
+
+class Functional extends \Codeception\Module
+{
+
+}

tests/_support/Helper/Unit.php

@@ -0,0 +1,10 @@
+<?php
+namespace Helper;
+
+// here you can define custom actions
+// all public methods declared in helper class will be available in $I
+
+class Unit extends \Codeception\Module
+{
+
+}

tests/_support/UnitTester.php

@@ -0,0 +1,26 @@
+<?php
+
+
+/**
+ * Inherited Methods
+ * @method void wantToTest($text)
+ * @method void wantTo($text)
+ * @method void execute($callable)
+ * @method void expectTo($prediction)
+ * @method void expect($prediction)
+ * @method void amGoingTo($argumentation)
+ * @method void am($role)
+ * @method void lookForwardTo($achieveValue)
+ * @method void comment($description)
+ * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
+ *
+ * @SuppressWarnings(PHPMD)
+*/
+class UnitTester extends \Codeception\Actor
+{
+ use _generated\UnitTesterActions;
+
+ /**
+ * Define custom actions here
+ */
+}

tests/_support/_generated/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

tests/acceptance.suite.yml

@@ -0,0 +1,12 @@
+# Codeception Test Suite Configuration
+#
+# Suite for acceptance tests.
+# Perform tests in browser using the WebDriver or PhpBrowser.
+# If you need both WebDriver and PHPBrowser tests - create a separate suite.
+
+actor: AcceptanceTester
+modules:
+ enabled:
+ - PhpBrowser:
+ url: http://localhost/myapp
+ - \Helper\Acceptance

tests/functional.suite.yml

@@ -0,0 +1,12 @@
+# Codeception Test Suite Configuration
+#
+# Suite for functional tests
+# Emulate web requests and make application process them
+# Include one of framework modules (Symfony2, Yii2, Laravel5) to use it
+# Remove this suite if you don't use frameworks
+
+actor: FunctionalTester
+modules:
+ enabled:
+ # add a framework module here
+ - \Helper\Functional

tests/unit.suite.yml

@@ -0,0 +1,11 @@
+# Codeception Test Suite Configuration
+#
+# Suite for unit or integration tests.
+
+actor: UnitTester
+modules:
+ enabled:
+ - Asserts
+ - \Helper\Unit
+ params:
+ - .env

tests/unit/QueryTest.php

@@ -0,0 +1,33 @@
+<?php
+use DialogFlow\Client;
+
+class QueryTest extends \Codeception\Test\Unit
+{
+ /**
+ * @var \UnitTester
+ */
+ protected $tester;
+
+ protected function _before()
+ {
+ // wish there was a better way to load .env's in tests...
+ $dotenv = new Dotenv\Dotenv(__DIR__ . '/../../');
+ $dotenv->load();
+ $this->client = new Client($_ENV['DIALOGFLOW_CLIENT_ACCESS_TOKEN']);
+ }
+
+ protected function _after()
+ {
+ }
+
+ // tests
+ public function testQueryDoesNotRaiseException()
+ {
+ $query = $this->client->get('query', [
+ 'query' => 'Hello',
+ 'sessionId' => '1',
+ ]);
+
+ $response = json_decode((string) $query->getBody(), true);
+ }
+}