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

package/lib/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/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/utils/errors/validation.js

@@ -5,22 +5,22 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 var APIValidationErrorCode;
 (function (APIValidationErrorCode) {
-    APIValidationErrorCode["NoAppId"] = "NoAppId";
-    APIValidationErrorCode["NoCredentials"] = "NoCredentials";
+    APIValidationErrorCode["NoAuthSession"] = "NoAuthSession";
     APIValidationErrorCode["NoRegion"] = "NoRegion";
-    APIValidationErrorCode["NoDefaultAuthMode"] = "NoDefaultAuthMode";
+    APIValidationErrorCode["NoCustomEndpoint"] = "NoCustomEndpoint";
 })(APIValidationErrorCode = exports.APIValidationErrorCode || (exports.APIValidationErrorCode = {}));
 exports.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/utils/index.d.ts

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

package/lib/utils/index.js

@@ -4,5 +4,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var resolveConfig_1 = require("./resolveConfig");
 exports.resolveConfig = resolveConfig_1.resolveConfig;
-var resolveCredentials_1 = require("./resolveCredentials");
-exports.resolveCredentials = resolveCredentials_1.resolveCredentials;
+var resolveLibraryOptions_1 = require("./resolveLibraryOptions");
+exports.resolveLibraryOptions = resolveLibraryOptions_1.resolveLibraryOptions;

package/lib/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/utils/resolveConfig.js

@@ -2,16 +2,22 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
-var core_1 = require("@aws-amplify/core");
 var errors_1 = require("./errors");
 /**
  * @internal
  */
