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 #72 from marema31/accept-endpoint-url

Browse Source 
Allow URL for api_endpoint specification
This commit is contained in:
Vincent Cassé 2018-02-09 17:04:54 +01:00 committed by GitHub
commit 1c04b1a4fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 115 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Api.php
View File

@ -138,8 +138,19 @@ class Api
throw new Exceptions\InvalidParameterException("Endpoint parameter is empty");
}
if (!array_key_exists($api_endpoint, $this->endpoints)) {
throw new Exceptions\InvalidParameterException("Unknown provided endpoint");
if (preg_match('/^https?:\/\/..*/',$api_endpoint))
{
$this->endpoint = $api_endpoint;
}
else
{
if (!array_key_exists($api_endpoint, $this->endpoints)) {
throw new Exceptions\InvalidParameterException("Unknown provided endpoint");
}
else
{
$this->endpoint = $this->endpoints[$api_endpoint];
}
}
if (!isset($http_client)) {
@ -150,7 +161,6 @@ class Api
}
$this->application_key = $application_key;
$this->endpoint = $this->endpoints[$api_endpoint];
$this->application_secret = $application_secret;
$this->http_client = $http_client;
$this->consumer_key = $consumer_key;

102
tests/ApiTest.php
View File

@ -367,4 +367,106 @@ class ApiTest extends \PHPUnit_Framework_TestCase
$api->get('/me/api/credential', ['dryRun' => true, 'notDryRun' => false]);
}
/**
* Test valid predefined endpoint
*/
public function testPredefinedEndPoint()
{
$handlerStack = $this->client->getConfig('handler');
$handlerStack->push(Middleware::mapRequest(function (Request $request) {
if($request->getUri()->getPath() == "/1.0/auth/time") {
return $request;
}
$host = $request->getUri()->getHost();
$this->assertEquals($host, 'ca.api.ovh.com');
$resource = $request->getUri()->getPath();
$this->assertEquals($resource, '/1.0/me/api/credential');
$resource = $request->getUri()->getScheme();
$this->assertEquals($resource, 'https');
$request = $request->withUri($request->getUri()
->withHost('httpbin.org')
->withPath('/')
->withQuery(''));
return $request;
}));
//$handlerStack->push(Middleware::mapResponse(function (Response $response) {
// return $response;
//}));
$api = new Api($this->application_key, $this->application_secret, 'ovh-ca', $this->consumer_key, $this->client);
$api->get('/me/api/credential');
}
/**
* Test valid provided HTTP endpoint
*/
public function testProvidedHttpEndPoint()
{
$handlerStack = $this->client->getConfig('handler');
$handlerStack->push(Middleware::mapRequest(function (Request $request) {
if($request->getUri()->getPath() == "/1.0/auth/time") {
return $request;
}
$host = $request->getUri()->getHost();
$this->assertEquals($host, 'api.ovh.com');
$resource = $request->getUri()->getPath();
$this->assertEquals($resource, '/1.0/me/api/credential');
$resource = $request->getUri()->getScheme();
$this->assertEquals($resource, 'http');
$request = $request->withUri($request->getUri()
->withHost('httpbin.org')
->withPath('/')
->withQuery(''));
return $request;
}));
//$handlerStack->push(Middleware::mapResponse(function (Response $response) {
// return $response;
//}));
$api = new Api($this->application_key, $this->application_secret, 'http://api.ovh.com/1.0', $this->consumer_key, $this->client);
$api->get('/me/api/credential');
}
/**
* Test valid provided HTTPS endpoint
*/
public function testProvidedHttpsEndPoint()
{
$handlerStack = $this->client->getConfig('handler');
$handlerStack->push(Middleware::mapRequest(function (Request $request) {
if($request->getUri()->getPath() == "/1.0/auth/time") {
return $request;
}
$host = $request->getUri()->getHost();
$this->assertEquals($host, 'api.ovh.com');
$resource = $request->getUri()->getPath();
$this->assertEquals($resource, '/1.0/me/api/credential');
$resource = $request->getUri()->getScheme();
$this->assertEquals($resource, 'https');
$request = $request->withUri($request->getUri()
->withHost('httpbin.org')
->withPath('/')
->withQuery(''));
return $request;
}));
//$handlerStack->push(Middleware::mapResponse(function (Response $response) {
// return $response;
//}));
$api = new Api($this->application_key, $this->application_secret, 'https://api.ovh.com/1.0', $this->consumer_key, $this->client);
$api->get('/me/api/credential');
}
}