v6 isolation improvements.

.gitignore

@@ -77,6 +77,9 @@ coverage-ts/
 # Turborepo
 .turbo
 
+# TypeScript incremental build
+*.tsbuildinfo
+
 # ruby
 vendor/
 Gemfile.lock

license_config.json

@@ -41,6 +41,7 @@
 		"rollup",
 		".husky",
 		".turbo",
+		".idea",
 		"eslint.config.mjs",
 		"packages/core/metadata",
 		"packages/react-native/example/.bundle/config"

package.json

@@ -42,6 +42,7 @@
 			"packages/predictions",
 			"packages/storage",
 			"packages/adapter-nextjs",
+			"packages/adapter-express",
 			"packages/geo",
 			"packages/api-rest",
 			"packages/api-graphql",

packages/adapter-nextjs/__tests__/api/generateServerClient.test.ts

@@ -109,7 +109,9 @@ describe('generateServerClient', () => {
 				response: mockedRes,
 			},
 			operation: async contextSpec => {
-				await client.graphql(contextSpec, { query: '' });
+				await client.graphql(contextSpec, {
+					query: '',
+				});
 			},
 		});
 

packages/adapter-nextjs/__tests__/auth/utils/hasActiveUserSession.test.ts

@@ -2,6 +2,7 @@ import { getCurrentUser } from 'aws-amplify/auth/server';
 import { NextRequest } from 'next/server';
 import { AuthUser } from 'aws-amplify/auth';
 import { NextApiRequest } from 'next';
