add header access token

Author: thinkingmik

src/Andreoli/ApiProxy/Managers/RequestManager.php

@@ -23,6 +23,7 @@ class RequestManager {
     private $callMode = null;
     private $clientSecrets = null;
     private $cookieManager = null;
+    private $useHeader = false;
 
     public function __construct($uri, $method, $clientSecrets, $callMode, $cookieManager) {
         $this->uri = $uri;
@@ -32,6 +33,10 @@ public function __construct($uri, $method, $clientSecrets, $callMode, $cookieMan
         $this->cookieManager = $cookieManager;
     }
 
+    public function enableHeader() {
+        $this->useHeader = true;
+    }
+
     /**
      * @param $inputs
      * @param $parsedCookie
@@ -80,23 +85,33 @@ public function executeRequest($inputs, $parsedCookie) {
     private function refreshToken($proxyResponse, $inputs, $parsedCookie) {
         $cookie = null;
         if ($proxyResponse->getStatusCode() != 200 && array_key_exists(ProxyAux::REFRESH_TOKEN, $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);
 
             $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);
 
                 //Set a new cookie with updated access token and refresh token
                 $cookie = $this->cookieManager->createCookie($parsedCookie);
             }
+            else {
+                $cookie = $this->cookieManager->destroyCookie();
+            }
         }
 
         return array(
@@ -143,12 +158,20 @@ private function getResponseContent($response) {
     private function sendGuzzleRequest($method, $uriVal, $inputs) {
         $options = array();
         $client = new Client();
+
+        if ($this->callMode === ProxyAux::MODE_TOKEN && $this->useHeader === true) {
+            $accessToken = ProxyAux::getQueryValue($inputs, ProxyAux::ACCESS_TOKEN);
+            $inputs = ProxyAux::removeQueryValue($inputs, ProxyAux::ACCESS_TOKEN);
+            $options = array_add($options, 'headers', [ ProxyAux::HEADER_AUTH => 'Bearer ' . $accessToken ]);
+        }
+
         if ($method === 'GET') {
             $options = array_add($options, 'query', $inputs);
         }
         else {
             $options = array_add($options, 'body', $inputs);
         }
+
         $request = $client->createRequest($method, $uriVal, $options);
 
         try {

src/Andreoli/ApiProxy/Proxy.php

@@ -25,12 +25,14 @@ class Proxy {
     private $redirectUri = null;
     private $clientSecrets = null;
     private $cookieManager = null;
+    private $useHeader = false;
 
     public function __construct($params) {
         $this->uriParam = $params['uri_param'];
         $this->skipParam = $params['skip_param'];
         $this->redirectUri = $params['redirect_login'];
         $this->clientSecrets = $params['client_secrets'];
+        $this->useHeader = $params['use_header'];
         $this->cookieManager = new CookieManager($params['cookie_info']);
     }
 
@@ -66,6 +68,9 @@ public function makeRequest($method, Array $inputs) {
 
         //Create the new request
         $requestManager  = new RequestManager($this->uri, $method, $this->clientSecrets, $this->callMode, $this->cookieManager);
+        if ($this->useHeader) {
+            $requestManager->enableHeader();
+        }
         $proxyResponse = $requestManager->executeRequest($inputs, $parsedCookie);
 
         return $this->setApiResponse($proxyResponse['response'], $proxyResponse['cookie']);

src/Andreoli/ApiProxy/ProxyAux.php

@@ -22,9 +22,11 @@ class ProxyAux {
     const COOKIE_URI = 'uri';
     const COOKIE_METHOD = 'method';
     const PASSWORD_GRANT = 'password';
+    const HEADER_AUTH = "Authorization";
     const MODE_SKIP = '0';
     const MODE_LOGIN = '1';
     const MODE_TOKEN = '2';
+    const MODE_REFRESH = '3';
 
     /**
      * @param $array

src/config/proxy.php

@@ -57,6 +57,16 @@
         'time' => 5
     ],
 
+    /*
+      |--------------------------------------------------------------------------
+      |  Access token send into header
+      |--------------------------------------------------------------------------
+      |
+      | If it is true the access_token was sent to oauth server into request's header.
+      |
+     */
+    'use_header' => false,
+
     /*
       |--------------------------------------------------------------------------
       |  List of client secret