@aws-amplify/datastore 4.7.5 → 5.0.1-console-preview.4208d73.0

package/lib/sync/processors/subscription.js

@@ -1,21 +1,92 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-var api_1 = require("@aws-amplify/api");
+exports.SubscriptionProcessor = exports.USER_CREDENTIALS = exports.CONTROL_MSG = void 0;
 var internals_1 = require("@aws-amplify/api/internals");
-var auth_1 = require("@aws-amplify/auth");
-var cache_1 = require("@aws-amplify/cache");
 var core_1 = require("@aws-amplify/core");
-var pubsub_1 = require("@aws-amplify/pubsub");
-var zen_observable_ts_1 = tslib_1.__importDefault(require("zen-observable-ts"));
+var utils_1 = require("@aws-amplify/core/internals/utils");
+var zen_observable_ts_1 = __importDefault(require("zen-observable-ts"));
 var types_1 = require("../../types");
-var utils_1 = require("../utils");
+var utils_2 = require("../utils");
 var predicates_1 = require("../../predicates");
 var util_1 = require("../../util");
 var errorMaps_1 = require("./errorMaps");
-var logger = new core_1.ConsoleLogger('DataStore');
+var api_graphql_1 = require("@aws-amplify/api-graphql");
+var logger = new utils_1.Logger('DataStore');
 var CONTROL_MSG;
 (function (CONTROL_MSG) {
     CONTROL_MSG["CONNECTED"] = "CONNECTED";
@@ -30,9 +101,7 @@ var SubscriptionProcessor = /** @class */ (function () {
     function SubscriptionProcessor(schema, syncPredicates, amplifyConfig, authModeStrategy, errorHandler, amplifyContext) {
         if (amplifyConfig === void 0) { amplifyConfig = {}; }
         if (amplifyContext === void 0) { amplifyContext = {
-            Auth: auth_1.Auth,
             InternalAPI: internals_1.InternalAPI,
-            Cache: cache_1.Cache,
         }; }
         this.schema = schema;
         this.syncPredicates = syncPredicates;
@@ -42,21 +111,19 @@ var SubscriptionProcessor = /** @class */ (function () {
         this.amplifyContext = amplifyContext;
         this.typeQuery = new WeakMap();
         this.buffer = [];
-        this.runningProcesses = new core_1.BackgroundProcessManager();
+        this.runningProcesses = new utils_1.BackgroundProcessManager();
     }
-    SubscriptionProcessor.prototype.buildSubscription = function (namespace, model, transformerMutationType, userCredentials, cognitoTokenPayload, oidcTokenPayload, authMode, filterArg) {
+    SubscriptionProcessor.prototype.buildSubscription = function (namespace, model, transformerMutationType, userCredentials, oidcTokenPayload, authMode, filterArg) {
         if (filterArg === void 0) { filterArg = false; }
         var aws_appsync_authenticationType = this.amplifyConfig.aws_appsync_authenticationType;
-        var _a = this.getAuthorizationInfo(model, userCredentials, aws_appsync_authenticationType, cognitoTokenPayload, oidcTokenPayload, authMode) || {}, isOwner = _a.isOwner, ownerField = _a.ownerField, ownerValue = _a.ownerValue;
-        var _b = tslib_1.__read(utils_1.buildSubscriptionGraphQLOperation(namespace, model, transformerMutationType, isOwner, ownerField, filterArg), 3), opType = _b[0], opName = _b[1], query = _b[2];
+        var _a = this.getAuthorizationInfo(model, userCredentials, aws_appsync_authenticationType, oidcTokenPayload, authMode) || {}, isOwner = _a.isOwner, ownerField = _a.ownerField, ownerValue = _a.ownerValue;
+        var _b = __read((0, utils_2.buildSubscriptionGraphQLOperation)(namespace, model, transformerMutationType, isOwner, ownerField, filterArg), 3), opType = _b[0], opName = _b[1], query = _b[2];
         return { authMode: authMode, opType: opType, opName: opName, query: query, isOwner: isOwner, ownerField: ownerField, ownerValue: ownerValue };
     };
-    SubscriptionProcessor.prototype.getAuthorizationInfo = function (model, userCredentials, defaultAuthType, cognitoTokenPayload, oidcTokenPayload, authMode) {
-        if (cognitoTokenPayload === void 0) { cognitoTokenPayload = {}; }
-        if (oidcTokenPayload === void 0) { oidcTokenPayload = {}; }
-        var rules = utils_1.getAuthorizationRules(model);
+    SubscriptionProcessor.prototype.getAuthorizationInfo = function (model, userCredentials, defaultAuthType, oidcTokenPayload, authMode) {
+        var rules = (0, utils_2.getAuthorizationRules)(model);
         // Return null if user doesn't have proper credentials for private API with IAM auth
-        var iamPrivateAuth = authMode === api_1.GRAPHQL_AUTH_MODE.AWS_IAM &&
+        var iamPrivateAuth = authMode === 'iam' &&
             rules.find(function (rule) { return rule.authStrategy === 'private' && rule.provider === 'iam'; });
         if (iamPrivateAuth && userCredentials === USER_CREDENTIALS.unauth) {
             return null;
@@ -69,15 +136,15 @@ var SubscriptionProcessor = /** @class */ (function () {
             return rule.authStrategy === 'groups' &&
                 ['userPools', 'oidc'].includes(rule.provider);
         });
-        var validGroup = (authMode === api_1.GRAPHQL_AUTH_MODE.AMAZON_COGNITO_USER_POOLS ||
-            authMode === api_1.GRAPHQL_AUTH_MODE.OPENID_CONNECT) &&
+        var validGroup = authMode === 'jwt' &&
             groupAuthRules.find(function (groupAuthRule) {
                 // validate token against groupClaim
-                var cognitoUserGroups = utils_1.getUserGroupsFromToken(cognitoTokenPayload, groupAuthRule);
-                var oidcUserGroups = utils_1.getUserGroupsFromToken(oidcTokenPayload, groupAuthRule);
-                return tslib_1.__spread(cognitoUserGroups, oidcUserGroups).find(function (userGroup) {
-                    return groupAuthRule.groups.find(function (group) { return group === userGroup; });
-                });
+                if (oidcTokenPayload) {
+                    var oidcUserGroups = (0, utils_2.getUserGroupsFromToken)(oidcTokenPayload, groupAuthRule);
+                    return __spreadArray([], __read(oidcUserGroups), false).find(function (userGroup) {
+                        return groupAuthRule.groups.find(function (group) { return group === userGroup; });
+                    });
+                }
             });
         if (validGroup) {
             return {
@@ -85,40 +152,18 @@ var SubscriptionProcessor = /** @class */ (function () {
                 isOwner: false,
             };
         }
-        // Owner auth needs additional values to be returned in order to create the subscription with
-        // the correct parameters so we are getting the owner value from the Cognito token via the
-        // identityClaim from the auth rule.
-        var cognitoOwnerAuthRules = authMode === api_1.GRAPHQL_AUTH_MODE.AMAZON_COGNITO_USER_POOLS
-            ? rules.filter(function (rule) {
-                return rule.authStrategy === 'owner' && rule.provider === 'userPools';
-            })
-            : [];
         var ownerAuthInfo;
-        cognitoOwnerAuthRules.forEach(function (ownerAuthRule) {
-            var _a;
-            var ownerValue = cognitoTokenPayload[ownerAuthRule.identityClaim];
-            // AuthZ for "list of owners" is handled dynamically in the subscription auth request
-            // resolver. It doesn't rely on a subscription arg.
-            // Only pass a subscription arg for single owner auth
-            var singleOwner = ((_a = model.fields[ownerAuthRule.ownerField]) === null || _a === void 0 ? void 0 : _a.isArray) !== true;
-            var isOwnerArgRequired = singleOwner && !ownerAuthRule.areSubscriptionsPublic;
-            if (ownerValue) {
-                ownerAuthInfo = {
-                    authMode: api_1.GRAPHQL_AUTH_MODE.AMAZON_COGNITO_USER_POOLS,
-                    isOwner: isOwnerArgRequired,
-                    ownerField: ownerAuthRule.ownerField,
-                    ownerValue: ownerValue,
-                };
-            }
-        });
         if (ownerAuthInfo) {
             return ownerAuthInfo;
         }
         // Owner auth needs additional values to be returned in order to create the subscription with
         // the correct parameters so we are getting the owner value from the OIDC token via the
         // identityClaim from the auth rule.
-        var oidcOwnerAuthRules = authMode === api_1.GRAPHQL_AUTH_MODE.OPENID_CONNECT
-            ? rules.filter(function (rule) { return rule.authStrategy === 'owner' && rule.provider === 'oidc'; })
+        var oidcOwnerAuthRules = authMode === 'jwt'
+            ? rules.filter(function (rule) {
+                return rule.authStrategy === 'owner' &&
+                    (rule.provider === 'oidc' || rule.provider === 'userPools');
+            })
             : [];
         oidcOwnerAuthRules.forEach(function (ownerAuthRule) {
             var _a;
@@ -127,10 +172,10 @@ var SubscriptionProcessor = /** @class */ (function () {
             var isOwnerArgRequired = singleOwner && !ownerAuthRule.areSubscriptionsPublic;
             if (ownerValue) {
                 ownerAuthInfo = {
-                    authMode: api_1.GRAPHQL_AUTH_MODE.OPENID_CONNECT,
+                    authMode: 'jwt',
                     isOwner: isOwnerArgRequired,
                     ownerField: ownerAuthRule.ownerField,
-                    ownerValue: ownerValue,
+                    ownerValue: String(ownerValue),
                 };
             }
         });
@@ -145,79 +190,51 @@ var SubscriptionProcessor = /** @class */ (function () {
     };
     SubscriptionProcessor.prototype.hubQueryCompletionListener = function (completed, capsule) {
         var event = capsule.payload.event;
-        if (event === pubsub_1.CONTROL_MSG.SUBSCRIPTION_ACK) {
+        if (event === api_graphql_1.CONTROL_MSG.SUBSCRIPTION_ACK) {
             completed();
         }
     };
     SubscriptionProcessor.prototype.start = function () {
         var _this = this;
         this.runningProcesses =
-            this.runningProcesses || new core_1.BackgroundProcessManager();
+            this.runningProcesses || new utils_1.BackgroundProcessManager();
         var ctlObservable = new zen_observable_ts_1.default(function (observer) {
             var promises = [];
             // Creating subs for each model/operation combo so they can be unsubscribed
             // independently, since the auth retry behavior is asynchronous.
             var subscriptions = {};
-            var cognitoTokenPayload, oidcTokenPayload;
+            var oidcTokenPayload;
             var userCredentials = USER_CREDENTIALS.none;
-            _this.runningProcesses.add(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                var credentials, err_1, session, err_2, _a, aws_cognito_region, AuthConfig, token, federatedInfo, currentUser, payload, err_3;
+            _this.runningProcesses.add(function () { return __awaiter(_this, void 0, void 0, function () {
+                var credentials, err_1, session, err_2;
                 var _this = this;
-                return tslib_1.__generator(this, function (_b) {
-                    switch (_b.label) {
+                var _a, _b, _c;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
-                            _b.trys.push([0, 2, , 3]);
-                            return [4 /*yield*/, this.amplifyContext.Auth.currentCredentials()];
+                            _d.trys.push([0, 2, , 3]);
+                            return [4 /*yield*/, (0, core_1.fetchAuthSession)()];
                         case 1:
-                            credentials = _b.sent();
-                            userCredentials = credentials.authenticated
+                            credentials = (_a = (_d.sent()).tokens) === null || _a === void 0 ? void 0 : _a.accessToken;
+                            userCredentials = credentials
                                 ? USER_CREDENTIALS.auth
                                 : USER_CREDENTIALS.unauth;
                             return [3 /*break*/, 3];
                         case 2:
-                            err_1 = _b.sent();
+                            err_1 = _d.sent();
                             return [3 /*break*/, 3];
                         case 3:
-                            _b.trys.push([3, 5, , 6]);
-                            return [4 /*yield*/, this.amplifyContext.Auth.currentSession()];
-                        case 4:
-                            session = _b.sent();
-                            cognitoTokenPayload = session.getIdToken().decodePayload();
-                            return [3 /*break*/, 6];
+                            _d.trys.push([3, 6, , 7]);
+                            return [4 /*yield*/, (0, core_1.fetchAuthSession)()];
+                        case 4: return [4 /*yield*/, _d.sent()];
                         case 5:
-                            err_2 = _b.sent();
-                            return [3 /*break*/, 6];
+                            session = _d.sent();
+                            oidcTokenPayload = (_c = (_b = session.tokens) === null || _b === void 0 ? void 0 : _b.idToken) === null || _c === void 0 ? void 0 : _c.payload;
+                            return [3 /*break*/, 7];
                         case 6:
-                            _b.trys.push([6, 11, , 12]);
-                            _a = this.amplifyConfig, aws_cognito_region = _a.aws_cognito_region, AuthConfig = _a.Auth;
-                            if (!aws_cognito_region || (AuthConfig && !AuthConfig.region)) {
-                                throw 'Auth is not configured';
-                            }
-                            token = void 0;
-                            return [4 /*yield*/, this.amplifyContext.Cache.getItem('federatedInfo')];
+                            err_2 = _d.sent();
+                            return [3 /*break*/, 7];
                         case 7:
-                            federatedInfo = _b.sent();
-                            if (!federatedInfo) return [3 /*break*/, 8];
-                            token = federatedInfo.token;
-                            return [3 /*break*/, 10];
-                        case 8: return [4 /*yield*/, this.amplifyContext.Auth.currentAuthenticatedUser()];
-                        case 9:
-                            currentUser = _b.sent();
-                            if (currentUser) {
-                                token = currentUser.token;
-                            }
-                            _b.label = 10;
-                        case 10:
-                            if (token) {
-                                payload = token.split('.')[1];
-                                oidcTokenPayload = JSON.parse(Buffer.from(payload, 'base64').toString('utf8'));
-                            }
-                            return [3 /*break*/, 12];
-                        case 11:
-                            err_3 = _b.sent();
-                            logger.debug('error getting OIDC JWT', err_3);
-                            return [3 /*break*/, 12];
-                        case 12:
                             Object.values(this.schema.namespaces).forEach(function (namespace) {
                                 Object.values(namespace.models)
                                     .filter(function (_a) {
@@ -226,13 +243,13 @@ var SubscriptionProcessor = /** @class */ (function () {
                                 })
                                     .forEach(function (modelDefinition) {
                                     return _this.runningProcesses.isOpen &&
-                                        _this.runningProcesses.add(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                                        _this.runningProcesses.add(function () { return __awaiter(_this, void 0, void 0, function () {
                                             var modelAuthModes, readAuthModes, operations, operationAuthModeAttempts, predicatesGroup, addFilterArg, subscriptionRetry;
                                             var _a, _b, _c;
                                             var _this = this;
-                                            return tslib_1.__generator(this, function (_d) {
+                                            return __generator(this, function (_d) {
                                                 switch (_d.label) {
-                                                    case 0: return [4 /*yield*/, utils_1.getModelAuthModes({
+                                                    case 0: return [4 /*yield*/, (0, utils_2.getModelAuthModes)({
                                                             authModeStrategy: this.authModeStrategy,
                                                             defaultAuthMode: this.amplifyConfig.aws_appsync_authenticationType,
                                                             modelName: modelDefinition.name,
@@ -241,43 +258,43 @@ var SubscriptionProcessor = /** @class */ (function () {
                                                     case 1:
                                                         modelAuthModes = _d.sent();
                                                         readAuthModes = modelAuthModes.READ;
-                                                        subscriptions = tslib_1.__assign(tslib_1.__assign({}, subscriptions), (_a = {}, _a[modelDefinition.name] = (_b = {},
-                                                            _b[utils_1.TransformerMutationType.CREATE] = [],
-                                                            _b[utils_1.TransformerMutationType.UPDATE] = [],
-                                                            _b[utils_1.TransformerMutationType.DELETE] = [],
+                                                        subscriptions = __assign(__assign({}, subscriptions), (_a = {}, _a[modelDefinition.name] = (_b = {},
+                                                            _b[utils_2.TransformerMutationType.CREATE] = [],
+                                                            _b[utils_2.TransformerMutationType.UPDATE] = [],
+                                                            _b[utils_2.TransformerMutationType.DELETE] = [],
                                                             _b), _a));
                                                         operations = [
-                                                            utils_1.TransformerMutationType.CREATE,
-                                                            utils_1.TransformerMutationType.UPDATE,
-                                                            utils_1.TransformerMutationType.DELETE,
+                                                            utils_2.TransformerMutationType.CREATE,
+                                                            utils_2.TransformerMutationType.UPDATE,
+                                                            utils_2.TransformerMutationType.DELETE,
                                                         ];
                                                         operationAuthModeAttempts = (_c = {},
-                                                            _c[utils_1.TransformerMutationType.CREATE] = 0,
-                                                            _c[utils_1.TransformerMutationType.UPDATE] = 0,
-                                                            _c[utils_1.TransformerMutationType.DELETE] = 0,
+                                                            _c[utils_2.TransformerMutationType.CREATE] = 0,
+                                                            _c[utils_2.TransformerMutationType.UPDATE] = 0,
+                                                            _c[utils_2.TransformerMutationType.DELETE] = 0,
                                                             _c);
                                                         predicatesGroup = predicates_1.ModelPredicateCreator.getPredicates(this.syncPredicates.get(modelDefinition), false);
                                                         addFilterArg = predicatesGroup !== undefined;
                                                         subscriptionRetry = function (operation, addFilter) {
                                                             if (addFilter === void 0) { addFilter = addFilterArg; }
-                                                            return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                                                            return __awaiter(_this, void 0, void 0, function () {
                                                                 var _a, transformerMutationType, opName, query, isOwner, ownerField, ownerValue, authMode, authToken, variables, customUserAgentDetails, queryObservable, subscriptionReadyCallback;
                                                                 var _this = this;
-                                                                return tslib_1.__generator(this, function (_b) {
+                                                                return __generator(this, function (_b) {
                                                                     switch (_b.label) {
                                                                         case 0:
-                                                                            _a = this.buildSubscription(namespace, modelDefinition, operation, userCredentials, cognitoTokenPayload, oidcTokenPayload, readAuthModes[operationAuthModeAttempts[operation]], addFilter), transformerMutationType = _a.opType, opName = _a.opName, query = _a.query, isOwner = _a.isOwner, ownerField = _a.ownerField, ownerValue = _a.ownerValue, authMode = _a.authMode;
-                                                                            return [4 /*yield*/, utils_1.getTokenForCustomAuth(authMode, this.amplifyConfig)];
+                                                                            _a = this.buildSubscription(namespace, modelDefinition, operation, userCredentials, oidcTokenPayload, readAuthModes[operationAuthModeAttempts[operation]], addFilter), transformerMutationType = _a.opType, opName = _a.opName, query = _a.query, isOwner = _a.isOwner, ownerField = _a.ownerField, ownerValue = _a.ownerValue, authMode = _a.authMode;
+                                                                            return [4 /*yield*/, (0, utils_2.getTokenForCustomAuth)(authMode, this.amplifyConfig)];
                                                                         case 1:
                                                                             authToken = _b.sent();
                                                                             variables = {};
                                                                             customUserAgentDetails = {
-                                                                                category: core_1.Category.DataStore,
-                                                                                action: core_1.DataStoreAction.Subscribe,
+                                                                                category: utils_1.Category.DataStore,
+                                                                                action: utils_1.DataStoreAction.Subscribe,
                                                                             };
                                                                             if (addFilter && predicatesGroup) {
                                                                                 variables['filter'] =
-                                                                                    utils_1.predicateToGraphQLFilter(predicatesGroup);
+                                                                                    (0, utils_2.predicateToGraphQLFilter)(predicatesGroup);
                                                                             }
                                                                             if (isOwner) {
                                                                                 if (!ownerValue) {
@@ -286,30 +303,26 @@ var SubscriptionProcessor = /** @class */ (function () {
                                                                                 }
                                                                                 variables[ownerField] = ownerValue;
                                                                             }
-                                                                            logger.debug("Attempting " + operation + " subscription with authMode: " + readAuthModes[operationAuthModeAttempts[operation]]);
-                                                                            queryObservable = this.amplifyContext.InternalAPI.graphql(tslib_1.__assign(tslib_1.__assign({ query: query,
-                                                                                variables: variables }, { authMode: authMode }), { authToken: authToken }), undefined, customUserAgentDetails);
+                                                                            logger.debug("Attempting ".concat(operation, " subscription with authMode: ").concat(readAuthModes[operationAuthModeAttempts[operation]]));
+                                                                            queryObservable = this.amplifyContext.InternalAPI.graphql(__assign(__assign({ query: query, variables: variables }, { authMode: authMode }), { authToken: authToken }), undefined, customUserAgentDetails);
                                                                             // TODO: consider onTerminate.then(() => API.cancel(...))
                                                                             subscriptions[modelDefinition.name][transformerMutationType].push(queryObservable
-                                                                                .map(function (_a) {
-                                                                                var value = _a.value;
-                                                                                return value;
-                                                                            })
+                                                                                .filter(function () { return true; }) // to make change more readable
                                                                                 .subscribe({
-                                                                                next: function (_a) {
-                                                                                    var data = _a.data, errors = _a.errors;
+                                                                                next: function (result) {
+                                                                                    var data = result.data, errors = result.errors;
                                                                                     if (Array.isArray(errors) && errors.length > 0) {
                                                                                         var messages = errors.map(function (_a) {
                                                                                             var message = _a.message;
                                                                                             return message;
                                                                                         });
-                                                                                        logger.warn("Skipping incoming subscription. Messages: " + messages.join('\n'));
+                                                                                        logger.warn("Skipping incoming subscription. Messages: ".concat(messages.join('\n')));
                                                                                         _this.drainBuffer();
                                                                                         return;
                                                                                     }
                                                                                     var predicatesGroup = predicates_1.ModelPredicateCreator.getPredicates(_this.syncPredicates.get(modelDefinition), false);
                                                                                     // @ts-ignore
-                                                                                    var _b = data, _c = opName, record = _b[_c];
+                                                                                    var _a = data, _b = opName, record = _a[_b];
                                                                                     // checking incoming subscription against syncPredicate.
                                                                                     // once AppSync implements filters on subscriptions, we'll be
                                                                                     // able to set these when establishing the subscription instead.
@@ -319,14 +332,14 @@ var SubscriptionProcessor = /** @class */ (function () {
                                                                                     }
                                                                                     _this.drainBuffer();
                                                                                 },
-                                                                                error: function (subscriptionError) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                                                                                    var _a, _b, _c, _d, message, isRTFError, e_1;
-                                                                                    return tslib_1.__generator(this, function (_e) {
-                                                                                        switch (_e.label) {
+                                                                                error: function (subscriptionError) { return __awaiter(_this, void 0, void 0, function () {
+                                                                                    var _a, _b, _c, _d, _e, _f, message, isRTFError, e_1;
+                                                                                    return __generator(this, function (_g) {
+                                                                                        switch (_g.label) {
                                                                                             case 0:
-                                                                                                _a = subscriptionError.error, _b = tslib_1.__read((_a === void 0 ? {
+                                                                                                _a = subscriptionError.error, _b = _a === void 0 ? {
                                                                                                     errors: [],
-                                                                                                } : _a).errors, 1), _c = _b[0], _d = (_c === void 0 ? {} : _c).message, message = _d === void 0 ? '' : _d;
+                                                                                                } : _a, _c = __read(_b.errors, 1), _d = _c[0], _e = _d === void 0 ? {} : _d, _f = _e.message, message = _f === void 0 ? '' : _f;
                                                                                                 isRTFError = 
                                                                                                 // only attempt catch if a filter variable was added to the subscription query
                                                                                                 addFilter &&
@@ -342,8 +355,8 @@ var SubscriptionProcessor = /** @class */ (function () {
                                                                                                     subscriptionRetry(operation, false);
                                                                                                     return [2 /*return*/];
                                                                                                 }
-                                                                                                if (message.includes(pubsub_1.CONTROL_MSG.REALTIME_SUBSCRIPTION_INIT_ERROR) ||
-                                                                                                    message.includes(pubsub_1.CONTROL_MSG.CONNECTION_FAILED)) {
+                                                                                                if (message.includes(api_graphql_1.CONTROL_MSG.REALTIME_SUBSCRIPTION_INIT_ERROR) ||
+                                                                                                    message.includes(api_graphql_1.CONTROL_MSG.CONNECTION_FAILED)) {
                                                                                                     // Unsubscribe and clear subscription array for model/operation
                                                                                                     subscriptions[modelDefinition.name][transformerMutationType].forEach(function (subscription) {
                                                                                                         return subscription.unsubscribe();
@@ -353,36 +366,36 @@ var SubscriptionProcessor = /** @class */ (function () {
                                                                                                     if (operationAuthModeAttempts[operation] >=
                                                                                                         readAuthModes.length) {
                                                                                                         // last auth mode retry. Continue with error
-                                                                                                        logger.debug(operation + " subscription failed with authMode: " + readAuthModes[operationAuthModeAttempts[operation] - 1]);
+                                                                                                        logger.debug("".concat(operation, " subscription failed with authMode: ").concat(readAuthModes[operationAuthModeAttempts[operation] - 1]));
                                                                                                     }
                                                                                                     else {
                                                                                                         // retry with different auth mode. Do not trigger
                                                                                                         // observer error or error handler
-                                                                                                        logger.debug(operation + " subscription failed with authMode: " + readAuthModes[operationAuthModeAttempts[operation] - 1] + ". Retrying with authMode: " + readAuthModes[operationAuthModeAttempts[operation]]);
+                                                                                                        logger.debug("".concat(operation, " subscription failed with authMode: ").concat(readAuthModes[operationAuthModeAttempts[operation] - 1], ". Retrying with authMode: ").concat(readAuthModes[operationAuthModeAttempts[operation]]));
                                                                                                         subscriptionRetry(operation);
                                                                                                         return [2 /*return*/];
                                                                                                     }
                                                                                                 }
                                                                                                 logger.warn('subscriptionError', message);
-                                                                                                _e.label = 1;
+                                                                                                _g.label = 1;
                                                                                             case 1:
-                                                                                                _e.trys.push([1, 3, , 4]);
+                                                                                                _g.trys.push([1, 3, , 4]);
                                                                                                 return [4 /*yield*/, this.errorHandler({
                                                                                                         recoverySuggestion: 'Ensure app code is up to date, auth directives exist and are correct on each model, and that server-side data has not been invalidated by a schema change. If the problem persists, search for or create an issue: https://github.com/aws-amplify/amplify-js/issues',
                                                                                                         localModel: null,
                                                                                                         message: message,
                                                                                                         model: modelDefinition.name,
                                                                                                         operation: operation,
-                                                                                                        errorType: errorMaps_1.getSubscriptionErrorType(subscriptionError),
+                                                                                                        errorType: (0, errorMaps_1.getSubscriptionErrorType)(subscriptionError),
                                                                                                         process: types_1.ProcessName.subscribe,
                                                                                                         remoteModel: null,
                                                                                                         cause: subscriptionError,
                                                                                                     })];
                                                                                             case 2:
-                                                                                                _e.sent();
+                                                                                                _g.sent();
                                                                                                 return [3 /*break*/, 4];
                                                                                             case 3:
-                                                                                                e_1 = _e.sent();
+                                                                                                e_1 = _g.sent();
                                                                                                 logger.error('Subscription error handler failed with:', e_1);
                                                                                                 return [3 /*break*/, 4];
                                                                                             case 4:
@@ -399,19 +412,19 @@ var SubscriptionProcessor = /** @class */ (function () {
                                                                                     });
                                                                                 }); },
                                                                             }));
-                                                                            promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                                                                                var boundFunction;
+                                                                            promises.push((function () { return __awaiter(_this, void 0, void 0, function () {
+                                                                                var boundFunction, removeBoundFunctionListener;
                                                                                 var _this = this;
-                                                                                return tslib_1.__generator(this, function (_a) {
+                                                                                return __generator(this, function (_a) {
                                                                                     switch (_a.label) {
                                                                                         case 0: return [4 /*yield*/, new Promise(function (res) {
                                                                                                 subscriptionReadyCallback = res;
                                                                                                 boundFunction = _this.hubQueryCompletionListener.bind(_this, res);
-                                                                                                core_1.Hub.listen('api', boundFunction);
+                                                                                                removeBoundFunctionListener = core_1.Hub.listen('api', boundFunction);
                                                                                             })];
                                                                                         case 1:
                                                                                             _a.sent();
-                                                                                            core_1.Hub.remove('api', boundFunction);
+                                                                                            removeBoundFunctionListener();
                                                                                             return [2 /*return*/];
                                                                                     }
                                                                                 });
@@ -438,12 +451,12 @@ var SubscriptionProcessor = /** @class */ (function () {
                     }
                 });
             }); }, 'subscription processor new subscriber');
-            return _this.runningProcesses.addCleaner(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                return tslib_1.__generator(this, function (_a) {
+            return _this.runningProcesses.addCleaner(function () { return __awaiter(_this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
                     Object.keys(subscriptions).forEach(function (modelName) {
-                        subscriptions[modelName][utils_1.TransformerMutationType.CREATE].forEach(function (subscription) { return subscription.unsubscribe(); });
-                        subscriptions[modelName][utils_1.TransformerMutationType.UPDATE].forEach(function (subscription) { return subscription.unsubscribe(); });
-                        subscriptions[modelName][utils_1.TransformerMutationType.DELETE].forEach(function (subscription) { return subscription.unsubscribe(); });
+                        subscriptions[modelName][utils_2.TransformerMutationType.CREATE].forEach(function (subscription) { return subscription.unsubscribe(); });
+                        subscriptions[modelName][utils_2.TransformerMutationType.UPDATE].forEach(function (subscription) { return subscription.unsubscribe(); });
+                        subscriptions[modelName][utils_2.TransformerMutationType.DELETE].forEach(function (subscription) { return subscription.unsubscribe(); });
                     });
                     return [2 /*return*/];
                 });
@@ -452,8 +465,8 @@ var SubscriptionProcessor = /** @class */ (function () {
         var dataObservable = new zen_observable_ts_1.default(function (observer) {
             _this.dataObserver = observer;
             _this.drainBuffer();
-            return _this.runningProcesses.addCleaner(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                return tslib_1.__generator(this, function (_a) {
+            return _this.runningProcesses.addCleaner(function () { return __awaiter(_this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
                     this.dataObserver = null;
                     return [2 /*return*/];
                 });
@@ -462,8 +475,8 @@ var SubscriptionProcessor = /** @class */ (function () {
         return [ctlObservable, dataObservable];
     };
     SubscriptionProcessor.prototype.stop = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.runningProcesses.close()];
                     case 1:
@@ -481,7 +494,7 @@ var SubscriptionProcessor = /** @class */ (function () {
             return true;
         }
         var predicates = predicatesGroup.predicates, type = predicatesGroup.type;
-        return util_1.validatePredicate(record, type, predicates);
+        return (0, util_1.validatePredicate)(record, type, predicates);
     };
     SubscriptionProcessor.prototype.pushToBuffer = function (transformerMutationType, modelDefinition, data) {
         this.buffer.push([transformerMutationType, modelDefinition, data]);
@@ -502,20 +515,20 @@ var SubscriptionProcessor = /** @class */ (function () {
         var header = 'Backend subscriptions filtering error.\n' +
             'Subscriptions filtering will be applied clientside.\n';
         var messageErrorTypeMap = {
-            'UnknownArgument: Unknown field argument filter': utils_1.RTFError.UnknownField,
-            'Filters exceed maximum attributes limit': utils_1.RTFError.MaxAttributes,
-            'Filters combination exceed maximum limit': utils_1.RTFError.MaxCombinations,
-            'filter uses same fieldName multiple time': utils_1.RTFError.RepeatedFieldname,
-            "The variables input contains a field name 'not'": utils_1.RTFError.NotGroup,
-            'The variables input contains a field that is not defined for input object type': utils_1.RTFError.FieldNotInType,
+            'UnknownArgument: Unknown field argument filter': utils_2.RTFError.UnknownField,
+            'Filters exceed maximum attributes limit': utils_2.RTFError.MaxAttributes,
+            'Filters combination exceed maximum limit': utils_2.RTFError.MaxCombinations,
+            'filter uses same fieldName multiple time': utils_2.RTFError.RepeatedFieldname,
+            "The variables input contains a field name 'not'": utils_2.RTFError.NotGroup,
+            'The variables input contains a field that is not defined for input object type': utils_2.RTFError.FieldNotInType,
         };
-        var _a = tslib_1.__read(Object.entries(messageErrorTypeMap).find(function (_a) {
-            var _b = tslib_1.__read(_a, 1), errorMsg = _b[0];
+        var _a = __read(Object.entries(messageErrorTypeMap).find(function (_a) {
+            var _b = __read(_a, 1), errorMsg = _b[0];
             return message.includes(errorMsg);
         }) || [], 2), _errorMsg = _a[0], errorType = _a[1];
         if (errorType !== undefined) {
-            var remediationMessage = utils_1.generateRTFRemediation(errorType, modelDefinition, predicatesGroup);
-            logger.warn(header + "\n" + message + "\n" + remediationMessage);
+            var remediationMessage = (0, utils_2.generateRTFRemediation)(errorType, modelDefinition, predicatesGroup);
+            logger.warn("".concat(header, "\n").concat(message, "\n").concat(remediationMessage));
             return true;
         }
         return false;
@@ -523,4 +536,3 @@ var SubscriptionProcessor = /** @class */ (function () {
     return SubscriptionProcessor;
 }());
 exports.SubscriptionProcessor = SubscriptionProcessor;
-//# sourceMappingURL=subscription.js.map