fix #244

Author: hlu2

src/Core/OAuth/OAuth2/OAuth2LoginHelper.php

@@ -375,15 +375,23 @@ public function validateIDToken($idToken){
      * @param String $scope                 The scope of the key
      * @return OAuth2AccessToken
      */
-    public function OAuth1ToOAuth2Migration($consumerKey, $consumerSecret, $accessToken, $accessTokenSecret, $scope){
+    public function OAuth1ToOAuth2Migration($consumerKey, $consumerSecret, $accessToken, $accessTokenSecret, $scope, $redirectUri = null, $environment = "Sandbox"){
         $oauth1Encrypter = new OAuth1($consumerKey, $consumerSecret, $accessToken, $accessTokenSecret);
+        if(!isset($redirectUri)){
+           $redirectUri = "https://developer.intuit.com/v2/OAuth2Playground/RedirectUrl";
+        }
+
+        if(strcasecmp($environment, "Sandbox") == 0){
+           $baseURL = "https://developer-sandbox.api.intuit.com/v2/oauth2/tokens/migrate";
+        }else{
+           $baseURL = "https://developer.api.intuit.com/v2/oauth2/tokens/migrate";
+        }
         $parameters = array(
           'scope' => $scope,
-          'redirect_uri' => "https://developer.intuit.com/v2/OAuth2Playground/RedirectUrl",
+          'redirect_uri' => $redirectUri,
           'client_id' => $this->getClientID(),
           'client_secret' => $this->getClientSecret()
         );
-        $baseURL = "https://developer.api.intuit.com/v2/oauth2/tokens/migrate";
         $authorizationHeaderInfo = $oauth1Encrypter->getOAuthHeader($baseURL, array(), "POST");
         $http_header = array(
           'Accept' => 'application/json',
@@ -425,7 +433,7 @@ private function parseNewAccessTokenFromResponse($body, $realmID = null){
               $refreshToken = $json_body[CoreConstants::OAUTH2_REFRESH_GRANTYPE];
               $refreshTokenExpiresTime = $json_body[CoreConstants::X_REFRESH_TOKEN_EXPIRES_IN];
               $accessToken = $json_body[CoreConstants::ACCESS_TOKEN];
-              if(array_key_exists("id_token", $json_body)){
+              if(array_key_exists("id_token", $json_body) && isset($json_body["id_token"]) && !empty($json_body["id_token"])){
                 $idToken = $json_body["id_token"];
                 $result = $this->validateIDToken($idToken);
                 if(!$result){

src/_Samples/MigrateOAuth1ToOAuth2.php

@@ -0,0 +1,22 @@
+<?php
+//Replace the line with require "vendor/autoload.php" if you are using the Samples from outside of _Samples folder
+include('../config.php');
+
+use QuickBooksOnline\API\Core\ServiceContext;
+use QuickBooksOnline\API\DataService\DataService;
+use QuickBooksOnline\API\PlatformService\PlatformService;
+use QuickBooksOnline\API\Core\Http\Serialization\XmlObjectSerializer;
+
+
+$dataService = DataService::Configure(array(
+  'auth_mode' => 'oauth2',
+  'ClientID' => "L0I9uqpOVAXN0MKrK15dCHLWqqfvWzvFS5S0VnKezX0cDbsLlI",
+  'ClientSecret' => "qJEjqG3wyzOFvl9WhwSnskJYHWoFlvID7k1iF1as",
+  'RedirectURI' => "https://b200efd8.ngrok.io/OAuth2_c/OAuth_2/OAuth2PHPExample.php",
+  'scope' => "com.intuit.quickbooks.accounting",
+  'baseUrl' => "production"
+));
+
+$OAuth2LoginHelper = $dataService->getOAuth2LoginHelper();
+$result = $OAuth2LoginHelper->OAuth1ToOAuth2Migration("qyprdfv4WnI3X47vpYJAkbvDKKT33J", "0mWGSoIWq2q8tDHEvmKjG34rBO8pqyhiJZdS1n4U", "qyprdEUxdMv94gvvJhQtZaCxJcU19RiEE9BLbVYBeicbWWis", "tKUFEl7fJTuzKrzgnouJYmqJaTSE31lgbGfY8hDb", "com.intuit.quickbooks.accounting", null, "Production");
+var_dump($result);