Fix #58, #55, #52, #25

Update Refresh Token part for OAuth 2 Fix bugs that cause cURL is not closed correctly
intuit · Aug 17, 2017 · ae806ee · ae806ee
1 parent 60efee4
commit ae806ee
Show file tree

Hide file tree

Showing 20 changed files with 4,813 additions and 90 deletions.
diff --git a/src/Core/Configuration/LocalConfigReader.php b/src/Core/Configuration/LocalConfigReader.php
@@ -246,11 +246,12 @@ public static function initializeOAuthSettings($xmlObj, $ippConfig, $OAuthOption
             // Set SSL check status to be true
             $ippConfig->SSLCheckStatus = true;
             $currentOAuth2AccessTokenKey = $xmlObj->intuit->ipp->security->oauth2->attributes()['accessTokenKey'];
-            $currentOAuth2RefreshTokenKey = $xmlObj->intuit->ipp->security->oauth1->attributes()['refreshTokenKey'];
-            $currentConsumerKey = $xmlObj->intuit->ipp->security->oauth1->attributes()['ClientID'];
-            $currentConsumerSecret =    $xmlObj->intuit->ipp->security->oauth1->attributes()['ClientSecret'];
-            $ippConfig->RealmID =  $xmlObj->intuit->ipp->security->oauth1->attributes()['QBORealmID'];
-            $OAuth2AccessToken = new OAuth2AccessToken($currentOAuth2AccessTokenKey, $currentOAuth2RefreshTokenKey, $currentConsumerKey, $currentConsumerSecret);
+            $currentOAuth2RefreshTokenKey = $xmlObj->intuit->ipp->security->oauth2->attributes()['refreshTokenKey'];
+            $clientID = $xmlObj->intuit->ipp->security->oauth2->attributes()['ClientID'];
+            $clientSecret =    $xmlObj->intuit->ipp->security->oauth2->attributes()['ClientSecret'];
+            $ippConfig->RealmID =  $xmlObj->intuit->ipp->security->oauth2->attributes()['QBORealmID'];
+            $OAuth2AccessToken = new OAuth2AccessToken($clientID, $clientSecret, $currentOAuth2AccessTokenKey, $currentOAuth2RefreshTokenKey);
+
             $ippConfig->Security = $OAuth2AccessToken;
             $ippConfig->OAuthMode = CoreConstants::OAUTH2;
          } else {

diff --git a/src/Core/CoreConstants.php b/src/Core/CoreConstants.php
@@ -117,6 +117,12 @@ class CoreConstants
      */
     const RESOURCE = "resource";
 
+    /**
+     * The Content Type String.
+     * @var string CONTENT_TYPE
+     */
+    const CONTENT_TYPE = "Content-Type";
+
     /**
      * Content type: text/xml.
      * @var string CONTENTTYPE_TEXTXML
@@ -170,9 +176,14 @@ class CoreConstants
      * @var string QBO_BASEURL
      */
     const QBO_BASEURL = "https://quickbooks.api.intuit.com/";
+    const PRODUCTION_QBO = "Production";
+
 
     const IPP_BASEURL = "https://appcenter.intuit.com/api/";
 
+    const DEVELOPMENT_SANDBOX = "Development";
+    const SANDBOX_DEVELOPMENT = "https://sandbox-quickbooks.api.intuit.com";
+
     /**
      * Id Parameter Name.
      * @var string Id
@@ -255,7 +266,7 @@ class CoreConstants
      * The Request source header value.
      * @var string REQUESTSOURCEHEADER
      */
-    const USERAGENT = "V3PHPSDK3.3.0";
+    const USERAGENT = "V3PHPSDK3.4.0";
 
     public static function getType($string, $return=1)
     {
@@ -285,4 +296,14 @@ public static function getQuickBooksOnlineAPIEntityRules()
                                     "IPPEstimate"     => array( "DownloadPDF" => true, "SendEmail" => true  ),
                             );
     }
+
+    //--------------------------------------------------------------------------------------------------
+    //OAuth 2
+    const OAUTH2_TOKEN_ENDPOINT_URL = "https://oauth.platform.intuit.com/oauth2/v1/tokens/bearer";
+    const OAUTH2_REFRESH_GRANTYPE = "refresh_token";
+    const OAUTH2_AUTHORIZATION_TYPE = "Basic ";
+    const EXPIRES_IN = "expires_in";
+    const X_REFRESH_TOKEN_EXPIRES_IN = "x_refresh_token_expires_in";
+    const ACCESS_TOKEN = "access_token";
+
 }
diff --git a/src/Core/HttpClients/BaseCurl.php b/src/Core/HttpClients/BaseCurl.php
@@ -83,10 +83,12 @@ public function getInfo($type)
 
   /**
    * Close the resource connection to curl
+   * Remove the pointer after closed 
   */
   public function close()
   {
       curl_close($this->curl);
+      $this->curl = null;
   }
 }
 

diff --git a/src/Core/HttpClients/CurlHttpClient.php b/src/Core/HttpClients/CurlHttpClient.php
@@ -86,7 +86,6 @@ private function getIntuitResponse(){
     }
 
     private function intializeCurl(){
-
         if($this->basecURL->isCurlSet()){ return; }
         else {$this->basecURL->init();}
     }
