Skip to content

Commit 9063f50

Browse files
committed
fix: salesforce refresh access token issue
1 parent 7ebd3fc commit 9063f50

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

includes/Actions/Salesforce/SalesforceController.php

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
namespace BitCode\FI\Actions\Salesforce;
88

9-
use WP_Error;
10-
use BitCode\FI\Flow\FlowController;
119
use BitCode\FI\Core\Util\HttpHelper;
10+
use BitCode\FI\Flow\FlowController;
11+
use WP_Error;
1212

1313
class SalesforceController
1414
{
@@ -472,23 +472,24 @@ protected static function refreshAccessToken($apiData)
472472
|| empty($apiData->clientId)
473473
|| empty($apiData->clientSecret)
474474
|| empty($apiData->tokenDetails)
475-
|| empty($apiData->redirectURI)
476475
) {
477476
return false;
478477
}
479478

480479
$tokenDetails = $apiData->tokenDetails;
481480

482-
$apiEndpoint = 'https://login.salesforce.com/services/oauth2/token?grant_type=refresh_token&client_id=' . $apiData->clientId . '&client_secret=' . $apiData->clientSecret . '&redirect_uri=' . $apiData->redirectURI . '&refresh_token=' . $tokenDetails->refresh_token;
483-
$requestParams = [
484-
'grant_type' => 'refresh_token',
485-
'client_id' => $apiData->clientId,
486-
'client_secret' => $apiData->clientSecret,
487-
'redirect_uri' => urldecode($apiData->redirectURI),
488-
'refresh_token' => $tokenDetails->refresh_token
489-
];
481+
$apiQuery = http_build_query(
482+
[
483+
'grant_type' => 'refresh_token',
484+
'client_id' => $apiData->clientId,
485+
'client_secret' => $apiData->clientSecret,
486+
'refresh_token' => $tokenDetails->refresh_token
487+
]
488+
);
490489

491-
$apiResponse = HttpHelper::post($apiEndpoint, $requestParams);
490+
$apiEndpoint = 'https://login.salesforce.com/services/oauth2/token?' . $apiQuery;
491+
492+
$apiResponse = HttpHelper::post($apiEndpoint, null);
492493

493494
if (is_wp_error($apiResponse) || !empty($apiResponse->error)) {
494495
return false;

0 commit comments

Comments
 (0)