fix(storage): credentials expires after 1 hour (aws-amplify#13329)

cjnoname · May 16, 2024 · d7d33da · d7d33da
1 parent 0532bef
commit d7d33da
Show file tree

Hide file tree

Showing 16 changed files with 413 additions and 161 deletions.
diff --git a/package.json b/package.json
@@ -102,6 +102,7 @@
 		"eslint-plugin-prettier": "^5.1.3",
 		"eslint-plugin-promise": "^6.1.1",
 		"eslint-plugin-unused-imports": "^3.0.0",
+		"expect": "^29.7.0",
 		"glob": "^10.3.10",
 		"husky": "^9.0.11",
 		"jest": "^29.7.0",

diff --git a/packages/storage/__tests__/providers/s3/apis/copy.test.ts b/packages/storage/__tests__/providers/s3/apis/copy.test.ts
@@ -14,6 +14,7 @@ import {
 	CopyWithPathInput,
 	CopyWithPathOutput,
 } from '../../../../src/providers/s3/types';
+import './testUtils';
 
 jest.mock('../../../../src/providers/s3/utils/client');
 jest.mock('@aws-amplify/core', () => ({
@@ -186,11 +187,14 @@ describe('copy API', () => {
 						});
 						expect(key).toEqual(destinationKey);
 						expect(copyObject).toHaveBeenCalledTimes(1);
-						expect(copyObject).toHaveBeenCalledWith(copyObjectClientConfig, {
-							...copyObjectClientBaseParams,
-							CopySource: expectedSourceKey,
-							Key: expectedDestinationKey,
-						});
+						await expect(copyObject).toBeLastCalledWithConfigAndInput(
+							copyObjectClientConfig,
+							{
+								...copyObjectClientBaseParams,
+								CopySource: expectedSourceKey,
+								Key: expectedDestinationKey,
+							},
+						);
 					});
 				},
 			);
@@ -239,11 +243,14 @@ describe('copy API', () => {
 					});
 					expect(path).toEqual(expectedDestinationPath);
 					expect(copyObject).toHaveBeenCalledTimes(1);
-					expect(copyObject).toHaveBeenCalledWith(copyObjectClientConfig, {
-						...copyObjectClientBaseParams,
-						CopySource: `${bucket}/${expectedSourcePath}`,
-						Key: expectedDestinationPath,
-					});
+					await expect(copyObject).toBeLastCalledWithConfigAndInput(
+						copyObjectClientConfig,
+						{
+							...copyObjectClientBaseParams,
+							CopySource: `${bucket}/${expectedSourcePath}`,
+							Key: expectedDestinationPath,
+						},
+					);
 				},
 			);
 		});
@@ -269,11 +276,14 @@ describe('copy API', () => {
 				});
 			} catch (error: any) {
 				expect(copyObject).toHaveBeenCalledTimes(1);
-				expect(copyObject).toHaveBeenCalledWith(copyObjectClientConfig, {
-					...copyObjectClientBaseParams,
-					CopySource: `${bucket}/public/${missingSourceKey}`,
-					Key: `public/${destinationKey}`,
-				});
+				await expect(copyObject).toBeLastCalledWithConfigAndInput(
+					copyObjectClientConfig,
+					{
+						...copyObjectClientBaseParams,
+						CopySource: `${bucket}/public/${missingSourceKey}`,
+						Key: `public/${destinationKey}`,
+					},
+				);
 				expect(error.$metadata.httpStatusCode).toBe(404);
 			}
 		});

diff --git a/packages/storage/__tests__/providers/s3/apis/downloadData.test.ts b/packages/storage/__tests__/providers/s3/apis/downloadData.test.ts
@@ -23,6 +23,7 @@ import {
 	ItemWithKey,
 	ItemWithPath,
 } from '../../../../src/providers/s3/types/outputs';
+import './testUtils';
 
 jest.mock('../../../../src/providers/s3/utils/client');
 jest.mock('../../../../src/providers/s3/utils');
@@ -142,7 +143,7 @@ describe('downloadData with key', () => {
 				body: 'body',
 			});
 			expect(getObject).toHaveBeenCalledTimes(1);
