🐛 List folders

Author: ruslansteiger

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to `laravel-cloudinary` will be documented in this file.
 
+## 1.0.1 - 2021-06-23
+
+- 🐛 Bug Fix: List folders
+
 ## 1.0.0 - 2021-06-03
 
 - Stable release

src/FlysystemCloudinaryAdapter.php

@@ -356,19 +356,35 @@ public function listContents($directory = '', $recursive = false): array
         ];
 
         try {
-            $response = $this
+            $responseFiles = $this
                 ->cloudinary
                 ->adminApi()
                 ->assets($options);
-        } catch (RateLimited) {
+
+            $responseDirectories = $this
+                ->cloudinary
+                ->adminApi()
+                ->subFolders($directory);
+        } catch (RateLimited | ApiError) {
             return [];
         }
 
-        event(new FlysystemCloudinaryResponseLog($response));
+        event(new FlysystemCloudinaryResponseLog($responseFiles));
+        event(new FlysystemCloudinaryResponseLog($responseDirectories));
 
-        return array_map(function (array $resource) {
+        $files = array_map(function (array $resource) {
             return $this->normalizeResponse($resource, $resource['public_id']);
-        }, $response->getArrayCopy()['resources']);
+        }, $responseFiles->getArrayCopy()['resources']);
+
+        $folders = array_map(function (array $resource) {
+            return [
+                'type' => 'dir',
+                'path' => $resource['path'],
+                'name' => $resource['name'],
+            ];
+        }, $responseDirectories->getArrayCopy()['folders']);
+
+        return [...$files, ...$folders];
     }
 
     /**

tests/Feature/AdapterTest.php

@@ -210,14 +210,17 @@ public function it_can_delete_a_directory()
             $mock->shouldReceive('adminApi->assets')->once()->andReturn(new ApiResponse([
                 'resources' => [],
             ], []));
+            $mock->shouldReceive('adminApi->subFolders')->once()->andReturn(new ApiResponse([
+                'folders' => [],
+            ], []));
             $mock->shouldReceive('adminApi->deleteFolder')->once()->andReturn(new ApiResponse([], []));
         });
         $adapter = new FlysystemCloudinaryAdapter($mock);
 
         $bool = $adapter->deleteDir('::path::');
 
         $this->assertTrue($bool);
-        Event::assertDispatched(FlysystemCloudinaryResponseLog::class, 2);
+        Event::assertDispatched(FlysystemCloudinaryResponseLog::class, 3);
     }
 
     /** @test */
@@ -294,13 +297,17 @@ public function it_can_list_directory_contents()
             $mock->shouldReceive('adminApi->assets')->once()->andReturn(new ApiResponse([
                 'resources' => [],
             ], []));
+
+            $mock->shouldReceive('adminApi->subFolders')->once()->andReturn(new ApiResponse([
+                'folders' => [],
+            ], []));
         });
         $adapter = new FlysystemCloudinaryAdapter($mock);
 
         $files = $adapter->listContents('::path::');
 
         $this->assertSame([], $files);
-        Event::assertDispatched(FlysystemCloudinaryResponseLog::class, 1);
+        Event::assertDispatched(FlysystemCloudinaryResponseLog::class, 2);
     }
 
     /** @test */