chore(Storage): Simplify Storage.getURL

Author: jcjimenez

AmplifyPlugins/Core/AWSPluginsTestCommon/MockAWSAuthService.swift

@@ -12,6 +12,7 @@ import AWSPluginsCore
 
 public class MockAWSAuthService: AWSAuthServiceBehavior {
 
+    var interactions: [String] = []
     var getIdentityIdError: AuthError?
     var getTokenError: AuthError?
     var getTokenClaimsError: AuthError?
@@ -20,17 +21,21 @@ public class MockAWSAuthService: AWSAuthServiceBehavior {
     var tokenClaims: [String: AnyObject]?
 
     public func configure() {
+        interactions.append(#function)
     }
 
     public func reset() {
+        interactions.append(#function)
     }
 
     public func getCredentialsProvider() -> CredentialsProvider {
+        interactions.append(#function)
         let cognitoCredentialsProvider = MyCustomCredentialsProvider()
         return cognitoCredentialsProvider
     }
 
     public func getIdentityID() async throws -> String {
+        interactions.append(#function)
         if let error = getIdentityIdError {
             throw error
         }
@@ -39,6 +44,7 @@ public class MockAWSAuthService: AWSAuthServiceBehavior {
     }
 
     public func getUserPoolAccessToken() async throws -> String {
+        interactions.append(#function)
         if let error = getTokenError {
             throw error
         } else {
@@ -47,6 +53,7 @@ public class MockAWSAuthService: AWSAuthServiceBehavior {
     }
 
     public func getTokenClaims(tokenString: String) -> Result<[String: AnyObject], AuthError> {
+        interactions.append(#function)
         if let error = getTokenClaimsError {
             return .failure(error)
         }

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

@@ -20,14 +20,21 @@ extension AWSS3StoragePlugin {
     ) async throws -> URL {
         let options = options ?? StorageGetURLRequest.Options()
         let request = StorageGetURLRequest(key: key, options: options)
-        let operation = AWSS3StorageGetURLOperation(request,
-                                                    storageConfiguration: storageConfiguration,
-                                                    storageService: storageService,
-                                                    authService: authService)
-        let taskAdapter = AmplifyOperationTaskAdapter(operation: operation)
-        queue.addOperation(operation)
-        
-        return try await taskAdapter.value
+        if let error = request.validate() {
+            throw error
+        }
+        let prefixResolver = storageConfiguration.prefixResolver ?? StorageAccessLevelAwarePrefixResolver(authService: authService)
+        let prefix = try await prefixResolver.resolvePrefix(for: options.accessLevel,
+                                                            targetIdentityId: options.targetIdentityId)
+        let serviceKey = prefix + request.key
+        let result = try await storageService.getPreSignedURL(serviceKey: serviceKey,
+                                                              signingOperation: .getObject,
+                                                              expires: options.expires)
+
+        let channel = HubChannel(from: categoryType)
+        let payload = HubPayload(eventName: HubPayload.EventName.Storage.getURL, context: options, data: result)
+        Amplify.Hub.dispatch(to: channel, payload: payload)
+        return result
     }
 
     @discardableResult

AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Dependency/AWSS3PreSignedURLBuilderBehavior.swift

@@ -23,15 +23,3 @@ protocol AWSS3PreSignedURLBuilderBehavior {
     /// - Returns: Pre-Signed URL
     func getPreSignedURL(key: String, signingOperation: AWSS3SigningOperation, expires: Int64?) async throws -> URL
 }
-
-extension AWSS3PreSignedURLBuilderBehavior {
-
-    func getPreSignedURL(key: String, signingOperation: AWSS3SigningOperation, expires: Int64? = nil) async throws -> URL {
-        try await getPreSignedURL(key: key, signingOperation: signingOperation, expires: expires)
-    }
-
-    func getPreSignedURL(key: String, expires: Int64? = nil) async throws -> URL {
-        try await getPreSignedURL(key: key, signingOperation: .getObject, expires: expires)
-    }
-
-}

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

@@ -27,7 +27,7 @@ extension AWSS3StorageService {
 
         Task {
             do {
-                let preSignedURL = try await preSignedURLBuilder.getPreSignedURL(key: serviceKey)
+                let preSignedURL = try await preSignedURLBuilder.getPreSignedURL(key: serviceKey, signingOperation: .getObject, expires: nil)
                 startDownload(preSignedURL: preSignedURL, transferTask: transferTask)
             } catch {
                 onEvent(.failed(StorageError.unknown("Failed to get pre-signed URL", nil)))

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

@@ -11,16 +11,8 @@ import Amplify
 extension AWSS3StorageService {
 
     func getPreSignedURL(serviceKey: String,
-                         signingOperation: AWSS3SigningOperation = .getObject,
-                         expires: Int,
-                         onEvent: @escaping StorageServiceGetPreSignedURLEventHandler) {
-        Task {
-            do {
-                onEvent(.completed(try await preSignedURLBuilder.getPreSignedURL(key: serviceKey,
-                                                                                 expires: Int64(expires))))
-            } catch {
-                onEvent(.failed(StorageError.unknown("Failed to get pre-signed URL", nil)))
-            }
-        }
+                         signingOperation: AWSS3SigningOperation,
+                         expires: Int) async throws -> URL {
+        return try await preSignedURLBuilder.getPreSignedURL(key: serviceKey, signingOperation: signingOperation, expires: Int64(expires))
     }
 }

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

@@ -34,7 +34,8 @@ extension AWSS3StorageService {
 
             do {
                 let preSignedURL = try await preSignedURLBuilder.getPreSignedURL(key: serviceKey,
-                                                                                 signingOperation: .putObject)
+                                                                                 signingOperation: .putObject,
+                                                                                 expires: nil)
                 startUpload(preSignedURL: preSignedURL,
                             fileURL: uploadFileURL,
                             contentType: contentType,

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

@@ -43,8 +43,7 @@ protocol AWSS3StorageServiceBehaviour {
 
     func getPreSignedURL(serviceKey: String,
                          signingOperation: AWSS3SigningOperation,
-                         expires: Int,
-                         onEvent: @escaping StorageServiceGetPreSignedURLEventHandler)
+                         expires: Int) async throws -> URL
 
     func upload(serviceKey: String,
                 uploadSource: UploadSource,
@@ -64,11 +63,3 @@ protocol AWSS3StorageServiceBehaviour {
     func delete(serviceKey: String,
                 onEvent: @escaping StorageServiceDeleteEventHandler)
 }
-
-extension AWSS3StorageServiceBehaviour {
-    func getPreSignedURL(serviceKey: String,
-                         expires: Int,
-                         onEvent: @escaping StorageServiceGetPreSignedURLEventHandler) {
-        getPreSignedURL(serviceKey: serviceKey, signingOperation: .getObject, expires: expires, onEvent: onEvent)
-    }
-}

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

@@ -128,7 +128,8 @@ class DefaultStorageMultipartUploadClient: StorageMultipartUploadClient {
                     let operation = AWSS3SigningOperation.uploadPart(partNumber: partNumber, uploadId: uploadId)
                     let preSignedURL = try await serviceProxy.preSignedURLBuilder.getPreSignedURL(
                         key: self.key,
-                        signingOperation: operation
+                        signingOperation: operation,
+                        expires: nil
                     )
                     startUploadPart(partialFileURL, preSignedURL)
                 } catch {

AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Support/Internal/StorageMultipartUploadClient.swift

@@ -47,21 +47,6 @@ class AWSS3StoragePluginAsyncBehaviorTests: XCTestCase {
         queue = nil
     }
 
-    func testPluginGetURLAsync() async throws {
-        let done = asyncExpectation(description: "done")
-        let input = URL(string: "https://bucket.aws.amazon.com/\(testKey ?? "")")!
-
-        Task {
-            storageService.storageServiceGetPreSignedURLEvents = [.completed(input)]
-            let output = try await storagePlugin.getURL(key: testKey, options: nil)
-            XCTAssertEqual(input, output)
-            XCTAssertEqual(1, storageService.getPreSignedURLCalled)
-            await done.fulfill()
-        }
-
-        await waitForExpectations([done], timeout: 3.0)
-    }
-
     func testPluginDownloadDataAsync() async throws {
         let input = "AWS".data(using: .utf8)!
         storageService.storageServiceDownloadEvents = [.completed(input)]