setAccessToken

kawax · May 13, 2018 · e0360ee · e0360ee
1 parent 2b2becb
commit e0360ee
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 10 deletions.
diff --git a/src/GoogleSheets/Sheets.php b/src/GoogleSheets/Sheets.php
@@ -3,6 +3,7 @@
 namespace Revolution\Google\Sheets;
 
 use Google_Service_Sheets;
+use PulkitJalan\Google\Facades\Google;
 
 use Illuminate\Support\Traits\Macroable;
 
@@ -50,6 +51,25 @@ public function getService(): Google_Service_Sheets
         return $this->service;
     }
 
+    /**
+     * set access_token and set new service
+     *
+     * @param string|array $token
+     *
+     * @return $this
+     */
+    public function setAccessToken($token)
+    {
+        Google::setAccessToken($token);
+
+        if (isset($token['refresh_token']) and Google::isAccessTokenExpired()) {
+            Google::fetchAccessTokenWithRefreshToken();
+        }
+
+        return $this->setService(Google::make('sheets'))
+                    ->setDriveService(Google::make('drive'));
+    }
+
     /**
      * @param string $spreadsheetId
      *

diff --git a/src/GoogleSheets/SheetsInterface.php b/src/GoogleSheets/SheetsInterface.php
@@ -18,6 +18,15 @@ public function setService($service);
      */
     public function getService(): Google_Service_Sheets;
 
+    /**
+     * set access_token and set new service
+     *
+     * @param string|array $token
+     *
+     * @return $this
+     */
+    public function setAccessToken($token);
+
     /**
      * @param string $spreadsheetId
      *

diff --git a/src/GoogleSheets/Traits/GoogleSheets.php b/src/GoogleSheets/Traits/GoogleSheets.php
@@ -4,8 +4,6 @@
 
 use Revolution\Google\Sheets\SheetsInterface;
 
-use PulkitJalan\Google\Facades\Google;
-
 /**
  * use at User model
  */
@@ -19,14 +17,7 @@ public function sheets()
     {
         $token = $this->sheetsAccessToken();
 
-        Google::setAccessToken($token);
-
-        if (isset($token['refresh_token']) and Google::isAccessTokenExpired()) {
-            Google::fetchAccessTokenWithRefreshToken();
-        }
-
-        return app(SheetsInterface::class)->setService(Google::make('sheets'))
-                                          ->setDriveService(Google::make('drive'));
+        return app(SheetsInterface::class)->setAccessToken($token);
     }
 
     /**