mj/php-ovh
1
0
Fork 0
mirror of https://github.com/ovh/php-ovh.git synced 2023-11-05 03:20:26 +01:00
Code Issues Releases Wiki Activity

Merge pull request #47 from carsso/master

Browse Source 
Handle custom headers in a request and fix ovh-eu url
This commit is contained in:
Vincent Cassé 2016-09-03 21:18:47 +02:00 committed by GitHub
commit 01d233b910
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Api.php
View File

@ -53,7 +53,7 @@ class Api
* @var array * @var array
*/ */
private $endpoints = [ private $endpoints = [
'ovh-eu' => 'https://api.ovh.com/1.0', 'ovh-eu' => 'https://eu.api.ovh.com/1.0',
'ovh-ca' => 'https://ca.api.ovh.com/1.0', 'ovh-ca' => 'https://ca.api.ovh.com/1.0',
'kimsufi-eu' => 'https://eu.api.kimsufi.com/1.0', 'kimsufi-eu' => 'https://eu.api.kimsufi.com/1.0',
'kimsufi-ca' => 'https://ca.api.kimsufi.com/1.0', 'kimsufi-ca' => 'https://ca.api.kimsufi.com/1.0',
@ -223,7 +223,7 @@ class Api
* @return array * @return array
* @throws \GuzzleHttp\Exception\ClientException if http request is an error * @throws \GuzzleHttp\Exception\ClientException if http request is an error
*/ */
private function rawCall($method, $path, $content = null, $is_authenticated = true) private function rawCall($method, $path, $content = null, $is_authenticated = true, $headers = null)
{ {
$url = $this->endpoint . $path; $url = $this->endpoint . $path;
$request = new Request($method, $url); $request = new Request($method, $url);
@ -262,10 +262,12 @@ class Api
} else { } else {
$body = ""; $body = "";
} }
$headers = [ if(!is_array($headers))
'Content-Type' => 'application/json; charset=utf-8', {
'X-Ovh-Application' => $this->application_key, $headers = [];
]; }
$headers['Content-Type'] = 'application/json; charset=utf-8';
$headers['X-Ovh-Application'] = $this->application_key;
if ($is_authenticated) { if ($is_authenticated) {
if (!isset($this->time_delta)) { if (!isset($this->time_delta)) {
@ -309,10 +311,10 @@ class Api
* @return array * @return array
* @throws \GuzzleHttp\Exception\ClientException if http request is an error * @throws \GuzzleHttp\Exception\ClientException if http request is an error
*/ */
public function get($path, $content = null) public function get($path, $content = null, $headers = null)
{ {
return $this->decodeResponse( return $this->decodeResponse(
$this->rawCall("GET", $path, $content) $this->rawCall("GET", $path, $content, true, $headers)
); );
} }
@ -325,10 +327,10 @@ class Api
* @return array * @return array
* @throws \GuzzleHttp\Exception\ClientException if http request is an error * @throws \GuzzleHttp\Exception\ClientException if http request is an error
*/ */
public function post($path, $content = null) public function post($path, $content = null, $headers = null)
{ {
return $this->decodeResponse( return $this->decodeResponse(
$this->rawCall("POST", $path, $content) $this->rawCall("POST", $path, $content, true, $headers)
); );
} }
@ -341,10 +343,10 @@ class Api
* @return array * @return array
* @throws \GuzzleHttp\Exception\ClientException if http request is an error * @throws \GuzzleHttp\Exception\ClientException if http request is an error
*/ */
public function put($path, $content) public function put($path, $content, $headers = null)
{ {
return $this->decodeResponse( return $this->decodeResponse(
$this->rawCall("PUT", $path, $content) $this->rawCall("PUT", $path, $content, true, $headers)
); );
} }
@ -357,10 +359,10 @@ class Api
* @return array * @return array
* @throws \GuzzleHttp\Exception\ClientException if http request is an error * @throws \GuzzleHttp\Exception\ClientException if http request is an error
*/ */
public function delete($path, $content = null) public function delete($path, $content = null, $headers = null)
{ {
return $this->decodeResponse( return $this->decodeResponse(
$this->rawCall("DELETE", $path, $content) $this->rawCall("DELETE", $path, $content, true, $headers)
); );
} }