chore(Storage): Simplify list implementation

Author: jcjimenez

AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/AWSS3StoragePlugin+AsyncClientBehavior.swift

@@ -122,15 +122,15 @@ extension AWSS3StoragePlugin {
         options: StorageListRequest.Options? = nil
     ) async throws -> StorageListResult {
         let options = options ?? StorageListRequest.Options()
-        let request = StorageListRequest(options: options)
-        let operation = AWSS3StorageListOperation(request,
-                                                  storageConfiguration: storageConfiguration,
-                                                  storageService: storageService,
-                                                  authService: authService)
-        let taskAdapter = AmplifyOperationTaskAdapter(operation: operation)
-        queue.addOperation(operation)
-        
-        return try await taskAdapter.value
+        let prefixResolver = storageConfiguration.prefixResolver ?? StorageAccessLevelAwarePrefixResolver(authService: authService)
+        let prefix = try await prefixResolver.resolvePrefix(for: options.accessLevel, targetIdentityId: options.targetIdentityId)
+        let result = try await storageService.list(prefix: prefix, options: options)
+
+        let channel = HubChannel(from: categoryType)
+        let payload = HubPayload(eventName: HubPayload.EventName.Storage.list, context: options, data: result)
+        Amplify.Hub.dispatch(to: channel, payload: payload)
+
+        return result
     }
 
     public func handleBackgroundEvents(identifier: String) async -> Bool {

AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Operation/AWSS3StorageListOperation.swift

@@ -7,20 +7,45 @@
 
 import Foundation
 import Amplify
+import AWSS3
+import ClientRuntime
+import AWSClientRuntime
 
 extension AWSS3StorageService {
 
     func list(prefix: String,
-              path: String?,
-              onEvent: @escaping StorageServiceListEventHandler) {
-        let request = AWSS3ListObjectsV2Request(bucket: bucket, prefix: prefix, path: path)
-        awsS3.listObjectsV2(request) { result in
-            switch result {
-            case .success(let list):
-                onEvent(.completed(list))
-            case .failure(let error):
-                onEvent(.failed(error))
+              options: StorageListRequest.Options) async throws -> StorageListResult {
+        if let error = StorageRequestUtils.validateTargetIdentityId(options.targetIdentityId,
+                                                                    accessLevel: options.accessLevel) {
+            throw error
+        }
+        if let error = StorageRequestUtils.validatePath(options.path) {
+            throw error
+        }
+
+        let finalPrefix: String
+        if let path = options.path {
+            finalPrefix = prefix + path
+        } else {
+            finalPrefix = prefix
+        }
+        let input = ListObjectsV2Input(bucket: bucket,
+                                       continuationToken: nil,
+                                       delimiter: nil,
+                                       maxKeys: 1_000,
+                                       prefix: finalPrefix,
+                                       startAfter: nil)
+        do {
+            let response = try await client.listObjectsV2(input: input)
+            let contents: S3BucketContents = response.contents ?? []
+            let items = try contents.map {
+                try StorageListResult.Item(s3Object: $0, prefix: prefix)
             }
+            return StorageListResult(items: items)
+        } catch let error as SdkError<ListObjectsV2OutputError> {
+            throw error.storageError
+        } catch {
+            throw StorageError(error: error)
         }
     }
 

AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Service/Storage/AWSS3StorageService+ListBehavior.swift

@@ -11,6 +11,7 @@ import AWSS3
 import Amplify
 import AWSPluginsCore
 
+/// - Tag: AWSS3StorageService
 class AWSS3StorageService: AWSS3StorageServiceBehaviour, StorageServiceProxy {
 
     // resettable values
@@ -21,8 +22,13 @@ class AWSS3StorageService: AWSS3StorageServiceBehaviour, StorageServiceProxy {
     var region: String!
     var bucket: String!
 
+    /// - Tag: AWSS3StorageService.s3Client
+    @available(*, deprecated, renamed: "client")
     var s3Client: S3Client!
 
+    /// - Tag: AWSS3StorageService.client
+    var client: S3ClientProtocol
+
     let storageConfiguration: StorageConfiguration
     let sessionConfiguration: URLSessionConfiguration
     var delegateQueue: OperationQueue?
@@ -106,6 +112,7 @@ class AWSS3StorageService: AWSS3StorageServiceBehaviour, StorageServiceProxy {
 
         self.logger = logger
         self.s3Client = s3Client
+        self.client = s3Client
         self.preSignedURLBuilder = preSignedURLBuilder
         self.awsS3 = awsS3
         self.bucket = bucket

AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Service/Storage/AWSS3StorageService.swift

@@ -59,8 +59,7 @@ protocol AWSS3StorageServiceBehaviour {
                          onEvent: @escaping StorageServiceMultiPartUploadEventHandler)
 
     func list(prefix: String,
-              path: String?,
-              onEvent: @escaping StorageServiceListEventHandler)
+              options: StorageListRequest.Options) async throws -> StorageListResult
 
     func delete(serviceKey: String,
                 onEvent: @escaping StorageServiceDeleteEventHandler)