From be86c40a6faefa97f5e0cd6bd0aeca8aa723e420 Mon Sep 17 00:00:00 2001
From: Dasc3er <Dasc3er@users.noreply.github.com>
Date: Thu, 23 Sep 2021 18:16:26 +0200
Subject: [PATCH] Miglioramenti minori OAuth2

---
 plugins/importFE/src/FatturaOrdinaria.php |  2 +-
 src/Models/OAuth2.php                     | 23 +++++++++++++++++++++++
 update/2_4_26.sql                         |  1 -
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/plugins/importFE/src/FatturaOrdinaria.php b/plugins/importFE/src/FatturaOrdinaria.php
index 429bd2567..69fc51795 100755
--- a/plugins/importFE/src/FatturaOrdinaria.php
+++ b/plugins/importFE/src/FatturaOrdinaria.php
@@ -162,7 +162,7 @@ class FatturaOrdinaria extends FatturaElettronica
             if (!empty($articolo)) {
                 $articolo->idconto_acquisto = $conto[$key];
                 $articolo->save();
-                
+
                 $obj = Articolo::build($fattura, $articolo);
 
                 $obj->movimentazione($movimentazione);
diff --git a/src/Models/OAuth2.php b/src/Models/OAuth2.php
index 13fd44277..f5affef56 100644
--- a/src/Models/OAuth2.php
+++ b/src/Models/OAuth2.php
@@ -22,6 +22,7 @@ namespace Models;
 use Common\SimpleModelTrait;
 use Illuminate\Database\Eloquent\Model;
 use InvalidArgumentException;
+use League\OAuth2\Client\Provider\AbstractProvider;
 use League\OAuth2\Client\Provider\Exception\IdentityProviderException;
 use League\OAuth2\Client\Token\AccessToken;
 
@@ -37,6 +38,9 @@ class OAuth2 extends Model
         'config' => 'array',
     ];
 
+    /**
+     * @return AbstractProvider
+     */
     public function getProvider()
     {
         // Inizializza il provider per l'autenticazione OAuth2.
@@ -147,6 +151,25 @@ class OAuth2 extends Model
         return unserialize($this->attributes['access_token']);
     }
 
+    /**
+     * Effettua una richiesta utilizzando il token di accesso prestabilito.
+     *
+     * @param string $method
+     * @param string $url
+     * @param array  $options
+     *
+     * @return array
+     */
+    public function request($method, $url, $options = [])
+    {
+        $provider = $this->getProvider();
+        $accessToken = $this->getAccessToken();
+
+        $request = $provider->getAuthenticatedRequest($method, $url, $accessToken, $options);
+
+        return $provider->getParsedResponse($request);
+    }
+
     /**
      * Imposta Access Token e Refresh Token per l'autenticazione OAuth2.
      *
diff --git a/update/2_4_26.sql b/update/2_4_26.sql
index 81c7ba69e..4c1945ccf 100644
--- a/update/2_4_26.sql
+++ b/update/2_4_26.sql
@@ -121,7 +121,6 @@ CREATE TABLE IF NOT EXISTS `zz_oauth2` (
     `after_configuration` text DEFAULT NULL,
     `created_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
     `updated_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-    `deleted_at` timestamp NULL DEFAULT NULL,
     PRIMARY KEY (`id`)
 ) ENGINE=InnoDB;