+import { AmplifyContext } from '@aws-amplify/core';
 
 import {
 	hasActiveUserSessionWithAppRouter,
@@ -17,7 +18,13 @@ const mockRunWithAmplifyServerContext =
 const mockGetCurrentUser = jest.mocked(getCurrentUser);
 
 describe('hasUserSignedIn', () => {
-	const mockContextSpec = { token: { value: Symbol('mock') } };
+	const mockContextSpec: AmplifyContext = {
+		resourcesConfig: {},
+		libraryOptions: {},
+		fetchAuthSession: jest.fn(),
+		clearCredentials: jest.fn(),
+		getTokens: jest.fn(),
+	};
 	const mockCurrentUserResult: AuthUser = {
 		userId: 'mockUserId',
 		username: 'mockUsername',

packages/adapter-nextjs/__tests__/createServerRunner.test.ts

@@ -66,7 +66,7 @@ describe('createServerRunner', () => {
 	const mockCreateAWSCredentialsAndIdentityIdProvider = jest.fn();
 	const mockCreateKeyValueStorageFromCookieStorageAdapter = jest.fn();
 	const mockCreateUserPoolsTokenProvider = jest.fn();
-	const mockRunWithAmplifyServerContextCore = jest.fn();
+	const mockCreateAmplifyContext = jest.fn(() => ({}));
 	const mockCreateAuthRouteHandlersFactory = jest.fn(() => jest.fn());
 	const mockIsSSLOriginUtil = jest.fn(() => true);
 	const mockIsValidOrigin = jest.fn(origin => !!origin);
@@ -87,7 +87,11 @@ describe('createServerRunner', () => {
 			createKeyValueStorageFromCookieStorageAdapter:
 				mockCreateKeyValueStorageFromCookieStorageAdapter,
 			createUserPoolsTokenProvider: mockCreateUserPoolsTokenProvider,
-			runWithAmplifyServerContext: mockRunWithAmplifyServerContextCore,
+		}));
+
+		jest.doMock('aws-amplify', () => ({
+			...jest.requireActual('aws-amplify'),
+			createAmplifyContext: mockCreateAmplifyContext,
 		}));
 
 		jest.doMock('aws-amplify/utils', () => ({
@@ -165,7 +169,7 @@ describe('createServerRunner', () => {
 
 	describe('runWithAmplifyServerContext', () => {
 		describe('when amplifyConfig.Auth is not defined', () => {
-			it('should call runWithAmplifyServerContextCore without Auth library options', () => {
+			it('should call createAmplifyContext without Auth library options', () => {
 				const mockAmplifyConfigWithoutAuth: ResourcesConfig = {
 					Analytics: {
 						Pinpoint: {
@@ -182,10 +186,9 @@ describe('createServerRunner', () => {
 				});
 				const operation = jest.fn();
 				runWithAmplifyServerContext({ operation, nextServerContext: null });
-				expect(mockRunWithAmplifyServerContextCore).toHaveBeenCalledWith(
+				expect(mockCreateAmplifyContext).toHaveBeenCalledWith(
 					mockAmplifyConfigWithoutAuth,
 					{},
-					operation,
 				);
 				expect(createRunWithAmplifyServerContextSpy).toHaveBeenCalledWith({
 					config: mockAmplifyConfigWithoutAuth,

packages/adapter-nextjs/package.json

@@ -4,7 +4,7 @@
 	"version": "1.7.3",
 	"description": "The adapter for the supporting of using Amplify APIs in Next.js.",
 	"peerDependencies": {
-		"aws-amplify": "^6.16.4",
+		"aws-amplify": "^6.17.0",
 		"next": ">=13.5.0 <17.0.0"
 	},
 	"dependencies": {

packages/adapter-nextjs/src/api/generateServerClient.ts

@@ -8,11 +8,7 @@ import {
 	V6ClientSSRRequest,
 	generateClientWithAmplifyInstance,
 } from 'aws-amplify/api/internals';
-import { generateClient } from 'aws-amplify/api/server';
-import {
-	AmplifyServerContextError,
-	getAmplifyServerContext,
-} from 'aws-amplify/adapter-core/internals';
+import { AmplifyError } from 'aws-amplify/adapter-core/internals';
 import { parseAmplifyConfig } from 'aws-amplify/utils';
 
 import { NextServer } from '../types';
@@ -43,12 +39,12 @@ export function generateServerClientUsingCookies<
 		CookiesClientParams = DefaultCommonClientOptions & CookiesClientParams,
 >(options: Options): V6ClientSSRCookies<T, Options> {
 	if (typeof options.cookies !== 'function') {
-		throw new AmplifyServerContextError({
+		throw new AmplifyError({
+			name: 'InvalidCookiesError',
 			message:
 				'generateServerClientUsingCookies is only compatible with the `cookies` Dynamic Function available in Server Components.',
-			// TODO: link to docs
 			recoverySuggestion:
-				'use `generateServerClient` inside of `runWithAmplifyServerContext` with the `request` object.',
+				'Use `generateServerClient` inside of `runWithAmplifyServerContext` with the `request` object.',
 		});
 	}
 
@@ -61,8 +57,7 @@ export function generateServerClientUsingCookies<
 	const getAmplify = (fn: (amplify: any) => Promise<any>) =>
 		runWithAmplifyServerContext({
 			nextServerContext: { cookies: options.cookies },
-			operation: contextSpec =>
-				fn(getAmplifyServerContext(contextSpec).amplify),
+			operation: contextSpec => fn(contextSpec),
 		});
 
 	const { cookies: _cookies, config: _config, ...params } = options;
@@ -71,7 +66,7 @@ export function generateServerClientUsingCookies<
 		amplify: getAmplify,
 		config: resourcesConfig,
 		...params,
-	} as any); // TS can't narrow the type here.
+	});
 }
 
 /**
@@ -99,8 +94,8 @@ export function generateServerClientUsingReqRes<
 
 	const { config: _config, ...params } = options;
 
-	return generateClient<T>({
+	return generateClientWithAmplifyInstance<T, V6ClientSSRRequest<T, Options>>({
 		config: amplifyConfig,
 		...params,
-	}) as any;
+	});
 }

packages/adapter-nextjs/src/auth/createAuthRouteHandlersFactory.ts

@@ -3,7 +3,7 @@
 
 import { NextRequest } from 'next/server';
 import {
-	AmplifyServerContextError,
+	AmplifyError,
 	CookieStorage,
 	OAuthConfig,
 	assertOAuthConfig,
@@ -97,15 +97,17 @@ export const createAuthRouteHandlersFactory = ({
 		// origin validation should happen when createAuthRouteHandlers is being called to create
 		// Auth API routes.
 		if (!amplifyAppOrigin) {
-			throw new AmplifyServerContextError({
+			throw new AmplifyError({
+				name: 'MissingOriginError',
 				message: 'Could not find the AMPLIFY_APP_ORIGIN environment variable.',
 				recoverySuggestion:
 					'Add the AMPLIFY_APP_ORIGIN environment variable to the `.env` file of your Next.js project.',
 			});
 		}
 
 		if (!isValidOrigin(amplifyAppOrigin)) {
-			throw new AmplifyServerContextError({
+			throw new AmplifyError({
+				name: 'InvalidOriginError',
 				message:
 					'AMPLIFY_APP_ORIGIN environment variable contains an invalid origin string.',
 				recoverySuggestion:

packages/adapter-nextjs/src/auth/utils/resolveRedirectUrl.ts

@@ -1,10 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import {
-	AmplifyServerContextError,
-	OAuthConfig,
-} from 'aws-amplify/adapter-core/internals';
+import { AmplifyError, OAuthConfig } from 'aws-amplify/adapter-core/internals';
 
 export const resolveRedirectSignInUrl = (
 	origin: string,
@@ -36,8 +33,9 @@ export const resolveRedirectSignOutUrl = (
 	return redirectUrl;
 };
 
-const createError = (urlType: string): AmplifyServerContextError =>
-	new AmplifyServerContextError({
+const createError = (urlType: string): AmplifyError =>
+	new AmplifyError({
+		name: 'InvalidRedirectUrlError',
 		message: `No valid ${urlType} url found in the OAuth config.`,
 		recoverySuggestion: `Check the OAuth config and ensure the ${urlType} url is valid.`,
 	});

packages/adapter-nextjs/src/types/NextServer.ts

@@ -6,11 +6,10 @@ import { NextRequest, NextResponse } from 'next/server.js';
 import { cookies } from 'next/headers.js';
 import {
 	AmplifyOutputsUnknown,
-	AmplifyServer,
 	CookieStorage,
 	LegacyConfig,
 } from 'aws-amplify/adapter-core/internals';
-import { ResourcesConfig } from 'aws-amplify';
+import { AmplifyContext, ResourcesConfig } from 'aws-amplify';
 
 import { CreateAuthRouteHandlers } from '../auth/types';
 
@@ -71,7 +70,7 @@ export declare namespace NextServer {
 	export interface RunWithContextInput<OperationResult> {
 		nextServerContext: Context | null;
 		operation(
-			contextSpec: AmplifyServer.ContextSpec,
+			contextSpec: AmplifyContext,
 		): OperationResult | Promise<OperationResult>;
 	}
 

packages/adapter-nextjs/src/utils/createCookieStorageAdapterFromNextServerContext.ts

@@ -3,7 +3,7 @@
 
 import { NextRequest, NextResponse } from 'next/server.js';
 import {
-	AmplifyServerContextError,
+	AmplifyError,
 	CookieStorage,
 } from 'aws-amplify/adapter-core/internals';
 
@@ -78,7 +78,8 @@ export const createCookieStorageAdapterFromNextServerContext = async (
 	}
 
 	// This should not happen normally.
-	throw new AmplifyServerContextError({
+	throw new AmplifyError({
+		name: 'UnsupportedServerContextError',
 		message:
 			'Attempted to create cookie storage adapter from an unsupported Next.js server context.',
 	});

packages/adapter-nextjs/src/utils/createRunWithAmplifyServerContext.ts

@@ -1,14 +1,13 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { ResourcesConfig } from 'aws-amplify';
+import { ResourcesConfig, createAmplifyContext } from 'aws-amplify';
 import { sharedInMemoryStorage } from 'aws-amplify/utils';
 import { KeyValueStorageMethodValidator } from 'aws-amplify/adapter-core/internals';
 import {
 	createAWSCredentialsAndIdentityIdProvider,
 	createKeyValueStorageFromCookieStorageAdapter,
 	createUserPoolsTokenProvider,
-	runWithAmplifyServerContext as runWithAmplifyServerContextCore,
 } from 'aws-amplify/adapter-core';
 
 import { NextServer } from '../types';
@@ -75,18 +74,18 @@ export const createRunWithAmplifyServerContext = ({
 					keyValueStorage,
 				);
 
-				return runWithAmplifyServerContextCore(
-					resourcesConfig,
-					{
-						Auth: { credentialsProvider, tokenProvider },
-					},
-					operation,
-				);
+				const amplifyContext = createAmplifyContext(resourcesConfig, {
+					Auth: { credentialsProvider, tokenProvider },
+				});
+
+				return operation(amplifyContext);
 			}
 
 			// Otherwise it may be the case that auth is not used, e.g. API key.
 			// Omitting the `Auth` in the second parameter.
-			return runWithAmplifyServerContextCore(resourcesConfig, {}, operation);
+			const amplifyContext = createAmplifyContext(resourcesConfig, {});
+
+			return operation(amplifyContext);
 		};
 
 	return runWithAmplifyServerContext;

packages/analytics/__tests__/providers/kinesis-firehose/apis/flushEvents.test.ts

@@ -13,11 +13,21 @@ import {
 	mockKinesisConfig,
 } from '../../../testUtils/mockConstants';
 import { flushEvents } from '../../../../src/providers/kinesis-firehose/apis';
+import {
+	setupGlobalContext,
+	teardownGlobalContext,
+} from '../../../testUtils/mockAmplifyContext';
 
 jest.mock('../../../../src/utils');
 jest.mock('../../../../src/providers/kinesis-firehose/utils');
 
 describe('Analytics Kinesis Firehose API: flushEvents', () => {
+	beforeAll(() => {
+		setupGlobalContext();
+	});
+	afterAll(() => {
+		teardownGlobalContext();
+	});
 	const mockResolveConfig = resolveConfig as jest.Mock;
 	const mockResolveCredentials = resolveCredentials as jest.Mock;
 	const mockGetEventBuffer = getEventBuffer as jest.Mock;

packages/analytics/__tests__/providers/kinesis-firehose/apis/record.test.ts

@@ -14,11 +14,21 @@ import {
 } from '../../../testUtils/mockConstants';
 import { record } from '../../../../src/providers/kinesis-firehose';
 import { RecordInput as KinesisFirehoseRecordInput } from '../../../../src/providers/kinesis-firehose/types';
+import {
+	setupGlobalContext,
+	teardownGlobalContext,
+} from '../../../testUtils/mockAmplifyContext';
 
 jest.mock('../../../../src/utils');
 jest.mock('../../../../src/providers/kinesis-firehose/utils');
 
 describe('Analytics KinesisFirehose API: record', () => {
+	beforeAll(() => {
+		setupGlobalContext();
+	});
+	afterAll(() => {
+		teardownGlobalContext();
+	});
 	const mockRecordInput: KinesisFirehoseRecordInput = {
 		streamName: 'stream0',
 		data: new Uint8Array([0x01, 0x02, 0xff]),