@aws-amplify/api-graphql 4.0.1-console-preview.a1c533e.0 → 4.0.1-console-preview.23dc225.0

package/lib-esm/types/index.d.ts

@@ -2,7 +2,7 @@ import { AmplifyClassV6 } from '@aws-amplify/core';
 import { Source, DocumentNode, GraphQLError } from 'graphql';
 export { OperationTypeNode } from 'graphql';
 import { Observable } from 'rxjs';
-import { APIAuthMode, DocumentType } from '@aws-amplify/core/internals/utils';
+import { GraphQLAuthMode, DocumentType } from '@aws-amplify/core/internals/utils';
 export { CONTROL_MSG, ConnectionState } from './PubSub';
 /**
  * Loose/Unknown options for raw GraphQLAPICategory `graphql()`.
@@ -10,7 +10,7 @@ export { CONTROL_MSG, ConnectionState } from './PubSub';
 export interface GraphQLOptions {
     query: string | DocumentNode;
     variables?: Record<string, DocumentType>;
-    authMode?: APIAuthMode;
+    authMode?: GraphQLAuthMode;
     authToken?: string;
     /**
      * @deprecated This property should not be used
@@ -133,7 +133,7 @@ export declare type GraphqlSubscriptionMessage<T> = {
 };
 export interface AWSAppSyncRealTimeProviderOptions {
     appSyncGraphqlEndpoint?: string;
-    authenticationType?: APIAuthMode;
+    authenticationType?: GraphQLAuthMode;
     query?: string;
     variables?: Record<string, unknown>;
     apiKey?: string;
@@ -165,7 +165,7 @@ export declare type GraphQLOperation = Source | string;
 export interface GraphQLOptionsV6<FALLBACK_TYPES = unknown, TYPED_GQL_STRING extends string = string> {
     query: TYPED_GQL_STRING | DocumentNode;
     variables?: GraphQLVariablesV6<FALLBACK_TYPES, TYPED_GQL_STRING>;
-    authMode?: APIAuthMode;
+    authMode?: GraphQLAuthMode;
     authToken?: string;
     /**
      * @deprecated This property should not be used

package/lib-esm/utils/errors/validation.d.ts

@@ -1,8 +1,7 @@
 import { AmplifyErrorMap } from '@aws-amplify/core/internals/utils';
 export declare enum APIValidationErrorCode {
-    NoAppId = "NoAppId",
-    NoCredentials = "NoCredentials",
+    NoAuthSession = "NoAuthSession",
     NoRegion = "NoRegion",
-    NoDefaultAuthMode = "NoDefaultAuthMode"
+    NoCustomEndpoint = "NoCustomEndpoint"
 }
 export declare const validationErrorMap: AmplifyErrorMap<APIValidationErrorCode>;

package/lib-esm/utils/errors/validation.js

@@ -3,22 +3,22 @@
 var _a;
 export var APIValidationErrorCode;
 (function (APIValidationErrorCode) {
-    APIValidationErrorCode["NoAppId"] = "NoAppId";
-    APIValidationErrorCode["NoCredentials"] = "NoCredentials";
+    APIValidationErrorCode["NoAuthSession"] = "NoAuthSession";
     APIValidationErrorCode["NoRegion"] = "NoRegion";
-    APIValidationErrorCode["NoDefaultAuthMode"] = "NoDefaultAuthMode";
+    APIValidationErrorCode["NoCustomEndpoint"] = "NoCustomEndpoint";
 })(APIValidationErrorCode || (APIValidationErrorCode = {}));
 export var validationErrorMap = (_a = {},
-    _a[APIValidationErrorCode.NoAppId] = {
-        message: 'Missing application id.',
-    },
-    _a[APIValidationErrorCode.NoCredentials] = {
-        message: 'Credentials should not be empty.',
+    _a[APIValidationErrorCode.NoAuthSession] = {
+        message: 'Auth session should not be empty.',
     },
+    // TODO: re-enable when working in all test environments:
+    // [APIValidationErrorCode.NoEndpoint]: {
+    // 	message: 'Missing endpoint',
+    // },
     _a[APIValidationErrorCode.NoRegion] = {
         message: 'Missing region.',
     },
-    _a[APIValidationErrorCode.NoDefaultAuthMode] = {
-        message: 'Missing default auth mode',
+    _a[APIValidationErrorCode.NoCustomEndpoint] = {
+        message: 'Custom endpoint region is present without custom endpoint.',
     },
     _a);

package/lib-esm/utils/index.d.ts

@@ -1,2 +1,2 @@
 export { resolveConfig } from './resolveConfig';
-export { resolveCredentials } from './resolveCredentials';
+export { resolveLibraryOptions } from './resolveLibraryOptions';

package/lib-esm/utils/index.js

@@ -1,4 +1,4 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 export { resolveConfig } from './resolveConfig';
-export { resolveCredentials } from './resolveCredentials';
+export { resolveLibraryOptions } from './resolveLibraryOptions';

package/lib-esm/utils/resolveConfig.d.ts

@@ -1,8 +1,12 @@
+import { AmplifyClassV6 } from '@aws-amplify/core';
 /**
  * @internal
  */
