Merge pull request #11 from erikn69/master

Fix readStream authentication/access token
masbug · Feb 4, 2021 · 5044178 · 5044178
2 parents 1766fcb + fc94ebe
commit 5044178
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/GoogleDriveAdapter.php b/src/GoogleDriveAdapter.php
@@ -626,9 +626,16 @@ public function readStream($path)
                 $dlurl = $this->getDownloadUrl($file);
                 $client = $this->service->getClient();
                 /** @var array|string|object $token */
-                $token = $client->getAccessToken();
+                if($client->isUsingApplicationDefaultCredentials()) {
+                    $token = $client->fetchAccessTokenWithAssertion();
+                } else {
+                    $token = $client->getAccessToken();
+                }
                 $access_token = '';
                 if(is_array($token)) {
+                    if(empty($token['access_token']) && !empty($token['refresh_token'])) {
+                        $token = $client->fetchAccessTokenWithRefreshToken();
+                    }
                     $access_token = $token['access_token'];
                 } else {
                     if(($token = @json_decode($token))) {
@@ -1009,7 +1016,7 @@ protected function normaliseObject(Google_Service_Drive_DriveFile $object, $dirn
     {
         $id = $object->getId();
         $path_parts = $this->splitFileExtension($object->getName());
-        $result = [];
+        $result = ['id'=>$id];
         $result['type'] = $object->mimeType === self::DIRMIME ? 'dir' : 'file';
 
         if($this->useDisplayPaths) {