@@ -104,7 +103,7 @@ private function setSSL(&$curl_opt, $verifySSL){
       if($verifySSL){
           $curl_opt[CURLOPT_SSL_VERIFYPEER] = true;
           $curl_opt[CURLOPT_SSL_VERIFYHOST] = 2;
-          $curl_opt[CURLOPT_CAINFO] = dirname(dirname(__FILE__)) . "/OAuth/OAuth2/certs/apiintuitcom.pem"; //Pem certification Key Path
+          $curl_opt[CURLOPT_CAINFO] = dirname(dirname(__FILE__)) . "/OAuth/OAuth2/certs/cacert.pem"; //Pem certification Key Path
       }
     }
 

diff --git a/src/Core/HttpClients/FaultHandler.php b/src/Core/HttpClients/FaultHandler.php
@@ -110,12 +110,19 @@ public function getIntuitErrorMessage(){
     public function getIntuitErrorDetail(){
         return $this->intuitErrorDetail;
     }
-    public function parseResponse($message){
+
+    /**
+     * Only parse XML format to string values now
+     */
+    public function parseResponse($message, $contentType){
       if(!$this->isValidXml($message)){
           return;
       }
-
       $xmlObj = simplexml_load_string($message);
+
+      if(!$this->isStandardFormat($xmlObj)){
+          return;
+      }
       $type = (string)$xmlObj->Fault->attributes()['type'];
       if(isset($type) && !empty($type)){
         $this->intuitErrorType = $type;
@@ -138,8 +145,19 @@ public function parseResponse($message){
 
     }
 
+    /**
+     * Check if the format is standard Intuit Response format
+     */
+    private function isStandardFormat($xmlObj)
+    {
+        if(!isset($xmlObj->Fault) || !isset($xmlObj->Fault->Error)){
+           return false;
+        }
+        return true;
+    }
+
     private function isValidXml($content)
-   {
+    {
       $content = trim($content);
       if (empty($content)) {
           return false;

diff --git a/src/Core/HttpClients/IntuitResponse.php b/src/Core/HttpClients/IntuitResponse.php
@@ -2,6 +2,9 @@
 namespace QuickBooksOnline\API\Core\HttpClients;
 
 use QuickBooksOnline\API\Exception\SdkException;
+use QuickBooksOnline\API\Core\CoreConstants;
+
+
 
 class IntuitResponse{
 
@@ -13,6 +16,8 @@ class IntuitResponse{
 
    private $faultHandler;
 
+   private $contentType;
+
    public function __construct($passedHeaders, $passedBody, $passedHttpResponseCode){
           if(isset($passedHeaders)){
               $this->setHeaders($passedHeaders);
@@ -32,7 +37,7 @@ public function __construct($passedHeaders, $passedBody, $passedHttpResponseCode
                  $this->faultHandler = new FaultHandler();
                  $this->faultHandler->setHttpStatusCode($this->httpResponseCode);
                  $this->faultHandler->setResponseBody($this->body);
-                 $this->faultHandler->parseResponse($this->body);
+                 $this->faultHandler->parseResponse($this->body, $this->contentType);
                  //Manually set the error message
                  $this->faultHandler->setOAuthHelperError("Invalid auth/bad request (got a " .$passedHttpResponseCode . ", expected HTTP/1.1 20X or a redirect)");
               }
@@ -50,11 +55,20 @@ public function setHeaders($rawHeaders){
             }else {
                 list($key, $value) = explode(': ', $line);
                 $this->headers[$key] = $value;
+                //set response content type
+                $this->setContentType($key, $value);
             }
         }
 
    }
 
+   private function setContentType($key, $val){
+     $trimedKey = trim($key);
+     if(strcasecmp($trimedKey, CoreConstants::CONTENT_TYPE) == 0){
+         $this->contentType = trim($val);
+     }
+   }
+
    public function getHeaders(){
        return $this->headers;
    }
@@ -71,4 +85,8 @@ public function getFaultHandler(){
        return $this->faultHandler;
    }
 
+   public function getResponseContentType(){
+       return $this->contentType;
+   }
+
 }
diff --git a/src/Core/HttpClients/RestHandler.php b/src/Core/HttpClients/RestHandler.php
@@ -41,6 +41,12 @@ class RestHandler
      */
     protected $RequestSerializer;
 
+    /**
+     * Get the Logging component for the REST service
+     * @var RequestLogging
+     */
+    protected $RequestLogging;
+
     /**
      *
      * Initializes a new instance of the RestHandler class.

diff --git a/src/Core/HttpClients/SyncRestHandler.php b/src/Core/HttpClients/SyncRestHandler.php
@@ -46,6 +46,14 @@ public function __construct($context)
         return $this;
     }
 
+    public function updateContext($newServiceContext){
+        if($newServiceContext instanceof ServiceContext){
+            $this->context = $newServiceContext;
+        }else{
+           throw new SdkException("Cannot Update Service Context.");
+        }
+    }
+
     //----------------New Added Method to get Last error
     /**
   * Return an representation of an error returned by the last request, or null