From 06eb5f916a66c79cd25ca9969489993fa5f08e53 Mon Sep 17 00:00:00 2001 From: Dasc3er Date: Thu, 5 Aug 2021 12:31:47 +0200 Subject: [PATCH] Fix gestione invio email tramite OAuth2 --- modules/emails/src/EmailHook.php | 6 ++---- modules/emails/src/OAuth2.php | 5 ++++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/emails/src/EmailHook.php b/modules/emails/src/EmailHook.php index dc55724cd..f46fbd426 100755 --- a/modules/emails/src/EmailHook.php +++ b/modules/emails/src/EmailHook.php @@ -67,7 +67,7 @@ class EmailHook extends Manager // Selezione email per account $accounts = Account::all(); - $lista = []; + $lista = collect(); foreach ($accounts as $account) { // Ultima email inviata per l'account $last_mail = $account->emails() @@ -90,9 +90,7 @@ class EmailHook extends Manager ->take($numero_email) ->get(); - if (!empty($lista_account)) { - $lista = array_merge($lista, $lista_account); - } + $lista = $lista->concat($lista_account); } } diff --git a/modules/emails/src/OAuth2.php b/modules/emails/src/OAuth2.php index bc4c515f3..9f80ffe38 100644 --- a/modules/emails/src/OAuth2.php +++ b/modules/emails/src/OAuth2.php @@ -170,7 +170,10 @@ class OAuth2 public function updateTokens($access_token, $refresh_token) { $this->account->access_token = serialize($access_token); - $this->account->refresh_token = $refresh_token; + + $previous_refresh_token = $this->account->refresh_token; + $this->account->refresh_token = $refresh_token ?: $previous_refresh_token; + $this->account->save(); }