Improved code when call refresh token

Author: thinkingmik

src/Andreoli/ApiProxy/ApiProxyServiceProvider.php

@@ -73,22 +73,20 @@ public function provides() {
      */
     private function registerErrorHandlers() {
         $this->app->error(function(ProxyException $ex) {
-            //if (\Request::ajax() && \Request::wantsJson()) {
+            if (\Request::ajax() && \Request::wantsJson()) {
                 return new JsonResponse([
                     'error' => $ex->errorType,
                     'error_description' => $ex->getMessage()
                 ], $ex->httpStatusCode, $ex->getHttpHeaders()
                 );
-            //}
+            }
 
-            /*
             return \View::make('api-proxy-laravel::proxy_error', array(
                 'header' => $ex->getHttpHeaders()[0],
                 'code' => $ex->httpStatusCode,
                 'error' => $ex->errorType,
                 'message' => $ex->getMessage()
             ));
-            */
         });
     }
 

src/Andreoli/ApiProxy/Managers/RequestManager.php

@@ -93,22 +93,17 @@ public function executeRequest($inputs, $parsedCookie) {
     private function tryRefreshToken($inputs, $parsedCookie) {
         $this->callMode = ProxyAux::MODE_REFRESH;
 
-        //TODO: remove and save additional params
-
         //Get a new access token from refresh token
         $inputs = $this->removeTokenExtraParams($inputs);
-        $inputs = $this->addRefreshExtraParams($inputs, $parsedCookie);
-        $proxyResponse = $this->replicateRequest($parsedCookie[ProxyAux::COOKIE_METHOD], $parsedCookie[ProxyAux::COOKIE_URI], $inputs);
+        $params = $this->addRefreshExtraParams(array(), $parsedCookie);
+        $proxyResponse = $this->replicateRequest($parsedCookie[ProxyAux::COOKIE_METHOD], $parsedCookie[ProxyAux::COOKIE_URI], $params);
 
         $content = $proxyResponse->getContent();
         if ($proxyResponse->getStatusCode() === 200 && array_key_exists(ProxyAux::ACCESS_TOKEN, $content)) {
             $this->callMode = ProxyAux::MODE_TOKEN;
             $parsedCookie[ProxyAux::ACCESS_TOKEN] = $content[ProxyAux::ACCESS_TOKEN];
             $parsedCookie[ProxyAux::REFRESH_TOKEN] = $content[ProxyAux::REFRESH_TOKEN];
 
-            //TODO: add additional saved params
-
-            $inputs = $this->removeRefreshTokenExtraParams($inputs);
             $inputs = $this->addTokenExtraParams($inputs, $parsedCookie);
             $proxyResponse = $this->replicateRequest($this->method, $this->uri, $inputs);
 
@@ -133,7 +128,7 @@ private function tryRefreshToken($inputs, $parsedCookie) {
      */
     private function replicateRequest($method, $uri, $inputs) {
         $guzzleResponse = $this->sendGuzzleRequest($method, $uri, $inputs);
-        $proxyResponse = new ProxyResponse(null, $guzzleResponse->getStatusCode(), $guzzleResponse->getReasonPhrase(), $guzzleResponse->getProtocolVersion(), $this->getResponseContent($guzzleResponse));
+        $proxyResponse = new ProxyResponse($guzzleResponse->getStatusCode(), $guzzleResponse->getReasonPhrase(), $guzzleResponse->getProtocolVersion(), $this->getResponseContent($guzzleResponse));
 
         return $proxyResponse;
     }
@@ -276,17 +271,4 @@ private function removeTokenExtraParams($inputs) {
         return $inputs;
     }
 
-    /**
-     * @param $inputs
-     * @return array
-     */
-    private function removeRefreshTokenExtraParams($inputs) {
-        $inputs = ProxyAux::removeQueryValue($inputs, ProxyAux::GRANT_TYPE);
-        $inputs = ProxyAux::removeQueryValue($inputs, ProxyAux::REFRESH_TOKEN);
-        $inputs = ProxyAux::removeQueryValue($inputs, ProxyAux::CLIENT_ID);
-        $inputs = ProxyAux::removeQueryValue($inputs, ProxyAux::CLIENT_SECRET);
-
-        return $inputs;
-    }
-    
 }

src/Andreoli/ApiProxy/Models/ProxyResponse.php

@@ -12,24 +12,18 @@
 
 class ProxyResponse {
 
-    private $clientId = null;
     private $statusCode = null;
     private $reasonPhrase = null;
     private $protocolVersion = null;
     private $content = null;
 
-    public function __construct($clientId, $statusCode, $reasonPhrase, $protoVersion, $content) {
-        $this->clientId = $clientId;
+    public function __construct($statusCode, $reasonPhrase, $protoVersion, $content) {
         $this->statusCode = $statusCode;
         $this->reasonPhrase = $reasonPhrase;
         $this->protocolVersion = $protoVersion;
         $this->content = $content;
     }
 
-    public function setClientId($client) {
-        $this->clientId = $client;
-    }
-
     public function setStatusCode($status) {
         $this->statusCode = $status;
     }
@@ -46,10 +40,6 @@ public function setContent($content) {
         $this->content = $content;
     }
 
-    public function getClientId() {
-        return $this->clientId;
-    }
-
     public function getStatusCode() {
         return $this->statusCode;
     }