-			expect(getObject).toHaveBeenCalledWith(
+			await expect(getObject).toBeLastCalledWithConfigAndInput(
 				{
 					credentials,
 					region,
@@ -288,7 +289,7 @@ describe('downloadData with path', () => {
 				body: 'body',
 			});
 			expect(getObject).toHaveBeenCalledTimes(1);
-			expect(getObject).toHaveBeenCalledWith(
+			await expect(getObject).toBeLastCalledWithConfigAndInput(
 				{
 					credentials,
 					region,

diff --git a/packages/storage/__tests__/providers/s3/apis/getProperties.test.ts b/packages/storage/__tests__/providers/s3/apis/getProperties.test.ts
@@ -12,6 +12,7 @@ import {
 	GetPropertiesWithPathInput,
 	GetPropertiesWithPathOutput,
 } from '../../../../src/providers/s3/types';
+import './testUtils';
 
 jest.mock('../../../../src/providers/s3/utils/client');
 jest.mock('@aws-amplify/core', () => ({
@@ -145,7 +146,10 @@ describe('getProperties with key', () => {
 					...expectedResult,
 				});
 				expect(headObject).toHaveBeenCalledTimes(1);
-				expect(headObject).toHaveBeenCalledWith(config, headObjectOptions);
+				await expect(headObject).toBeLastCalledWithConfigAndInput(
+					config,
+					headObjectOptions,
+				);
 			},
 		);
 	});
@@ -166,7 +170,7 @@ describe('getProperties with key', () => {
 				await getPropertiesWrapper({ key: inputKey });
 			} catch (error: any) {
 				expect(headObject).toHaveBeenCalledTimes(1);
-				expect(headObject).toHaveBeenCalledWith(
+				await expect(headObject).toBeLastCalledWithConfigAndInput(
 					{
 						credentials,
 						region: 'region',
@@ -265,7 +269,10 @@ describe('Happy cases: With path', () => {
 					...expectedResult,
 				});
 				expect(headObject).toHaveBeenCalledTimes(1);
-				expect(headObject).toHaveBeenCalledWith(config, headObjectOptions);
+				await expect(headObject).toBeLastCalledWithConfigAndInput(
+					config,
+					headObjectOptions,
+				);
 			},
 		);
 	});
@@ -286,7 +293,7 @@ describe('Happy cases: With path', () => {
 				await getPropertiesWrapper({ path: inputPath });
 			} catch (error: any) {
 				expect(headObject).toHaveBeenCalledTimes(1);
-				expect(headObject).toHaveBeenCalledWith(
+				await expect(headObject).toBeLastCalledWithConfigAndInput(
 					{
 						credentials,
 						region: 'region',

diff --git a/packages/storage/__tests__/providers/s3/apis/getUrl.test.ts b/packages/storage/__tests__/providers/s3/apis/getUrl.test.ts
@@ -15,6 +15,7 @@ import {
 	GetUrlWithPathInput,
 	GetUrlWithPathOutput,
 } from '../../../../src/providers/s3/types';
+import './testUtils';
 
 jest.mock('../../../../src/providers/s3/utils/client');
 jest.mock('@aws-amplify/core', () => ({
@@ -31,8 +32,8 @@ jest.mock('@aws-amplify/core', () => ({
 
 const bucket = 'bucket';
 const region = 'region';
-const mockFetchAuthSession = Amplify.Auth.fetchAuthSession as jest.Mock;
-const mockGetConfig = Amplify.getConfig as jest.Mock;
+const mockFetchAuthSession = jest.mocked(Amplify.Auth.fetchAuthSession);
+const mockGetConfig = jest.mocked(Amplify.getConfig);
 const credentials: AWSCredentials = {
 	accessKeyId: 'accessKeyId',
 	sessionToken: 'sessionToken',
@@ -68,19 +69,15 @@ describe('getUrl test with key', () => {
 		};
 		const key = 'key';
 		beforeEach(() => {
-			(headObject as jest.MockedFunction<typeof headObject>).mockResolvedValue({
+			jest.mocked(headObject).mockResolvedValue({
 				ContentLength: 100,
 				ContentType: 'text/plain',
 				ETag: 'etag',
 				LastModified: new Date('01-01-1980'),
 				Metadata: { meta: 'value' },
 				$metadata: {} as any,
 			});
-			(
-				getPresignedGetObjectUrl as jest.MockedFunction<
-					typeof getPresignedGetObjectUrl
-				>
-			).mockResolvedValue(mockURL);
+			jest.mocked(getPresignedGetObjectUrl).mockResolvedValue(mockURL);
 		});
 		afterEach(() => {
 			jest.clearAllMocks();
@@ -131,7 +128,10 @@ describe('getUrl test with key', () => {
 				};
 				expect(getPresignedGetObjectUrl).toHaveBeenCalledTimes(1);
 				expect(headObject).toHaveBeenCalledTimes(1);
-				expect(headObject).toHaveBeenCalledWith(config, headObjectOptions);
+				await expect(headObject).toBeLastCalledWithConfigAndInput(
+					config,
+					headObjectOptions,
+				);
 				expect({ url, expiresAt }).toEqual(expectedResult);
 			},
 		);
@@ -187,19 +187,15 @@ describe('getUrl test with path', () => {
 			userAgentValue: expect.any(String),
 		};
 		beforeEach(() => {
-			(headObject as jest.MockedFunction<typeof headObject>).mockResolvedValue({
+			jest.mocked(headObject).mockResolvedValue({
 				ContentLength: 100,
 				ContentType: 'text/plain',
 				ETag: 'etag',
 				LastModified: new Date('01-01-1980'),
 				Metadata: { meta: 'value' },
 				$metadata: {} as any,
 			});
-			(
-				getPresignedGetObjectUrl as jest.MockedFunction<
-					typeof getPresignedGetObjectUrl
-				>
-			).mockResolvedValue(mockURL);
+			jest.mocked(getPresignedGetObjectUrl).mockResolvedValue(mockURL);
 		});
 		afterEach(() => {
 			jest.clearAllMocks();
@@ -229,7 +225,10 @@ describe('getUrl test with path', () => {
 				});
 				expect(getPresignedGetObjectUrl).toHaveBeenCalledTimes(1);
 				expect(headObject).toHaveBeenCalledTimes(1);
-				expect(headObject).toHaveBeenCalledWith(config, headObjectOptions);
+				await expect(headObject).toBeLastCalledWithConfigAndInput(
+					config,
+					headObjectOptions,
+				);
 				expect({ url, expiresAt }).toEqual({
 					url: mockURL,
 					expiresAt: expect.any(Date),