refactory

Services/Webservice.php

@@ -5,6 +5,7 @@ namespace WebserviceBundle\Services;
 use Buzz\Message\Request as HttpRequest;
 use Buzz\Message\RequestInterface as HttpRequestInterface;
 use Buzz\Message\Response as HttpResponse;
+use Buzz\Browser;
 
 class Webservice
 {
@@ -54,8 +55,7 @@ class Webservice
                 $url .= "&filters[{$param}]=$value";
             }
             try {
-                $response = $this->makeGetRequest($url);
-                $results = json_decode($response->getContent(), true);
+                $results = json_decode($this->makeGetRequest($url), true);
             } catch (\Exception $ex) {
                 
             }
@@ -72,12 +72,14 @@ class Webservice
     {
         $response = '';
         if ($token = $this->securityTokenStorage->getToken()) {
-            $accessToken = $token->getAccessToken();
-
             $request = new HttpRequest(HttpRequestInterface::METHOD_GET, $url);
             $response = new HttpResponse();
-            $request->setHeaders(array('Authorization: Bearer ' . $accessToken));
+            if (method_exists($token, 'getAccessToken')) {
+                $request->setHeaders(array('Authorization: Bearer ' . $token->getAccessToken()));
+            }
+            
             $this->httpClient->send($request, $response);
+            $response = $response->getContent();
         }
         
         return $response;
@@ -115,13 +117,11 @@ class Webservice
 
             $data = array();
             try {
-                $data = json_decode(file_get_contents($url), true);
+                $data = json_decode($this->makeGetRequest($url), true);
             } catch (\Exception $ex) {
 
             }
 
-            //$data['url'] = $url;
-
             return $data;
         }