resolving rebase conflicts

bshaffer · bshaffer · commit aa9f887672cb · 2013-10-21T05:52:00.000-06:00
diff --git a/composer.json b/composer.json
@@ -3,7 +3,8 @@
         "silex/silex": "dev-master",
         "symfony/twig-bridge": "2.1.*",
         "bshaffer/oauth2-server-php": "v1.0",
-        "bshaffer/oauth2-server-httpfoundation-bridge": "v1.0"
+        "bshaffer/oauth2-server-httpfoundation-bridge": "v1.0",
+        "guzzle/guzzle": "~3.7"
     },
     "autoload" : {
         "psr-0": {
diff --git a/src/OAuth2Demo/Client/Controllers/RequestResource.php b/src/OAuth2Demo/Client/Controllers/RequestResource.php
@@ -3,6 +3,7 @@
 namespace OAuth2Demo\Client\Controllers;
 
 use Silex\Application;
+use Guzzle\Http\Client;
 
 class RequestResource
 {
@@ -16,7 +17,6 @@ public function requestResource(Application $app)
         $twig   = $app['twig'];          // used to render twig templates
         $config = $app['parameters'];    // the configuration for the current oauth implementation
         $urlgen = $app['url_generator']; // generates URLs based on our routing
-        $curl   = $app['curl'];          // simple class used to make curl requests
 
         // pull the token from the request
         $token = $app['request']->get('token');
@@ -29,7 +29,11 @@ public function requestResource(Application $app)
         $endpoint = 0 === strpos($apiRoute, 'http') ? $apiRoute : $urlgen->generate($apiRoute, array(), true);
 
         // make the resource request via curl and decode the json response
-        $response = $curl->request($endpoint, $config['resource_params'], $config['resource_method'], $config['curl_options']);
+        $http = new Client();
+        $method = $config['resource_method'];
+        $request = $http->$method($endpoint, $config['resource_params'], $config['curl_options']);
+        $response = $request->send();
+
         $json = json_decode($response['response'], true);
 
         $resource_uri = sprintf('%s%saccess_token=%s', $endpoint, false === strpos($endpoint, '?') ? '?' : '&', $token);
diff --git a/src/OAuth2Demo/Client/Controllers/RequestToken.php b/src/OAuth2Demo/Client/Controllers/RequestToken.php
@@ -3,6 +3,7 @@
 namespace OAuth2Demo\Client\Controllers;
 
 use Silex\Application;
+use Guzzle\Http\Client;
 
 class RequestToken
 {
@@ -18,7 +19,6 @@ public function requestTokenWithAuthCode(Application $app)
         $twig   = $app['twig'];          // used to render twig templates
         $config = $app['parameters'];    // the configuration for the current oauth implementation
         $urlgen = $app['url_generator']; // generates URLs based on our routing
-        $curl   = $app['curl'];          // simple class used to make curl requests
 
         $code = $app['request']->get('code');
 
@@ -35,6 +35,11 @@ public function requestTokenWithAuthCode(Application $app)
         $grantRoute = $config['token_route'];
         $endpoint = 0 === strpos($grantRoute, 'http') ? $grantRoute : $urlgen->generate($grantRoute, array(), true);
 
+        $options = array('debug' => true, 'exceptions' => false, 'proxy' => '127.0.0.1:8888');
+        $http = new Client(null);
+        $request = $http->post($endpoint, null, $query, $options);
+        $response = $request->send();
+
         // make the token request via curl and decode the json response
         $response = $curl->request($endpoint, $query, 'POST', $config['curl_options']);
         $json = json_decode($response['response'], true);
diff --git a/src/OAuth2Demo/Client/Http/Curl.php b/src/OAuth2Demo/Client/Http/Curl.php