-export declare const resolveConfig: () => {
-    endpoint: string;
-    region: string;
-    defaultAuthMode: import("@aws-amplify/core/lib-esm/libraryUtils").APIAuthMode;
+export declare const resolveConfig: (amplify: AmplifyClassV6) => {
+    apiKey: string | undefined;
+    customEndpoint: string | undefined;
+    customEndpointRegion: string | undefined;
+    defaultAuthMode: "apiKey" | "oidc" | "userPool" | "iam" | "lambda" | "none" | undefined;
+    endpoint: string | undefined;
+    region: string | undefined;
 };

package/lib-esm/utils/resolveConfig.js

@@ -1,15 +1,21 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { Amplify } from '@aws-amplify/core';
 import { APIValidationErrorCode, assertValidationError } from './errors';
 /**
  * @internal
  */
-export var resolveConfig = function () {
+export var resolveConfig = function (amplify) {
     var _a, _b;
-    var _c = (_b = (_a = Amplify.getConfig().API) === null || _a === void 0 ? void 0 : _a.GraphQL) !== null && _b !== void 0 ? _b : {}, region = _c.region, defaultAuthMode = _c.defaultAuthMode, endpoint = _c.endpoint;
-    assertValidationError(!!endpoint, APIValidationErrorCode.NoAppId);
-    assertValidationError(!!region, APIValidationErrorCode.NoRegion);
-    assertValidationError(!!defaultAuthMode, APIValidationErrorCode.NoDefaultAuthMode);
-    return { endpoint: endpoint, region: region, defaultAuthMode: defaultAuthMode };
+    var _c = (_b = (_a = amplify.getConfig().API) === null || _a === void 0 ? void 0 : _a.GraphQL) !== null && _b !== void 0 ? _b : {}, apiKey = _c.apiKey, customEndpoint = _c.customEndpoint, customEndpointRegion = _c.customEndpointRegion, defaultAuthMode = _c.defaultAuthMode, endpoint = _c.endpoint, region = _c.region;
+    // TODO: re-enable when working in all test environments:
+    // assertValidationError(!!endpoint, APIValidationErrorCode.NoEndpoint);
+    assertValidationError(!(!customEndpoint && customEndpointRegion), APIValidationErrorCode.NoCustomEndpoint);
+    return {
+        apiKey: apiKey,
+        customEndpoint: customEndpoint,
+        customEndpointRegion: customEndpointRegion,
+        defaultAuthMode: defaultAuthMode,
+        endpoint: endpoint,
+        region: region,
+    };
 };

package/lib-esm/utils/resolveLibraryOptions.d.ts

@@ -0,0 +1,11 @@
+import { AmplifyClassV6 } from '@aws-amplify/core';
+/**
+ * @internal
+ */
+export declare const resolveLibraryOptions: (amplify: AmplifyClassV6) => {
+    headers: ((options: {
+        query: string;
+        variables?: Record<string, import("@aws-amplify/core/lib-esm/libraryUtils").DocumentType> | undefined;
+    }) => Promise<Record<string, string>>) | undefined;
+    withCredentials: boolean | undefined;
+};

package/lib-esm/utils/resolveLibraryOptions.js

@@ -0,0 +1,11 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+/**
+ * @internal
+ */
+export var resolveLibraryOptions = function (amplify) {
+    var _a, _b, _c, _d, _e, _f;
+    var headers = (_c = (_b = (_a = amplify.libraryOptions) === null || _a === void 0 ? void 0 : _a.API) === null || _b === void 0 ? void 0 : _b.GraphQL) === null || _c === void 0 ? void 0 : _c.headers;
+    var withCredentials = (_f = (_e = (_d = amplify.libraryOptions) === null || _d === void 0 ? void 0 : _d.API) === null || _e === void 0 ? void 0 : _e.GraphQL) === null || _f === void 0 ? void 0 : _f.withCredentials;
+    return { headers: headers, withCredentials: withCredentials };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/api-graphql",
-	"version": "4.0.1-console-preview.a1c533e.0+a1c533e",
+	"version": "4.0.1-console-preview.23dc225.0+23dc225",
 	"description": "Api-graphql category of aws-amplify",
 	"main": "./lib/index.js",
 	"module": "./lib-esm/index.js",
@@ -47,15 +47,14 @@
 		"internals"
 	],
 	"dependencies": {
-		"@aws-amplify/api-rest": "4.0.1-console-preview.a1c533e.0+a1c533e",
-		"@aws-amplify/auth": "6.0.1-console-preview.a1c533e.0+a1c533e",
-		"@aws-amplify/core": "6.0.1-console-preview.a1c533e.0+a1c533e",
+		"@aws-amplify/api-rest": "4.0.1-console-preview.23dc225.0+23dc225",
+		"@aws-amplify/auth": "6.0.1-console-preview.23dc225.0+23dc225",
+		"@aws-amplify/core": "6.0.1-console-preview.23dc225.0+23dc225",
 		"@aws-sdk/types": "3.387.0",
 		"graphql": "15.8.0",
 		"rxjs": "^7.8.1",
 		"tslib": "^1.8.0",
-		"url": "0.11.0",
-		"uuid": "^3.2.1"
+		"url": "0.11.0"
 	},
 	"size-limit": [
 		{
@@ -122,5 +121,5 @@
 			"<rootDir>/__tests__"
 		]
 	},
-	"gitHead": "a1c533eae82c5386864fb15fc101bb3cb9bd93ae"
+	"gitHead": "23dc22531b963319f2b421f6f7c6cf867635b20e"
 }

package/src/Providers/AWSAppSyncRealTimeProvider/index.ts

@@ -3,12 +3,11 @@
 import { Observable, SubscriptionLike } from 'rxjs';
 import { GraphQLError } from 'graphql';
 import * as url from 'url';
-import { v4 as uuid } from 'uuid';
 import { Buffer } from 'buffer';
 import { Hub, fetchAuthSession } from '@aws-amplify/core';
 import { signRequest } from '@aws-amplify/core/internals/aws-client-utils';
 import {
-	APIAuthMode,
+	GraphQLAuthMode,
 	CustomUserAgentDetails,
 	Logger,
 	NonRetryableError,
@@ -17,6 +16,8 @@ import {
 	isNonRetryableError,
 	jitteredExponentialRetry,
 	DocumentType,
+	amplifyUuid,
+	AmplifyUrl,
 } from '@aws-amplify/core/internals/utils';
 
 import {
@@ -88,7 +89,7 @@ type ParsedMessagePayload = {
 
 export interface AWSAppSyncRealTimeProviderOptions {
 	appSyncGraphqlEndpoint?: string;
-	authenticationType?: APIAuthMode;
+	authenticationType?: GraphQLAuthMode;
 	query?: string;
 	variables?: Record<string, DocumentType>;
 	apiKey?: string;
@@ -210,7 +211,7 @@ export class AWSAppSyncRealTimeProvider {
 				observer.complete();
 			} else {
 				let subscriptionStartActive = false;
-				const subscriptionId = uuid();
+				const subscriptionId = amplifyUuid();
 				const startSubscription = () => {
 					if (!subscriptionStartActive) {
 						subscriptionStartActive = true;
@@ -884,7 +885,7 @@ export class AWSAppSyncRealTimeProvider {
 		Record<string, unknown> | undefined
 	> {
 		const headerHandler: {
-			[key in APIAuthMode]: (arg0: AWSAppSyncRealTimeAuthInput) => {};
+			[key in GraphQLAuthMode]: (arg0: AWSAppSyncRealTimeAuthInput) => {};
 		} = {
 			apiKey: this._awsRealTimeApiKeyHeader.bind(this),
 			iam: this._awsRealTimeIAMHeader.bind(this),
@@ -968,7 +969,7 @@ export class AWSAppSyncRealTimeProvider {
 			{
 				headers: request.headers,
 				method: request.method,
-				url: new URL(request.url),
+				url: new AmplifyUrl(request.url),
 				body: request.data,
 			},
 			{

package/src/internals/InternalGraphQLAPI.ts

@@ -11,10 +11,11 @@ import {
 import { Observable } from 'rxjs';
 import { AmplifyClassV6 } from '@aws-amplify/core';
 import {
-	APIAuthMode,
+	GraphQLAuthMode,
 	CustomUserAgentDetails,
 	ConsoleLogger as Logger,
 	getAmplifyUserAgent,
+	AmplifyUrl,
 } from '@aws-amplify/core/internals/utils';
 import {
 	GraphQLAuthError,
@@ -29,6 +30,7 @@ import {
 	updateRequestToBeCancellable,
 } from '@aws-amplify/api-rest/internals';
 import { AWSAppSyncRealTimeProvider } from '../Providers/AWSAppSyncRealTimeProvider';
+import { resolveConfig, resolveLibraryOptions } from '../utils';
 
 const USER_AGENT_HEADER = 'x-amz-user-agent';
 
@@ -54,7 +56,12 @@ export class InternalGraphQLAPIClass {
 	private _options;
 	private appSyncRealTime: AWSAppSyncRealTimeProvider | null;
 
-	private _api = { post, updateRequestToBeCancellable };
+	private _api = {
+		post,
+		cancelREST,
+		isCancelErrorREST,
+		updateRequestToBeCancellable,
+	};
 
 	/**
 	 * Initialize GraphQL API with AWS configuration
@@ -71,7 +78,7 @@ export class InternalGraphQLAPIClass {
 
 	private async _headerBasedAuth(
 		amplify: AmplifyClassV6,
-		authMode: APIAuthMode,
+		authMode: GraphQLAuthMode,
 		additionalHeaders: { [key: string]: string } = {}
 	) {
 		const config = amplify.getConfig();
@@ -80,7 +87,7 @@ export class InternalGraphQLAPIClass {
 			endpoint: appSyncGraphqlEndpoint,
 			apiKey,
 			defaultAuthMode,
-		} = config.API?.GraphQL || {};
+		} = resolveConfig(amplify);
 
 		const authenticationType = authMode || defaultAuthMode || 'iam';
 		let headers = {};
@@ -130,9 +137,6 @@ export class InternalGraphQLAPIClass {
 			case 'none':
 				break;
 			default:
-				headers = {
-					Authorization: null,
-				};
 				break;
 		}
 
@@ -218,25 +222,42 @@ export class InternalGraphQLAPIClass {
 		abortController: AbortController,
 		customUserAgentDetails?: CustomUserAgentDetails
 	): Promise<GraphQLResult<T>> {
-		const config = amplify.getConfig();
-
-		const { region: region, endpoint: appSyncGraphqlEndpoint } =
-			config.API?.GraphQL || {};
+		const {
+			region: region,
+			endpoint: appSyncGraphqlEndpoint,
+			customEndpoint,
+			customEndpointRegion,
+		} = resolveConfig(amplify);
 
-		const customGraphqlEndpoint = null;
-		const customEndpointRegion = null;
+		// Retrieve library options from Amplify configuration
+		const { headers: customHeaders, withCredentials } =
+			resolveLibraryOptions(amplify);
 
 		// TODO: Figure what we need to do to remove `!`'s.
 		const headers = {
-			...(!customGraphqlEndpoint &&
+			...(!customEndpoint &&
 				(await this._headerBasedAuth(amplify, authMode!, additionalHeaders))),
-			...((customGraphqlEndpoint &&
+			/**
+			 * Custom endpoint headers.
+			 * If there is both a custom endpoint and custom region present, we get the headers.
+			 * If there is a custom endpoint but no region, we return an empty object.
+			 * If neither are present, we return an empty object.
+			 */
+			...((customEndpoint &&
 				(customEndpointRegion
 					? await this._headerBasedAuth(amplify, authMode!, additionalHeaders)
-					: { Authorization: null })) ||
+					: {})) ||
 				{}),
+			// Custom headers included in Amplify configuration options:
+			...(customHeaders &&
+				(await customHeaders({
+					query: print(query as DocumentNode),
+					variables,
+				}))),
+			// Headers from individual calls to `graphql`:
 			...additionalHeaders,
-			...(!customGraphqlEndpoint && {
+			// User agent headers:
+			...(!customEndpoint && {
 				[USER_AGENT_HEADER]: getAmplifyUserAgent(customUserAgentDetails),
 			}),
 		};
@@ -246,7 +267,31 @@ export class InternalGraphQLAPIClass {
 			variables: variables || null,
 		};
 
-		const endpoint = customGraphqlEndpoint || appSyncGraphqlEndpoint;
+		let signingServiceInfo;
+
+		/**
+		 * We do not send the signing service info to the REST API under the
+		 * following conditions (i.e. it will not sign the request):
+		 *   - there is a custom endpoint but no region
+		 *   - the auth mode is `none`, or `apiKey`
+		 *   - the auth mode is a type other than the types listed below
+		 */
+		if (
+			(customEndpoint && !customEndpointRegion) ||
+			(authMode !== 'oidc' &&
+				authMode !== 'userPool' &&
+				authMode !== 'iam' &&
+				authMode !== 'lambda')
+		) {
+			signingServiceInfo = null;
+		} else {
+			signingServiceInfo = {
+				service: !customEndpointRegion ? 'appsync' : 'execute-api',
+				region: !customEndpointRegion ? region : customEndpointRegion,
+			};
+		}
+
+		const endpoint = customEndpoint || appSyncGraphqlEndpoint;
 
 		if (!endpoint) {
 			const error = new GraphQLError('No graphql endpoint provided.');
@@ -260,14 +305,12 @@ export class InternalGraphQLAPIClass {
 		let response;
 		try {
 			const { body: responseBody } = await this._api.post({
-				url: new URL(endpoint),
+				url: new AmplifyUrl(endpoint),
 				options: {
 					headers,
 					body,
-					signingServiceInfo: {
-						service: 'appsync',
-						region,
-					},
+					signingServiceInfo,
+					withCredentials,
 				},
 				abortController,
 			});
@@ -279,7 +322,7 @@ export class InternalGraphQLAPIClass {
 			// If the exception is because user intentionally
 			// cancelled the request, do not modify the exception
 			// so that clients can identify the exception correctly.
-			if (isCancelErrorREST(err)) {
+			if (this._api.isCancelErrorREST(err)) {
 				throw err;
 			}
 
@@ -304,7 +347,7 @@ export class InternalGraphQLAPIClass {
 	 * @return {boolean} - A boolean indicating if the error was from an api request cancellation
 	 */
 	isCancelError(error: any): boolean {
-		return isCancelErrorREST(error);
+		return this._api.isCancelErrorREST(error);
 	}
 
 	/**
@@ -313,7 +356,7 @@ export class InternalGraphQLAPIClass {
 	 * @returns - A boolean indicating if the request was cancelled
 	 */
 	cancel(request: Promise<any>, message?: string): boolean {
-		return cancelREST(request, message);
+		return this._api.cancelREST(request, message);
 	}
 
 	private _graphqlSubscribe(
@@ -322,7 +365,8 @@ export class InternalGraphQLAPIClass {
 		additionalHeaders = {},
 		customUserAgentDetails?: CustomUserAgentDetails
 	): Observable<any> {
-		const { GraphQL } = amplify.getConfig().API ?? {};
+		const config = resolveConfig(amplify);
+
 		if (!this.appSyncRealTime) {
 			this.appSyncRealTime = new AWSAppSyncRealTimeProvider();
 		}
@@ -330,10 +374,10 @@ export class InternalGraphQLAPIClass {
 			{
 				query: print(query as DocumentNode),
 				variables,
-				appSyncGraphqlEndpoint: GraphQL?.endpoint,
-				region: GraphQL?.region,
-				authenticationType: authMode ?? GraphQL?.defaultAuthMode,
-				apiKey: GraphQL?.apiKey,
+				appSyncGraphqlEndpoint: config?.endpoint,
+				region: config?.region,
+				authenticationType: config?.defaultAuthMode,
+				apiKey: config?.apiKey,
 				additionalHeaders,
 			},
 			customUserAgentDetails

package/src/types/index.ts

@@ -5,7 +5,10 @@ import { Source, DocumentNode, GraphQLError } from 'graphql';
 export { OperationTypeNode } from 'graphql';
 import { Observable } from 'rxjs';
 
-import { APIAuthMode, DocumentType } from '@aws-amplify/core/internals/utils';
+import {
+	GraphQLAuthMode,
+	DocumentType,
+} from '@aws-amplify/core/internals/utils';
 export { CONTROL_MSG, ConnectionState } from './PubSub';
 /**
  * Loose/Unknown options for raw GraphQLAPICategory `graphql()`.
@@ -13,7 +16,7 @@ export { CONTROL_MSG, ConnectionState } from './PubSub';
 export interface GraphQLOptions {
 	query: string | DocumentNode;
 	variables?: Record<string, DocumentType>;
-	authMode?: APIAuthMode;
+	authMode?: GraphQLAuthMode;
 	authToken?: string;
 	/**
 	 * @deprecated This property should not be used
@@ -159,7 +162,7 @@ export type GraphqlSubscriptionMessage<T> = {
 
 export interface AWSAppSyncRealTimeProviderOptions {
 	appSyncGraphqlEndpoint?: string;
-	authenticationType?: APIAuthMode;
+	authenticationType?: GraphQLAuthMode;
 	query?: string;
 	variables?: Record<string, unknown>;
 	apiKey?: string;
@@ -198,7 +201,7 @@ export interface GraphQLOptionsV6<
 > {
 	query: TYPED_GQL_STRING | DocumentNode;
 	variables?: GraphQLVariablesV6<FALLBACK_TYPES, TYPED_GQL_STRING>;
-	authMode?: APIAuthMode;
+	authMode?: GraphQLAuthMode;
 	authToken?: string;
 	/**
 	 * @deprecated This property should not be used

package/src/utils/errors/validation.ts

@@ -4,23 +4,23 @@
 import { AmplifyErrorMap } from '@aws-amplify/core/internals/utils';
 
 export enum APIValidationErrorCode {
-	NoAppId = 'NoAppId',
-	NoCredentials = 'NoCredentials',
+	NoAuthSession = 'NoAuthSession',
 	NoRegion = 'NoRegion',
-	NoDefaultAuthMode = 'NoDefaultAuthMode',
+	NoCustomEndpoint = 'NoCustomEndpoint',
 }
 
 export const validationErrorMap: AmplifyErrorMap<APIValidationErrorCode> = {
-	[APIValidationErrorCode.NoAppId]: {
-		message: 'Missing application id.',
-	},
-	[APIValidationErrorCode.NoCredentials]: {
-		message: 'Credentials should not be empty.',
+	[APIValidationErrorCode.NoAuthSession]: {
+		message: 'Auth session should not be empty.',
 	},
+	// TODO: re-enable when working in all test environments:
+	// [APIValidationErrorCode.NoEndpoint]: {
+	// 	message: 'Missing endpoint',
+	// },
 	[APIValidationErrorCode.NoRegion]: {
 		message: 'Missing region.',
 	},
-	[APIValidationErrorCode.NoDefaultAuthMode]: {
-		message: 'Missing default auth mode',
+	[APIValidationErrorCode.NoCustomEndpoint]: {
+		message: 'Custom endpoint region is present without custom endpoint.',
 	},
 };

package/src/utils/index.ts

@@ -2,4 +2,4 @@
 // SPDX-License-Identifier: Apache-2.0
 
 export { resolveConfig } from './resolveConfig';
-export { resolveCredentials } from './resolveCredentials';
+export { resolveLibraryOptions } from './resolveLibraryOptions';

package/src/utils/resolveConfig.ts

@@ -1,20 +1,35 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { Amplify } from '@aws-amplify/core';
+import { AmplifyClassV6 } from '@aws-amplify/core';
 import { APIValidationErrorCode, assertValidationError } from './errors';
 
 /**
  * @internal
  */
-export const resolveConfig = () => {
-	const { region, defaultAuthMode, endpoint } =
-		Amplify.getConfig().API?.GraphQL ?? {};
-	assertValidationError(!!endpoint, APIValidationErrorCode.NoAppId);
-	assertValidationError(!!region, APIValidationErrorCode.NoRegion);
+export const resolveConfig = (amplify: AmplifyClassV6) => {
+	const {
+		apiKey,
+		customEndpoint,
+		customEndpointRegion,
+		defaultAuthMode,
+		endpoint,
+		region,
+	} = amplify.getConfig().API?.GraphQL ?? {};
+
+	// TODO: re-enable when working in all test environments:
+	// assertValidationError(!!endpoint, APIValidationErrorCode.NoEndpoint);
 	assertValidationError(
-		!!defaultAuthMode,
-		APIValidationErrorCode.NoDefaultAuthMode
+		!(!customEndpoint && customEndpointRegion),
+		APIValidationErrorCode.NoCustomEndpoint
 	);
-	return { endpoint, region, defaultAuthMode };
+
+	return {
+		apiKey,
+		customEndpoint,
+		customEndpointRegion,
+		defaultAuthMode,
+		endpoint,
+		region,
+	};
 };

package/src/utils/resolveLibraryOptions.ts

@@ -0,0 +1,13 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { AmplifyClassV6 } from '@aws-amplify/core';
+
+/**
+ * @internal
+ */
+export const resolveLibraryOptions = (amplify: AmplifyClassV6) => {
+	const headers = amplify.libraryOptions?.API?.GraphQL?.headers;
+	const withCredentials = amplify.libraryOptions?.API?.GraphQL?.withCredentials;
+	return { headers, withCredentials };
+};

package/lib/utils/resolveCredentials.d.ts

@@ -1,12 +0,0 @@
-/**
- * @internal
- */
-export declare const resolveCredentials: () => Promise<{
-    credentials: {
-        accessKeyId: string;
-        secretAccessKey: string;
-        sessionToken?: string | undefined;
-        expiration?: Date | undefined;
-    };
-    identityId: string | undefined;
-}>;

package/lib/utils/resolveCredentials.js

@@ -1,22 +0,0 @@
-"use strict";
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-var core_1 = require("@aws-amplify/core");
-var errors_1 = require("./errors");
-/**
- * @internal
- */
-exports.resolveCredentials = function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-    var _a, credentials, identityId;
-    return tslib_1.__generator(this, function (_b) {
-        switch (_b.label) {
-            case 0: return [4 /*yield*/, core_1.fetchAuthSession()];
-            case 1:
-                _a = _b.sent(), credentials = _a.credentials, identityId = _a.identityId;
-                errors_1.assertValidationError(!!credentials, errors_1.APIValidationErrorCode.NoCredentials);
-                return [2 /*return*/, { credentials: credentials, identityId: identityId }];
-        }
-    });
-}); };

package/lib-esm/utils/resolveCredentials.d.ts

@@ -1,12 +0,0 @@
-/**
- * @internal
- */
-export declare const resolveCredentials: () => Promise<{
-    credentials: {
-        accessKeyId: string;
-        secretAccessKey: string;
-        sessionToken?: string | undefined;
-        expiration?: Date | undefined;
-    };
-    identityId: string | undefined;
-}>;