feat(storage): Gen2 Implementation for getUrl, remove, list

aws-auth-cognito/src/androidTest/java/com/amplifyframework/auth/cognito/AuthStressTests.kt

@@ -55,7 +55,6 @@ class AuthStressTests {
             } catch (error: AmplifyException) {
                 Log.e("MyAmplifyApp", "Could not initialize Amplify", error)
             }
-            Thread.sleep(5000)
         }
     }
 

aws-storage-s3/src/androidTest/java/com/amplifyframework/storage/s3/AWSS3StorageListAccessLevelTest.java

@@ -104,7 +104,10 @@ public void setUp() throws Exception {
         }
     }
 
-    private void assertListContainsUploadedFile(StorageListResult result) {
+    private void assertListContainsUploadedFile(
+            StorageListResult result,
+            String pathPrefix
+    ) {
         List<StorageItem> items = result.getItems();
         assertNotNull(items);
         assertEquals(1, items.size());
@@ -113,6 +116,8 @@ private void assertListContainsUploadedFile(StorageListResult result) {
         StorageItem storedItem = items.get(0);
         assertEquals(UPLOAD_SIZE, storedItem.getSize());
         assertEquals(uploadKey, storedItem.getKey());
+        assertEquals(pathPrefix + uploadKey, storedItem.getPath());
+
     }
 
     /**
@@ -126,7 +131,7 @@ public void testListUnauthenticatedPublicAccess() throws Exception {
             .accessLevel(StorageAccessLevel.PUBLIC)
             .build();
         StorageListResult result = storage.list(TEST_DIR_NAME, listOptions);
-        assertListContainsUploadedFile(result);
+        assertListContainsUploadedFile(result, "public/");
     }
 
     /**
@@ -144,7 +149,7 @@ public void testListUnauthenticatedProtectedAccess() throws Exception {
             .targetIdentityId(userOne.getIdentityId())
             .build();
         StorageListResult result = storage.list(TEST_DIR_NAME, listOptions);
-        assertListContainsUploadedFile(result);
+        assertListContainsUploadedFile(result, "protected/" + userOne.getIdentityId() + "/");
     }
 
     /**
@@ -163,7 +168,7 @@ public void testListUnauthenticatedPrivateAccess() throws Exception {
             .targetIdentityId(userOne.getIdentityId())
             .build();
         StorageListResult result = storage.list(TEST_DIR_NAME, listOptions);
-        assertListContainsUploadedFile(result);
+        assertListContainsUploadedFile(result, "private/" + userOne.getIdentityId() + "/");
     }
 
     /**
@@ -179,7 +184,7 @@ public void testListAuthenticatedProtectedAccess() throws Exception {
             .targetIdentityId(userOne.getIdentityId())
             .build();
         StorageListResult result = storage.list(TEST_DIR_NAME, listOptions);
-        assertListContainsUploadedFile(result);
+        assertListContainsUploadedFile(result, "protected/" + userOne.getIdentityId() + "/");
     }
 
     /**
@@ -220,7 +225,7 @@ public void testListAuthenticatedPrivateAccess() throws Exception {
             .targetIdentityId(userOne.getIdentityId())
             .build();
         StorageListResult result = storage.list(TEST_DIR_NAME, listOptions);
-        assertListContainsUploadedFile(result);
+        assertListContainsUploadedFile(result, "private/" + userOne.getIdentityId() + "/");
     }
 
     /**
@@ -240,7 +245,7 @@ public void testListDifferentUsersProtectedAccess() throws Exception {
             .targetIdentityId(userTwo.getIdentityId())
             .build();
         StorageListResult result = storage.list(TEST_DIR_NAME, listOptions);
-        assertListContainsUploadedFile(result);
+        assertListContainsUploadedFile(result, "protected/" + userTwo.getIdentityId() + "/");
     }
 
     /**
@@ -260,14 +265,13 @@ public void testListDifferentUsersPrivateAccess() throws Exception {
             .targetIdentityId(userTwo.getIdentityId())
             .build();
         StorageListResult result = storage.list(TEST_DIR_NAME, listOptions);
-        assertListContainsUploadedFile(result);
+        assertListContainsUploadedFile(result, "private/" + userTwo.getIdentityId() + "/");
     }
 
     private static void uploadTestFiles() throws Exception {
         // Create a temporary file to upload
         File uploadFile = new RandomTempFile(UPLOAD_SIZE);
         String uploadName = uploadFile.getName();
-        String uploadPath = uploadFile.getAbsolutePath();
         uploadKey = TEST_DIR_NAME + "/" + uploadName;
         StorageUploadFileOptions options;
 
@@ -307,7 +311,6 @@ private static void uploadMultipleTestFiles() throws Exception {
         // Create a temporary file to upload
         File uploadFile = new RandomTempFile(UPLOAD_SIZE);
         String uploadName = uploadFile.getName();
-        String uploadPath = uploadFile.getAbsolutePath();
         pagedUploadKeyPrefix = "PAGED" + TEST_DIR_NAME + "/" + uploadName;
         StorageUploadFileOptions options;
 

aws-storage-s3/src/androidTest/java/com/amplifyframework/storage/s3/AWSS3StoragePathDownloadTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@ package com.amplifyframework.storage.s3
 
 import android.content.Context
 import androidx.test.core.app.ApplicationProvider
-import com.amplifyframework.auth.AuthPlugin
 import com.amplifyframework.auth.cognito.AWSCognitoAuthPlugin
 import com.amplifyframework.core.Amplify
 import com.amplifyframework.core.async.Cancelable
@@ -26,6 +25,7 @@ import com.amplifyframework.hub.HubEvent
 import com.amplifyframework.hub.SubscriptionToken
 import com.amplifyframework.storage.StorageCategory
 import com.amplifyframework.storage.StorageChannelEventName
+import com.amplifyframework.storage.StorageException
 import com.amplifyframework.storage.StoragePath
 import com.amplifyframework.storage.TransferState
 import com.amplifyframework.storage.TransferState.Companion.getState
@@ -67,11 +67,20 @@ class AWSS3StoragePathDownloadTest {
         private val LARGE_FILE_PATH = StoragePath.fromString("public/$LARGE_FILE_NAME")
         private val SMALL_FILE_NAME = "small-${System.currentTimeMillis()}"
         private val SMALL_FILE_PATH = StoragePath.fromString("public/$SMALL_FILE_NAME")
+        private val USER_ONE_PROTECTED_FILE_NAME = "user1Protected-${System.currentTimeMillis()}"
+        private val USER_ONE_PRIVATE_FILE_NAME = "user1Private-${System.currentTimeMillis()}"
 
         lateinit var storageCategory: StorageCategory
         lateinit var synchronousStorage: SynchronousStorage
+        lateinit var synchronousAuth: SynchronousAuth
         lateinit var largeFile: File
         lateinit var smallFile: File
+        lateinit var userOneProtectedFile: File
+        lateinit var userOneProtectedStoragePath: StoragePath
+        lateinit var userOnePrivateFile: File
+        lateinit var userOnePrivateStoragePath: StoragePath
+        internal lateinit var userOne: UserCredentials.Credential
+        internal lateinit var userTwo: UserCredentials.Credential
 
         /**
          * Initialize mobile client and configure the storage.
@@ -82,21 +91,50 @@ class AWSS3StoragePathDownloadTest {
         fun setUpOnce() {
             val context = ApplicationProvider.getApplicationContext<Context>()
             initializeWorkmanagerTestUtil(context)
-            SynchronousAuth.delegatingToCognito(context, AWSCognitoAuthPlugin() as AuthPlugin<*>)
+            synchronousAuth = SynchronousAuth.delegatingToCognito(context, AWSCognitoAuthPlugin())
+            val identityIdSource = MobileClientIdentityIdSource.create(synchronousAuth)
+            val userCredentials = UserCredentials.create(context, identityIdSource)
+            val iterator = userCredentials.iterator()
+            userOne = iterator.next()
+            userTwo = iterator.next()
 
             // Get a handle to storage
             storageCategory = TestStorageCategory.create(context, R.raw.amplifyconfiguration)
             synchronousStorage = SynchronousStorage.delegatingTo(storageCategory)
 
             val uploadOptions = StorageUploadFileOptions.defaultInstance()
 
+            synchronousAuth.signOut()
+
             // Upload large test file
             largeFile = RandomTempFile(LARGE_FILE_NAME, LARGE_FILE_SIZE)
             synchronousStorage.uploadFile(LARGE_FILE_PATH, largeFile, uploadOptions, EXTENDED_TIMEOUT_MS)
 
             // Upload small test file
             smallFile = RandomTempFile(SMALL_FILE_NAME, SMALL_FILE_SIZE)
             synchronousStorage.uploadFile(SMALL_FILE_PATH, smallFile, uploadOptions)
+
+            synchronousAuth.signIn(userOne.username, userOne.password)
+
+            userOneProtectedFile = RandomTempFile(USER_ONE_PROTECTED_FILE_NAME, SMALL_FILE_SIZE)
+            userOneProtectedStoragePath =
+                StoragePath.fromString("protected/${userOne.identityId}/$USER_ONE_PROTECTED_FILE_NAME")
+            synchronousStorage.uploadFile(
+                StoragePath.fromString("protected/${userOne.identityId}/$USER_ONE_PROTECTED_FILE_NAME"),
+                userOneProtectedFile,
+                uploadOptions
+            )
+
+            userOnePrivateFile = RandomTempFile(USER_ONE_PRIVATE_FILE_NAME, SMALL_FILE_SIZE)
+            userOnePrivateStoragePath =
+                StoragePath.fromString("private/${userOne.identityId}/$USER_ONE_PRIVATE_FILE_NAME")
+            synchronousStorage.uploadFile(
+                userOnePrivateStoragePath,
+                userOnePrivateFile,
+                uploadOptions
+            )
+
+            synchronousAuth.signOut()
         }
     }
 
@@ -109,6 +147,8 @@ class AWSS3StoragePathDownloadTest {
         for (token in subscriptions) {
             Amplify.Hub.unsubscribe(token)
         }
+
+        synchronousAuth.signOut()
     }
 
     @Test
@@ -268,4 +308,50 @@ class AWSS3StoragePathDownloadTest {
             EXTENDED_TIMEOUT_MS
         )
     }
+
+    @Test
+    fun testDownloadUnauthenticatedProtectedAccess() {
+        val result = synchronousStorage.downloadFile(
+            userOneProtectedStoragePath,
+            downloadFile,
+            options
+        )
+
+        FileAssert.assertEquals(userOneProtectedFile, result.file)
+    }
+
+    @Test
+    fun testDownloadAuthenticatedProtectedAccess() {
+        synchronousAuth.signIn(userOne.username, userOne.password)
+
+        val result = synchronousStorage.downloadFile(
+            userOneProtectedStoragePath,
+            downloadFile,
+            options
+        )
+
+        FileAssert.assertEquals(userOneProtectedFile, result.file)
+    }
+
+    @Test(expected = StorageException::class)
+    fun testDownloadUnauthenticatedPrivateAccess() {
+        synchronousStorage.downloadFile(
+            userOnePrivateStoragePath,
+            downloadFile,
+            options
+        )
+    }
+
+    @Test
+    fun testAuthenticatedPrivateAccess() {
+        synchronousAuth.signIn(userOne.username, userOne.password)
+
+        val result = synchronousStorage.downloadFile(
+            userOnePrivateStoragePath,
+            downloadFile,
+            options
+        )
+
+        FileAssert.assertEquals(userOnePrivateFile, result.file)
+    }
 }

aws-storage-s3/src/androidTest/java/com/amplifyframework/storage/s3/AWSS3StoragePathGetUrlTest.kt

@@ -0,0 +1,82 @@
+/*
+ * Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package com.amplifyframework.storage.s3
+
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
+import com.amplifyframework.auth.cognito.AWSCognitoAuthPlugin
+import com.amplifyframework.storage.StorageCategory
+import com.amplifyframework.storage.StoragePath
+import com.amplifyframework.storage.options.StorageGetUrlOptions
+import com.amplifyframework.storage.options.StorageUploadFileOptions
+import com.amplifyframework.storage.s3.test.R
+import com.amplifyframework.storage.s3.util.WorkmanagerTestUtils.initializeWorkmanagerTestUtil
+import com.amplifyframework.testutils.random.RandomTempFile
+import com.amplifyframework.testutils.sync.SynchronousAuth
+import com.amplifyframework.testutils.sync.SynchronousStorage
+import java.io.File
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.BeforeClass
+import org.junit.Test
+
+/**
+ * Instrumentation test for operational work on download.
+ */
+class AWSS3StoragePathGetUrlTest {
+    // Create a file to download to
+    private val downloadFile: File = RandomTempFile()
+
+    private companion object {
+        const val SMALL_FILE_SIZE = 100L
+        val SMALL_FILE_NAME = "small-${System.currentTimeMillis()}"
+        val SMALL_FILE_PATH = StoragePath.fromString("public/$SMALL_FILE_NAME")
+
+        lateinit var storageCategory: StorageCategory
+        lateinit var synchronousStorage: SynchronousStorage
+        lateinit var smallFile: File
+
+        /**
+         * Initialize mobile client and configure the storage.
+         * Upload the test files ahead of time.
+         */
+        @JvmStatic
+        @BeforeClass
+        fun setUpOnce() {
+            val context = ApplicationProvider.getApplicationContext<Context>()
+            initializeWorkmanagerTestUtil(context)
+
+            SynchronousAuth.delegatingToCognito(context, AWSCognitoAuthPlugin())
+
+            storageCategory = TestStorageCategory.create(context, R.raw.amplifyconfiguration)
+            synchronousStorage = SynchronousStorage.delegatingTo(storageCategory)
+
+            // Upload small test file
+            smallFile = RandomTempFile(SMALL_FILE_NAME, SMALL_FILE_SIZE)
+            synchronousStorage.uploadFile(SMALL_FILE_PATH, smallFile, StorageUploadFileOptions.defaultInstance())
+        }
+    }
+
+    @Test
+    fun testGetUrl() {
+        val result = synchronousStorage.getUrl(
+            SMALL_FILE_PATH,
+            StorageGetUrlOptions.builder().expires(30).build()
+        )
+
+        assertEquals("/public/$SMALL_FILE_NAME", result.url.path)
+        assertTrue(result.url.query.contains("X-Amz-Expires=30"))
+    }
+}