From b748665296de45a4805c6913c651ae88f751d5ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 11 Aug 2022 10:16:20 +0200
Subject: [PATCH] token was not refreshing

---
 htdocs/core/class/CMailFile.class.php | 42 ++++++++++-----------------
 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 9aa761419a2..69a5b0ba902 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -984,38 +984,28 @@ class CMailFile
 					$storage = new DoliStorage($db, $conf);
 
 					try {
-						$token_ok = true;
-						try {
-							$tokenobj = $storage->retrieveAccessToken($OAUTH_SERVICENAME);
-						} catch (Exception $e) {
-							$this->errors[] = $e->getMessage();
-							$token_ok = false;
-						}
+						$tokenobj = $storage->retrieveAccessToken($OAUTH_SERVICENAME);
 						$expire = false;
 						// Is token expired or will token expire in the next 30 seconds
 						if (is_object($tokenobj)) {
 							$expire = ($tokenobj->getEndOfLife() !== -9002 && $tokenobj->getEndOfLife() !== -9001 && time() > ($tokenobj->getEndOfLife() - 30));
 						}
 						// Token expired so we refresh it
-						if ($token_ok && $expire) {
-							try {
-								$credentials = new Credentials(
-									getDolGlobalString('OAUTH_'.$conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE.'_ID'),
-									getDolGlobalString('OAUTH_'.$conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE.'_SECRET'),
-									getDolGlobalString('OAUTH_'.$conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE.'_URLAUTHORIZE')
-								);
-								$serviceFactory = new \OAuth\ServiceFactory();
-								$oauthname = explode('-', $OAUTH_SERVICENAME);
-								// ex service is Google-Emails we need only the first part Google
-								$apiService = $serviceFactory->createService($oauthname[0], $credentials, $storage, array());
-								// il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
-								$refreshtoken = $tokenobj->getRefreshToken();
-								$tokenobj = $apiService->refreshAccessToken($tokenobj);
-								$tokenobj->setRefreshToken($refreshtoken);
-								$storage->storeAccessToken($OAUTH_SERVICENAME, $tokenobj);
-							} catch (Exception $e) {
-								$this->errors[] = $e->getMessage();
-							}
+						if (is_object($tokenobj) && $expire) {
+							$credentials = new Credentials(
+								getDolGlobalString('OAUTH_'.$conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE.'_ID'),
+								getDolGlobalString('OAUTH_'.$conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE.'_SECRET'),
+								getDolGlobalString('OAUTH_'.$conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE.'_URLAUTHORIZE')
+							);
+							$serviceFactory = new \OAuth\ServiceFactory();
+							$oauthname = explode('-', $OAUTH_SERVICENAME);
+							// ex service is Google-Emails we need only the first part Google
+							$apiService = $serviceFactory->createService($oauthname[0], $credentials, $storage, array());
+							// il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
+							$refreshtoken = $tokenobj->getRefreshToken();
+							$tokenobj = $apiService->refreshAccessToken($tokenobj);
+							$tokenobj->setRefreshToken($refreshtoken);
+							$storage->storeAccessToken($OAUTH_SERVICENAME, $tokenobj);
 						}
 						if (is_object($tokenobj)) {
 							$this->transport->setAuthMode('XOAUTH2');