Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Debug refresh action and add log in oauth

Browse Source
This commit is contained in:
Laurent Destailleur
2024-08-13 14:59:03 +02:00
parent 080c1fa41c
commit 14dfe8a073
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/admin/oauthlogintokens.php
View File

@@ -145,13 +145,15 @@ if ($action == 'refreshtoken' && $user->admin) {
//var_dump($expire); //var_dump($expire);
// We do the refresh even if not expired, this is the goal of action. // We do the refresh even if not expired, this is the goal of action.
$credentials = new Credentials(
getDolGlobalString('OAUTH_'.strtoupper($OAUTH_SERVICENAME).'_ID'),
getDolGlobalString('OAUTH_'.strtoupper($OAUTH_SERVICENAME).'_SECRET'),
getDolGlobalString('OAUTH_'.strtoupper($OAUTH_SERVICENAME).'_URLAUTHORIZE')
);
$serviceFactory = new \OAuth\ServiceFactory();
$oauthname = explode('-', $OAUTH_SERVICENAME); $oauthname = explode('-', $OAUTH_SERVICENAME);
$keyforoauthservice = strtoupper($oauthname[0]).(empty($oauthname[1]) ? '' : '-'.$oauthname[1]);
$credentials = new Credentials(
getDolGlobalString('OAUTH_'.$keyforoauthservice.'_ID'),
getDolGlobalString('OAUTH_'.$keyforoauthservice.'_SECRET'),
getDolGlobalString('OAUTH_'.$keyforoauthservice.'_URLAUTHORIZE')
);
$serviceFactory = new \OAuth\ServiceFactory();
// ex service is Google-Emails we need only the first part Google // ex service is Google-Emails we need only the first part Google
$apiService = $serviceFactory->createService($oauthname[0], $credentials, $storage, array()); $apiService = $serviceFactory->createService($oauthname[0], $credentials, $storage, array());

14
htdocs/includes/OAuth/Common/Http/Client/StreamClient.php
View File

@@ -60,12 +60,14 @@ class StreamClient extends AbstractClient
//var_dump($requestBody); var_dump($extraHeaders);var_dump($method);exit; //var_dump($requestBody); var_dump($extraHeaders);var_dump($method);exit;
$context = $this->generateStreamContext($requestBody, $extraHeaders, $method); $context = $this->generateStreamContext($requestBody, $extraHeaders, $method);
/* // @CHANGE DOL_LDR Add log
var_dump($endpoint->getAbsoluteUri()); if (function_exists('getDolGlobalString') && getDolGlobalString('OAUTH_DEBUG')) {
var_dump($requestBody); file_put_contents(DOL_DATA_ROOT . "/dolibarr_oauth.log", $endpoint->getAbsoluteUri()."\n", FILE_APPEND);
var_dump($method); file_put_contents(DOL_DATA_ROOT . "/dolibarr_oauth.log", $requestBody."\n", FILE_APPEND);
var_dump($extraHeaders); file_put_contents(DOL_DATA_ROOT . "/dolibarr_oauth.log", $method."\n", FILE_APPEND);
*/ file_put_contents(DOL_DATA_ROOT . "/dolibarr_oauth.log", var_export($extraHeaders, true)."\n", FILE_APPEND);
@chmod(DOL_DATA_ROOT . "/dolibarr_oauth.log", octdec(empty($conf->global->MAIN_UMASK)?'0664':$conf->global->MAIN_UMASK));
}
$level = error_reporting(0); $level = error_reporting(0);
$response = file_get_contents($endpoint->getAbsoluteUri(), false, $context); $response = file_get_contents($endpoint->getAbsoluteUri(), false, $context);