@aws-amplify/api-graphql 4.0.1-console-preview.deaebd5.0 → 4.0.1-console-preview.b5a42af.0

package/lib/Providers/AWSAppSyncRealTimeProvider/index.d.ts

@@ -1,8 +1,7 @@
 import { Observable } from 'rxjs';
+import { APIAuthMode, CustomUserAgentDetails, DocumentType } from '@aws-amplify/core/internals/utils';
 import { PubSubContentObserver } from '../../types/PubSub';
 import { SUBSCRIPTION_STATUS } from '../constants';
-import { CustomUserAgentDetails, GraphQLAuthMode } from '@aws-amplify/core/internals/utils';
-import { DocumentType } from '@aws-amplify/api-rest';
 export declare type ObserverQuery = {
     observer: PubSubContentObserver;
     query: string;
@@ -14,7 +13,7 @@ export declare type ObserverQuery = {
 };
 export interface AWSAppSyncRealTimeProviderOptions {
     appSyncGraphqlEndpoint?: string;
-    authenticationType?: GraphQLAuthMode;
+    authenticationType?: APIAuthMode;
     query?: string;
     variables?: Record<string, DocumentType>;
     apiKey?: string;
@@ -58,7 +57,7 @@ export declare class AWSAppSyncRealTimeProvider {
     private _initializeRetryableHandshake;
     private _initializeHandshake;
     private _awsRealTimeHeaderBasedAuth;
-    private _awsRealTimeOPENIDHeader;
+    private _awsAuthTokenHeader;
     private _awsRealTimeApiKeyHeader;
     private _awsRealTimeIAMHeader;
     private _customAuthHeader;

package/lib/Providers/AWSAppSyncRealTimeProvider/index.js

@@ -9,12 +9,12 @@ var url = tslib_1.__importStar(require("url"));
 var uuid_1 = require("uuid");
 var buffer_1 = require("buffer");
 var core_1 = require("@aws-amplify/core");
-var PubSub_1 = require("../../types/PubSub");
 var aws_client_utils_1 = require("@aws-amplify/core/internals/aws-client-utils");
+var utils_1 = require("@aws-amplify/core/internals/utils");
+var PubSub_1 = require("../../types/PubSub");
 var constants_1 = require("../constants");
 var ConnectionStateMonitor_1 = require("../../utils/ConnectionStateMonitor");
 var ReconnectionMonitor_1 = require("../../utils/ReconnectionMonitor");
-var utils_1 = require("@aws-amplify/core/internals/utils");
 var logger = new utils_1.Logger('AWSAppSyncRealTimeProvider');
 var dispatchApiEvent = function (payload) {
     core_1.Hub.dispatch('api', payload, 'PubSub', constants_1.AMPLIFY_SYMBOL);
@@ -85,7 +85,7 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function () {
     };
     AWSAppSyncRealTimeProvider.prototype.subscribe = function (options, customUserAgentDetails) {
         var _this = this;
-        var _a = options || {}, appSyncGraphqlEndpoint = _a.appSyncGraphqlEndpoint, region = _a.region, query = _a.query, variables = _a.variables, authenticationType = _a.authenticationType, additionalHeaders = _a.additionalHeaders;
+        var _a = options || {}, appSyncGraphqlEndpoint = _a.appSyncGraphqlEndpoint, region = _a.region, query = _a.query, variables = _a.variables, authenticationType = _a.authenticationType, additionalHeaders = _a.additionalHeaders, apiKey = _a.apiKey;
         return new rxjs_1.Observable(function (observer) {
             if (!options || !appSyncGraphqlEndpoint) {
                 observer.error({
@@ -109,6 +109,7 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function () {
                                 authenticationType: authenticationType,
                                 appSyncGraphqlEndpoint: appSyncGraphqlEndpoint,
                                 additionalHeaders: additionalHeaders,
+                                apiKey: apiKey,
                             },
                             observer: observer,
                             subscriptionId: subscriptionId_1,
@@ -680,34 +681,36 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function () {
         });
     };
     AWSAppSyncRealTimeProvider.prototype._awsRealTimeHeaderBasedAuth = function (_a) {
-        var authenticationType = _a.authenticationType, payload = _a.payload, canonicalUri = _a.canonicalUri, appSyncGraphqlEndpoint = _a.appSyncGraphqlEndpoint, region = _a.region, additionalHeaders = _a.additionalHeaders;
+        var apiKey = _a.apiKey, authenticationType = _a.authenticationType, payload = _a.payload, canonicalUri = _a.canonicalUri, appSyncGraphqlEndpoint = _a.appSyncGraphqlEndpoint, region = _a.region, additionalHeaders = _a.additionalHeaders;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var headerHandler, handler, host, apiKey, result;
+            var headerHandler, handler, host, resolvedApiKey, result;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         headerHandler = {
                             apiKey: this._awsRealTimeApiKeyHeader.bind(this),
                             iam: this._awsRealTimeIAMHeader.bind(this),
-                            jwt: this._awsRealTimeOPENIDHeader.bind(this),
-                            custom: this._customAuthHeader,
+                            oidc: this._awsAuthTokenHeader.bind(this),
+                            userPool: this._awsAuthTokenHeader.bind(this),
+                            lambda: this._customAuthHeader,
+                            none: this._customAuthHeader,
                         };
-                        if (!(!authenticationType || !headerHandler[authenticationType.type])) return [3 /*break*/, 1];
+                        if (!(!authenticationType || !headerHandler[authenticationType])) return [3 /*break*/, 1];
                         logger.debug("Authentication type " + authenticationType + " not supported");
                         return [2 /*return*/, undefined];
                     case 1:
-                        handler = headerHandler[authenticationType.type];
+                        handler = headerHandler[authenticationType];
                         host = url.parse(appSyncGraphqlEndpoint !== null && appSyncGraphqlEndpoint !== void 0 ? appSyncGraphqlEndpoint : '').host;
                         logger.debug("Authenticating with " + JSON.stringify(authenticationType));
-                        apiKey = void 0;
-                        if (authenticationType.type === 'apiKey') {
-                            apiKey = authenticationType.apiKey;
+                        resolvedApiKey = void 0;
+                        if (authenticationType === 'apiKey') {
+                            resolvedApiKey = apiKey;
                         }
                         return [4 /*yield*/, handler({
                                 payload: payload,
                                 canonicalUri: canonicalUri,
                                 appSyncGraphqlEndpoint: appSyncGraphqlEndpoint,
-                                apiKey: apiKey,
+                                apiKey: resolvedApiKey,
                                 region: region,
                                 host: host,
                                 additionalHeaders: additionalHeaders,
@@ -719,7 +722,7 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function () {
             });
         });
     };
-    AWSAppSyncRealTimeProvider.prototype._awsRealTimeOPENIDHeader = function (_a) {
+    AWSAppSyncRealTimeProvider.prototype._awsAuthTokenHeader = function (_a) {
         var host = _a.host;
         var _b, _c;
         return tslib_1.__awaiter(this, void 0, void 0, function () {

package/lib/internals/InternalGraphQLAPI.js

@@ -7,7 +7,7 @@ var graphql_1 = require("graphql");
 var core_1 = require("@aws-amplify/core");
 var utils_1 = require("@aws-amplify/core/internals/utils");
 var types_1 = require("../types");
-var api_rest_1 = require("@aws-amplify/api-rest");
+var internals_1 = require("@aws-amplify/api-rest/internals");
 var AWSAppSyncRealTimeProvider_1 = require("../Providers/AWSAppSyncRealTimeProvider");
 var USER_AGENT_HEADER = 'x-amz-user-agent';
 var logger = new utils_1.ConsoleLogger('GraphQLAPI');
@@ -29,7 +29,7 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
      */
     function InternalGraphQLAPIClass(options) {
         this.Cache = core_1.Cache;
-        this._api = { post: api_rest_1.post };
+        this._api = { post: internals_1.post };
         this._options = options;
         logger.debug('API Options', this._options);
     }
@@ -40,36 +40,38 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
         if (additionalHeaders === void 0) { additionalHeaders = {}; }
         var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var config, _b, region, appSyncGraphqlEndpoint, authenticationType, headers, _c, session, token, e_1;
+            var config, _b, region, appSyncGraphqlEndpoint, apiKey, defaultAuthMode, headers, _c, session, token, e_1;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
                         config = core_1.Amplify.getConfig();
-                        _b = config.API.AppSync, region = _b.region, appSyncGraphqlEndpoint = _b.endpoint, authenticationType = _b.defaultAuthMode;
+                        _b = config.API.GraphQL, region = _b.region, appSyncGraphqlEndpoint = _b.endpoint, apiKey = _b.apiKey, defaultAuthMode = _b.defaultAuthMode;
                         headers = {};
-                        _c = authenticationType.type;
+                        _c = defaultAuthMode;
                         switch (_c) {
                             case 'apiKey': return [3 /*break*/, 1];
                             case 'iam': return [3 /*break*/, 2];
-                            case 'jwt': return [3 /*break*/, 4];
-                            case 'custom': return [3 /*break*/, 8];
+                            case 'oidc': return [3 /*break*/, 4];
+                            case 'userPool': return [3 /*break*/, 4];
+                            case 'lambda': return [3 /*break*/, 8];
+                            case 'none': return [3 /*break*/, 9];
                         }
-                        return [3 /*break*/, 9];
+                        return [3 /*break*/, 10];
                     case 1:
-                        if (!authenticationType.apiKey) {
+                        if (!apiKey) {
                             throw new Error(types_1.GraphQLAuthError.NO_API_KEY);
                         }
                         headers = {
-                            'X-Api-Key': authenticationType.apiKey,
+                            'X-Api-Key': apiKey,
                         };
-                        return [3 /*break*/, 10];
+                        return [3 /*break*/, 11];
                     case 2: return [4 /*yield*/, core_1.fetchAuthSession()];
                     case 3:
                         session = _d.sent();
                         if (session.credentials === undefined) {
                             throw new Error(types_1.GraphQLAuthError.NO_CREDENTIALS);
                         }
-                        return [3 /*break*/, 10];
+                        return [3 /*break*/, 11];
                     case 4:
                         _d.trys.push([4, 6, , 7]);
                         token = void 0;
@@ -86,7 +88,7 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
                     case 6:
                         e_1 = _d.sent();
                         throw new Error(types_1.GraphQLAuthError.NO_CURRENT_USER);
-                    case 7: return [3 /*break*/, 10];
+                    case 7: return [3 /*break*/, 11];
                     case 8:
                         if (!additionalHeaders.Authorization) {
                             throw new Error(types_1.GraphQLAuthError.NO_AUTH_TOKEN);
@@ -94,13 +96,14 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
                         headers = {
                             Authorization: additionalHeaders.Authorization,
                         };
-                        return [3 /*break*/, 10];
-                    case 9:
+                        return [3 /*break*/, 11];
+                    case 9: return [3 /*break*/, 11];
+                    case 10:
                         headers = {
                             Authorization: null,
                         };
-                        return [3 /*break*/, 10];
-                    case 10: return [2 /*return*/, headers];
+                        return [3 /*break*/, 11];
+                    case 11: return [2 /*return*/, headers];
                 }
             });
         });
@@ -149,13 +152,13 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
         var query = _a.query, variables = _a.variables, authMode = _a.authMode;
         if (additionalHeaders === void 0) { additionalHeaders = {}; }
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var config, _b, region, appSyncGraphqlEndpoint, customGraphqlEndpoint, customEndpointRegion, headers, _c, _d, _e, _f, _g, body, endpoint, error, response, err_1, errors;
+            var config, _b, region, appSyncGraphqlEndpoint, customGraphqlEndpoint, customEndpointRegion, headers, _c, _d, _e, _f, _g, body, endpoint, error, response, responsePayload, err_1, errors;
             var _h;
             return tslib_1.__generator(this, function (_j) {
                 switch (_j.label) {
                     case 0:
                         config = core_1.Amplify.getConfig();
-                        _b = config.API.AppSync, region = _b.region, appSyncGraphqlEndpoint = _b.endpoint;
+                        _b = config.API.GraphQL, region = _b.region, appSyncGraphqlEndpoint = _b.endpoint;
                         customGraphqlEndpoint = null;
                         customEndpointRegion = null;
                         _c = [{}];
@@ -198,24 +201,32 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
                         }
                         _j.label = 7;
                     case 7:
-                        _j.trys.push([7, 9, , 10]);
-                        return [4 /*yield*/, this._api.post(endpoint, {
-                                headers: headers,
-                                body: body,
-                                region: region,
-                                serviceName: 'appsync',
+                        _j.trys.push([7, 10, , 11]);
+                        return [4 /*yield*/, this._api.post({
+                                url: new URL(endpoint),
+                                options: {
+                                    headers: headers,
+                                    body: body,
+                                    signingServiceInfo: {
+                                        service: 'appsync',
+                                        region: region,
+                                    },
+                                },
                             })];
                     case 8:
-                        response = _j.sent();
-                        return [3 /*break*/, 10];
+                        responsePayload = (_j.sent()).body;
+                        return [4 /*yield*/, responsePayload.json()];
                     case 9:
+                        response = _j.sent();
+                        return [3 /*break*/, 11];
+                    case 10:
                         err_1 = _j.sent();
                         response = {
                             data: {},
                             errors: [new graphql_1.GraphQLError(err_1.message, null, null, null, null, err_1)],
                         };
-                        return [3 /*break*/, 10];
-                    case 10:
+                        return [3 /*break*/, 11];
+                    case 11:
                         errors = response.errors;
                         if (errors && errors.length) {
                             throw response;
@@ -229,16 +240,17 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
         var query = _a.query, variables = _a.variables, defaultAuthenticationType = _a.authMode, authToken = _a.authToken;
         if (additionalHeaders === void 0) { additionalHeaders = {}; }
         var _b;
-        var AppSync = ((_b = core_1.Amplify.getConfig().API) !== null && _b !== void 0 ? _b : {}).AppSync;
+        var GraphQL = ((_b = core_1.Amplify.getConfig().API) !== null && _b !== void 0 ? _b : {}).GraphQL;
         if (!this.appSyncRealTime) {
             this.appSyncRealTime = new AWSAppSyncRealTimeProvider_1.AWSAppSyncRealTimeProvider();
         }
         return this.appSyncRealTime.subscribe({
             query: graphql_1.print(query),
             variables: variables,
-            appSyncGraphqlEndpoint: AppSync === null || AppSync === void 0 ? void 0 : AppSync.endpoint,
-            region: AppSync === null || AppSync === void 0 ? void 0 : AppSync.region,
-            authenticationType: AppSync === null || AppSync === void 0 ? void 0 : AppSync.defaultAuthMode,
+            appSyncGraphqlEndpoint: GraphQL === null || GraphQL === void 0 ? void 0 : GraphQL.endpoint,
+            region: GraphQL === null || GraphQL === void 0 ? void 0 : GraphQL.region,
+            authenticationType: GraphQL === null || GraphQL === void 0 ? void 0 : GraphQL.defaultAuthMode,
+            apiKey: GraphQL === null || GraphQL === void 0 ? void 0 : GraphQL.apiKey,
         });
     };
     return InternalGraphQLAPIClass;