bitmotor/unirest-php
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support for authentication

Browse Source
This commit is contained in:
Evan Seguin
2012-07-19 12:52:13 -07:00
parent 1c503f13ff
commit 78a0f180d0
8 changed files with 134 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
main/mashape/http/HttpClient.php
View File

@@ -30,19 +30,22 @@ require_once(dirname(__FILE__) . "/../exceptions/MashapeClientException.php");
require_once(dirname(__FILE__) . "/HttpMethod.php");
require_once(dirname(__FILE__) . "/UrlUtils.php");
require_once(dirname(__FILE__) . "/AuthUtil.php");
require_once(dirname(__FILE__) . "/../auth/HeaderAuth.php");
require_once(dirname(__FILE__) . "/../auth/BasicAuth.php");
require_once(dirname(__FILE__) . "/../auth/CustomHeaderAuth.php");
require_once(dirname(__FILE__) . "/../auth/MashapeAuth.php");
require_once(dirname(__FILE__) . "/../auth/QueryAuth.php");
class HttpClient {
public static function doRequest($httpMethod, $url, $parameters, $publicKey, $privateKey, $encodeJson = true) {
public static function doRequest($httpMethod, $url, $parameters, $authHandlers, $encodeJson = true) {
if (!($httpMethod == HttpMethod::DELETE || $httpMethod == HttpMethod::GET ||
$httpMethod == HttpMethod::POST || $httpMethod == HttpMethod::PUT)) {
throw new MashapeClientException(EXCEPTION_NOTSUPPORTED_HTTPMETHOD, EXCEPTION_NOTSUPPORTED_HTTPMETHOD_CODE);
}
UrlUtils::prepareRequest($url, $parameters, ($httpMethod != HttpMethod::GET) ? true : false);
$response = self::execRequest($httpMethod, $url, $parameters, $publicKey, $privateKey);
$response = self::execRequest($httpMethod, $url, $parameters, $authHandlers);
if (!$encodeJson) {
return $response;
@@ -60,18 +63,26 @@ class HttpClient {
return $jsonResponse;
}
private static function execRequest($httpMethod, $url, $parameters, $publicKey, $privateKey) {
private static function execRequest($httpMethod, $url, $parameters, $authHandlers) {
$data = null;
$headers = array();
$headers[] = UrlUtils::generateClientHeaders();
// Authentication
foreach($authHandlers as $handler) {
if ($handler instanceof QueryAuth) {
$parameters = array_merge($parameters, $handler->handleParams());
} else if ($handler instanceof HeaderAuth) {
$headers[] = $handler->handleHeader();
}
}
UrlUtils::prepareRequest($url, $parameters, ($httpMethod != HttpMethod::GET) ? true : false);
if ($httpMethod != HttpMethod::GET) {
//$url = self::removeQueryString($url);
$data = http_build_query($parameters);
}
//$headers = array();
$headers = array(
);
$headers[] = AuthUtil::generateAuthenticationHeader($publicKey, $privateKey);
$headers[] = UrlUtils::generateClientHeaders();
$ch = curl_init ();

17
main/mashape/http/UrlUtils.php
View File

@@ -42,12 +42,6 @@ class UrlUtils {
}
}
if ($addRegularQueryStringParameters) {
// Get regular query string parameters
self::addRegularQueryStringParameters($url, $parameters);
}
$finalUrl = $url;
$matches = null;
$match = preg_match_all(PLACEHOLDER_REGEX, $url, $matches);
@@ -67,6 +61,17 @@ class UrlUtils {
$finalUrl = preg_replace("/\?&/", "?", $finalUrl);
$finalUrl = preg_replace("/\?$/", "", $finalUrl);
if ($addRegularQueryStringParameters) {
// Get regular query string parameters
self::addRegularQueryStringParameters($finalUrl, $parameters);
} else {
foreach ($parameters as $paramKey => $paramValue) {
$delimiter = (strpos($finalUrl, "?") === false) ? "?" : "&";
$finalUrl .= $delimiter . $paramKey . "=" . $paramValue;
}
}
$url = $finalUrl;
}