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

FIX use of a google print oauth token restored. No more conflict with

Browse Source 
other tokens.
This commit is contained in:
ldestailleur
2025-07-20 17:15:14 +02:00
parent 689ca56d8f
commit 449109d0ba
3 changed files with 43 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/includes/OAuth/Common/Storage/DoliStorage.php
View File

@@ -164,9 +164,9 @@ class DoliStorage implements TokenStorageInterface
/**
* Load token and other data from a $service
* Note: Token load are cumulated into array ->tokens when other properties are erased by last loaded token.
* Note: Token load is cumulated into array $this->tokens but other properties are just erased by the last loaded token.
*
* @return void
* @return boolean True if success and a token exists, false if not
*/
public function hasAccessToken($service)
{
@@ -184,14 +184,21 @@ class DoliStorage implements TokenStorageInterface
$sql = "SELECT token, datec, tms, state FROM ".MAIN_DB_PREFIX."oauth_token";
$sql .= " WHERE service = '".$this->db->escape($servicepluskeyforprovider)."'";
$sql .= " AND entity IN (".getEntity('oauth_token').")";
$resql = $this->db->query($sql);
if (! $resql) {
dol_print_error($this->db);
}
$result = $this->db->fetch_array($resql);
if ($result) {
include_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
$tokenobj = unserialize(dolDecrypt($result['token']));
if ($result['token'] && empty($tokenobj)) {
dol_syslog("Error: We found a record for the OAuth token of '.$servicepluskeyforprovider.', we we failed to decrypt it. May be the crypt/decrypt key has been modifier ?", LOG_WARNING);
//print "Error: We found a record for the OAuth token of ".$servicepluskeyforprovider.", we we failed to decrypt it. May be the crypt/decrypt key has been modifier ?";
return false;
}
$this->token = dolDecrypt($result['token']);
$this->date_creation = $this->db->jdate($result['datec']);
$this->date_modification = $this->db->jdate($result['tms']);