-exports.resolveConfig = function () {
+exports.resolveConfig = function (amplify) {
     var _a, _b;
-    var _c = (_b = (_a = core_1.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;
-    errors_1.assertValidationError(!!endpoint, errors_1.APIValidationErrorCode.NoAppId);
-    errors_1.assertValidationError(!!region, errors_1.APIValidationErrorCode.NoRegion);
-    errors_1.assertValidationError(!!defaultAuthMode, errors_1.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);
+    errors_1.assertValidationError(!(!customEndpoint && customEndpointRegion), errors_1.APIValidationErrorCode.NoCustomEndpoint);
+    return {
+        apiKey: apiKey,
+        customEndpoint: customEndpoint,
+        customEndpointRegion: customEndpointRegion,
+        defaultAuthMode: defaultAuthMode,
+        endpoint: endpoint,
+        region: region,
+    };
 };

package/lib/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/utils/resolveLibraryOptions.js

@@ -0,0 +1,13 @@
+"use strict";
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * @internal
+ */
+exports.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/lib-esm/Providers/AWSAppSyncRealTimeProvider/index.d.ts

@@ -1,5 +1,5 @@
 import { Observable } from 'rxjs';
-import { APIAuthMode, CustomUserAgentDetails, DocumentType } from '@aws-amplify/core/internals/utils';
+import { GraphQLAuthMode, CustomUserAgentDetails, DocumentType } from '@aws-amplify/core/internals/utils';
 import { PubSubContentObserver } from '../../types/PubSub';
 import { SUBSCRIPTION_STATUS } from '../constants';
 export declare type ObserverQuery = {
@@ -13,7 +13,7 @@ export declare type ObserverQuery = {
 };
 export interface AWSAppSyncRealTimeProviderOptions {
     appSyncGraphqlEndpoint?: string;
-    authenticationType?: APIAuthMode;
+    authenticationType?: GraphQLAuthMode;
     query?: string;
     variables?: Record<string, DocumentType>;
     apiKey?: string;

package/lib-esm/Providers/AWSAppSyncRealTimeProvider/index.js

@@ -4,11 +4,10 @@ import { __assign, __awaiter, __generator, __read } from "tslib";
 import { Observable } 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 { Logger, NonRetryableError, USER_AGENT_HEADER, getAmplifyUserAgent, isNonRetryableError, jitteredExponentialRetry, } from '@aws-amplify/core/internals/utils';
+import { Logger, NonRetryableError, USER_AGENT_HEADER, getAmplifyUserAgent, isNonRetryableError, jitteredExponentialRetry, amplifyUuid, AmplifyUrl, } from '@aws-amplify/core/internals/utils';
 import { CONTROL_MSG, ConnectionState, } from '../../types/PubSub';
 import { AMPLIFY_SYMBOL, AWS_APPSYNC_REALTIME_HEADERS, CONNECTION_INIT_TIMEOUT, DEFAULT_KEEP_ALIVE_TIMEOUT, DEFAULT_KEEP_ALIVE_ALERT_TIMEOUT, MAX_DELAY_MS, MESSAGE_TYPES, NON_RETRYABLE_CODES, SOCKET_STATUS, START_ACK_TIMEOUT, SUBSCRIPTION_STATUS, CONNECTION_STATE_CHANGE, } from '../constants';
 import { ConnectionStateMonitor, CONNECTION_CHANGE, } from '../../utils/ConnectionStateMonitor';
@@ -95,7 +94,7 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function () {
             }
             else {
                 var subscriptionStartActive_1 = false;
-                var subscriptionId_1 = uuid();
+                var subscriptionId_1 = amplifyUuid();
                 var startSubscription_1 = function () {
                     if (!subscriptionStartActive_1) {
                         subscriptionStartActive_1 = true;
@@ -776,7 +775,7 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function () {
                         signed_params = signRequest({
                             headers: request.headers,
                             method: request.method,
-                            url: new URL(request.url),
+                            url: new AmplifyUrl(request.url),
                             body: request.data,
                         }, {
                             // TODO: What do we need to do to remove these !'s?

package/lib-esm/internals/InternalGraphQLAPI.js

@@ -2,11 +2,12 @@ import { __assign, __awaiter, __generator, __read } from "tslib";
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { print, parse, GraphQLError, } from 'graphql';
-import { ConsoleLogger as Logger, getAmplifyUserAgent, } from '@aws-amplify/core/internals/utils';
+import { ConsoleLogger as Logger, getAmplifyUserAgent, AmplifyUrl, } from '@aws-amplify/core/internals/utils';
 import { GraphQLAuthError, } from '../types';
 import { isCancelError as isCancelErrorREST } from '@aws-amplify/api-rest';
 import { post, cancel as cancelREST, updateRequestToBeCancellable, } from '@aws-amplify/api-rest/internals';
 import { AWSAppSyncRealTimeProvider } from '../Providers/AWSAppSyncRealTimeProvider';
+import { resolveConfig, resolveLibraryOptions } from '../utils';
 var USER_AGENT_HEADER = 'x-amz-user-agent';
 var logger = new Logger('GraphQLAPI');
 export var graphqlOperation = function (query, variables, authToken) {
@@ -26,7 +27,12 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
      * @param {Object} options - Configuration object for API
      */
     function InternalGraphQLAPIClass(options) {
-        this._api = { post: post, updateRequestToBeCancellable: updateRequestToBeCancellable };
+        this._api = {
+            post: post,
+            cancelREST: cancelREST,
+            isCancelErrorREST: isCancelErrorREST,
+            updateRequestToBeCancellable: updateRequestToBeCancellable,
+        };
         this._options = options;
         logger.debug('API Options', this._options);
     }
@@ -35,18 +41,18 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
     };
     InternalGraphQLAPIClass.prototype._headerBasedAuth = function (amplify, authMode, additionalHeaders) {
         if (additionalHeaders === void 0) { additionalHeaders = {}; }
-        var _a, _b;
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var config, _c, region, appSyncGraphqlEndpoint, apiKey, defaultAuthMode, authenticationType, headers, _d, session, token, e_1;
-            return __generator(this, function (_e) {
-                switch (_e.label) {
+            var config, _b, region, appSyncGraphqlEndpoint, apiKey, defaultAuthMode, authenticationType, headers, _c, session, token, e_1;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         config = amplify.getConfig();
-                        _c = ((_a = config.API) === null || _a === void 0 ? void 0 : _a.GraphQL) || {}, region = _c.region, appSyncGraphqlEndpoint = _c.endpoint, apiKey = _c.apiKey, defaultAuthMode = _c.defaultAuthMode;
+                        _b = resolveConfig(amplify), region = _b.region, appSyncGraphqlEndpoint = _b.endpoint, apiKey = _b.apiKey, defaultAuthMode = _b.defaultAuthMode;
                         authenticationType = authMode || defaultAuthMode || 'iam';
                         headers = {};
-                        _d = authenticationType;
-                        switch (_d) {
+                        _c = authenticationType;
+                        switch (_c) {
                             case 'apiKey': return [3 /*break*/, 1];
                             case 'iam': return [3 /*break*/, 2];
                             case 'oidc': return [3 /*break*/, 4];
@@ -65,17 +71,17 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
                         return [3 /*break*/, 11];
                     case 2: return [4 /*yield*/, amplify.Auth.fetchAuthSession()];
                     case 3:
-                        session = _e.sent();
+                        session = _d.sent();
                         if (session.credentials === undefined) {
                             throw new Error(GraphQLAuthError.NO_CREDENTIALS);
                         }
                         return [3 /*break*/, 11];
                     case 4:
-                        _e.trys.push([4, 6, , 7]);
+                        _d.trys.push([4, 6, , 7]);
                         token = void 0;
                         return [4 /*yield*/, amplify.Auth.fetchAuthSession()];
                     case 5:
-                        token = (_b = (_e.sent()).tokens) === null || _b === void 0 ? void 0 : _b.accessToken.toString();
+                        token = (_a = (_d.sent()).tokens) === null || _a === void 0 ? void 0 : _a.accessToken.toString();
                         if (!token) {
                             throw new Error(GraphQLAuthError.NO_FEDERATED_JWT);
                         }
@@ -84,7 +90,7 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
                         };
                         return [3 /*break*/, 7];
                     case 6:
-                        e_1 = _e.sent();
+                        e_1 = _d.sent();
                         throw new Error(GraphQLAuthError.NO_CURRENT_USER);
                     case 7: return [3 /*break*/, 11];
                     case 8:
@@ -96,11 +102,7 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
                         };
                         return [3 /*break*/, 11];
                     case 9: return [3 /*break*/, 11];
-                    case 10:
-                        headers = {
-                            Authorization: null,
-                        };
-                        return [3 /*break*/, 11];
+                    case 10: return [3 /*break*/, 11];
                     case 11: return [2 /*return*/, headers];
                 }
             });
@@ -151,49 +153,77 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
     InternalGraphQLAPIClass.prototype._graphql = function (amplify, _a, additionalHeaders, abortController, customUserAgentDetails) {
         var query = _a.query, variables = _a.variables, authMode = _a.authMode;
         if (additionalHeaders === void 0) { additionalHeaders = {}; }
-        var _b;
         return __awaiter(this, void 0, void 0, function () {
-            var config, _c, region, appSyncGraphqlEndpoint, customGraphqlEndpoint, customEndpointRegion, headers, _d, _e, _f, _g, _h, body, endpoint, error, response, responseBody, result, err_1, errors;
-            var _j;
-            return __generator(this, function (_k) {
-                switch (_k.label) {
+            var _b, region, appSyncGraphqlEndpoint, customEndpoint, customEndpointRegion, _c, customHeaders, withCredentials, headers, _d, _e, _f, _g, _h, _j, _k, body, signingServiceInfo, endpoint, error, response, responseBody, result, err_1, errors;
+            var _l;
+            return __generator(this, function (_m) {
+                switch (_m.label) {
                     case 0:
-                        config = amplify.getConfig();
-                        _c = ((_b = config.API) === null || _b === void 0 ? void 0 : _b.GraphQL) || {}, region = _c.region, appSyncGraphqlEndpoint = _c.endpoint;
-                        customGraphqlEndpoint = null;
-                        customEndpointRegion = null;
+                        _b = resolveConfig(amplify), region = _b.region, appSyncGraphqlEndpoint = _b.endpoint, customEndpoint = _b.customEndpoint, customEndpointRegion = _b.customEndpointRegion;
+                        _c = resolveLibraryOptions(amplify), customHeaders = _c.headers, withCredentials = _c.withCredentials;
                         _d = [{}];
-                        _e = !customGraphqlEndpoint;
+                        _e = !customEndpoint;
                         if (!_e) return [3 /*break*/, 2];
                         return [4 /*yield*/, this._headerBasedAuth(amplify, authMode, additionalHeaders)];
                     case 1:
-                        _e = (_k.sent());
-                        _k.label = 2;
+                        _e = (_m.sent());
+                        _m.label = 2;
                     case 2:
                         _f = [__assign.apply(void 0, _d.concat([(_e)]))];
-                        _g = customGraphqlEndpoint;
+                        _g = customEndpoint;
                         if (!_g) return [3 /*break*/, 6];
                         if (!customEndpointRegion) return [3 /*break*/, 4];
                         return [4 /*yield*/, this._headerBasedAuth(amplify, authMode, additionalHeaders)];
                     case 3:
-                        _h = _k.sent();
+                        _h = _m.sent();
                         return [3 /*break*/, 5];
                     case 4:
-                        _h = { Authorization: null };
-                        _k.label = 5;
+                        _h = {};
+                        _m.label = 5;
                     case 5:
                         _g = (_h);
-                        _k.label = 6;
+                        _m.label = 6;
                     case 6:
-                        headers = __assign.apply(void 0, [__assign.apply(void 0, [__assign.apply(void 0, _f.concat([((_g) ||
-                                        {})])), additionalHeaders]), (!customGraphqlEndpoint && (_j = {},
-                                _j[USER_AGENT_HEADER] = getAmplifyUserAgent(customUserAgentDetails),
-                                _j))]);
+                        _j = [__assign.apply(void 0, _f.concat([((_g) ||
+                                    {})]))];
+                        _k = customHeaders;
+                        if (!_k) return [3 /*break*/, 8];
+                        return [4 /*yield*/, customHeaders({
+                                query: print(query),
+                                variables: variables,
+                            })];
+                    case 7:
+                        _k = (_m.sent());
+                        _m.label = 8;
+                    case 8:
+                        headers = __assign.apply(void 0, [__assign.apply(void 0, [__assign.apply(void 0, _j.concat([(_k)])), additionalHeaders]), (!customEndpoint && (_l = {},
+                                _l[USER_AGENT_HEADER] = getAmplifyUserAgent(customUserAgentDetails),
+                                _l))]);
                         body = {
                             query: print(query),
                             variables: variables || null,
                         };
-                        endpoint = customGraphqlEndpoint || appSyncGraphqlEndpoint;
+                        /**
+                         * 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,
+                            };
+                        }
+                        endpoint = customEndpoint || appSyncGraphqlEndpoint;
                         if (!endpoint) {
                             error = new GraphQLError('No graphql endpoint provided.');
                             throw {
@@ -201,42 +231,40 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
                                 errors: [error],
                             };
                         }
-                        _k.label = 7;
-                    case 7:
-                        _k.trys.push([7, 10, , 11]);
+                        _m.label = 9;
+                    case 9:
+                        _m.trys.push([9, 12, , 13]);
                         return [4 /*yield*/, this._api.post({
-                                url: new URL(endpoint),
+                                url: new AmplifyUrl(endpoint),
                                 options: {
                                     headers: headers,
                                     body: body,
-                                    signingServiceInfo: {
-                                        service: 'appsync',
-                                        region: region,
-                                    },
+                                    signingServiceInfo: signingServiceInfo,
+                                    withCredentials: withCredentials,
                                 },
                                 abortController: abortController,
                             })];
-                    case 8:
-                        responseBody = (_k.sent()).body;
+                    case 10:
+                        responseBody = (_m.sent()).body;
                         return [4 /*yield*/, responseBody.json()];
-                    case 9:
-                        result = _k.sent();
+                    case 11:
+                        result = _m.sent();
                         response = result;
-                        return [3 /*break*/, 11];
-                    case 10:
-                        err_1 = _k.sent();
+                        return [3 /*break*/, 13];
+                    case 12:
+                        err_1 = _m.sent();
                         // 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_1)) {
+                        if (this._api.isCancelErrorREST(err_1)) {
                             throw err_1;
                         }
                         response = {
                             data: {},
                             errors: [new GraphQLError(err_1.message, null, null, null, null, err_1)],
                         };
-                        return [3 /*break*/, 11];
-                    case 11:
+                        return [3 /*break*/, 13];
+                    case 13:
                         errors = response.errors;
                         if (errors && errors.length) {
                             throw response;
@@ -252,7 +280,7 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
      * @return {boolean} - A boolean indicating if the error was from an api request cancellation
      */
     InternalGraphQLAPIClass.prototype.isCancelError = function (error) {
-        return isCancelErrorREST(error);
+        return this._api.isCancelErrorREST(error);
     };
     /**
      * Cancels an inflight request. Only applicable for graphql queries and mutations
@@ -260,23 +288,22 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
      * @returns - A boolean indicating if the request was cancelled
      */
     InternalGraphQLAPIClass.prototype.cancel = function (request, message) {
-        return cancelREST(request, message);
+        return this._api.cancelREST(request, message);
     };
     InternalGraphQLAPIClass.prototype._graphqlSubscribe = function (amplify, _a, additionalHeaders, customUserAgentDetails) {
         var query = _a.query, variables = _a.variables, authMode = _a.authMode;
         if (additionalHeaders === void 0) { additionalHeaders = {}; }
-        var _b;
-        var GraphQL = ((_b = amplify.getConfig().API) !== null && _b !== void 0 ? _b : {}).GraphQL;
+        var config = resolveConfig(amplify);
         if (!this.appSyncRealTime) {
             this.appSyncRealTime = new AWSAppSyncRealTimeProvider();
         }
         return this.appSyncRealTime.subscribe({
             query: print(query),
             variables: variables,
-            appSyncGraphqlEndpoint: GraphQL === null || GraphQL === void 0 ? void 0 : GraphQL.endpoint,
-            region: GraphQL === null || GraphQL === void 0 ? void 0 : GraphQL.region,
-            authenticationType: authMode !== null && authMode !== void 0 ? authMode : GraphQL === null || GraphQL === void 0 ? void 0 : GraphQL.defaultAuthMode,
-            apiKey: GraphQL === null || GraphQL === void 0 ? void 0 : GraphQL.apiKey,
+            appSyncGraphqlEndpoint: config === null || config === void 0 ? void 0 : config.endpoint,
+            region: config === null || config === void 0 ? void 0 : config.region,
+            authenticationType: config === null || config === void 0 ? void 0 : config.defaultAuthMode,
+            apiKey: config === null || config === void 0 ? void 0 : config.apiKey,
             additionalHeaders: additionalHeaders,
         }, customUserAgentDetails);
     };