fix(aws-amplify): add aws-jwt-verify dep, fix tests for V7 AmplifyContext

Author: osama-rizk

packages/aws-amplify/__tests__/adapterCore/runWithAmplifyServerContext.test.ts

@@ -1,112 +1,71 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import {
-	createAmplifyServerContext,
-	destroyAmplifyServerContext,
-} from '@aws-amplify/core/internals/adapter-core';
-
 import { runWithAmplifyServerContext } from '../../src/adapter-core';
+import { configure } from '../../src/configure';
+
+jest.mock('../../src/configure');
+const mockConfigure = configure as jest.Mock;
 
-// mock serverContext
-jest.mock('@aws-amplify/core/internals/adapter-core');
-const mockCreateAmplifyServerContext = createAmplifyServerContext as jest.Mock;
-const mockDestroyAmplifyServerContext =
-	destroyAmplifyServerContext as jest.Mock;
 const mockAmplifyConfig = {};
-const mockTokenProvider = {
-	getTokens: jest.fn(),
-};
-const mockCredentialAndIdentityProvider = {
-	getCredentialsAndIdentityId: jest.fn(),
-	clearCredentialsAndIdentityId: jest.fn(),
-};
-const mockContextSpec = {
-	token: { value: Symbol('AmplifyServerContextToken') },
+const mockLibraryOptions = {
+	Auth: {
+		tokenProvider: { getTokens: jest.fn() },
+		credentialsProvider: {
+			getCredentialsAndIdentityId: jest.fn(),
+			clearCredentialsAndIdentityId: jest.fn(),
+		},
+	},
 };
 
 describe('runWithAmplifyServerContext', () => {
+	const mockCtx = { resourcesConfig: {}, libraryOptions: {} };
+
 	beforeEach(() => {
-		mockCreateAmplifyServerContext.mockReturnValueOnce(mockContextSpec);
+		mockConfigure.mockReturnValue(mockCtx);
 	});
 
 	afterEach(() => {
-		mockDestroyAmplifyServerContext.mockReset();
+		mockConfigure.mockReset();
 	});
 
-	it('should run the operation with the context', () => {
+	it('should call configure and pass the context to the operation', async () => {
 		const mockOperation = jest.fn();
-		runWithAmplifyServerContext(
+		await runWithAmplifyServerContext(
 			mockAmplifyConfig,
-			{
-				Auth: {
-					tokenProvider: mockTokenProvider,
-					credentialsProvider: mockCredentialAndIdentityProvider,
-				},
-			},
+			mockLibraryOptions,
 			mockOperation,
 		);
 
-		expect(mockOperation).toHaveBeenCalledWith(mockContextSpec);
+		expect(mockConfigure).toHaveBeenCalledWith(
+			mockAmplifyConfig,
+			mockLibraryOptions,
+		);
+		expect(mockOperation).toHaveBeenCalledWith(mockCtx);
 	});
 
-	it('should destroy the context after the operation completed', async () => {
-		const mockOperation = jest.fn();
-		await runWithAmplifyServerContext(
+	it('should return the result from the operation', async () => {
+		const mockResult = { url: 'http://123.com' };
+		const mockOperation = jest.fn(() => Promise.resolve(mockResult));
+		const result = await runWithAmplifyServerContext(
 			mockAmplifyConfig,
-			{
-				Auth: {
-					tokenProvider: mockTokenProvider,
-					credentialsProvider: mockCredentialAndIdentityProvider,
-				},
-			},
+			mockLibraryOptions,
 			mockOperation,
 		);
 
-		expect(mockDestroyAmplifyServerContext).toHaveBeenCalledWith(
-			mockContextSpec,
-		);
+		expect(result).toStrictEqual(mockResult);
 	});
 
-	it('should destroy the context when the operation throws', async () => {
+	it('should propagate errors from the operation', async () => {
 		const testError = new Error('some error');
-		const mockOperation = jest.fn();
-		mockOperation.mockRejectedValueOnce(testError);
+		const mockOperation = jest.fn().mockRejectedValueOnce(testError);
 
 		await expect(
 			runWithAmplifyServerContext(
 				mockAmplifyConfig,
-				{
-					Auth: {
-						tokenProvider: mockTokenProvider,
-						credentialsProvider: mockCredentialAndIdentityProvider,
-					},
-				},
+				mockLibraryOptions,
 				mockOperation,
 			),
 		).rejects.toThrow(testError);
-
-		expect(mockDestroyAmplifyServerContext).toHaveBeenCalledWith(
-			mockContextSpec,
-		);
-	});
-
-	it('should return the result returned by the operation callback function', async () => {
-		const mockResultValue = {
-			url: 'http://123.com',
-		};
-		const mockOperation = jest.fn(() => Promise.resolve(mockResultValue));
-		const result = await runWithAmplifyServerContext(
-			mockAmplifyConfig,
-			{
-				Auth: {
-					tokenProvider: mockTokenProvider,
-					credentialsProvider: mockCredentialAndIdentityProvider,
-				},
-			},
-			mockOperation,
-		);
-
-		expect(result).toStrictEqual(mockResultValue);
 	});
 });

packages/aws-amplify/__tests__/exports.test.ts

@@ -24,7 +24,9 @@ import * as storageS3Exports from '../src/storage/s3';
 describe('aws-amplify Exports', () => {
 	describe('Top-level exports', () => {
 		it('should only export expected symbols', () => {
-			expect(Object.keys(topLevelExports).sort()).toEqual(['Amplify'].sort());
+			expect(Object.keys(topLevelExports).sort()).toEqual(
+				['configure', 'createConfigurationBuilder'].sort(),
+			);
 		});
 	});
 
@@ -178,7 +180,6 @@ describe('aws-amplify Exports', () => {
 					'forgetDevice',
 					'fetchDevices',
 					'autoSignIn',
-					'fetchAuthSession',
 					'decodeJWT',
 					'associateWebAuthnCredential',
 					'listWebAuthnCredentials',