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

package/lib-esm/sync/processors/subscription.js

@@ -1,18 +1,85 @@
-import { __assign, __awaiter, __generator, __read, __spread } from "tslib";
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-import { GRAPHQL_AUTH_MODE } from '@aws-amplify/api';
+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));
+};
 import { InternalAPI } from '@aws-amplify/api/internals';
-import { Auth } from '@aws-amplify/auth';
-import { Cache } from '@aws-amplify/cache';
-import { Category, ConsoleLogger as Logger, DataStoreAction, Hub, BackgroundProcessManager, } from '@aws-amplify/core';
-import { CONTROL_MSG as PUBSUB_CONTROL_MSG } from '@aws-amplify/pubsub';
+import { Hub, fetchAuthSession } from '@aws-amplify/core';
+import { Category, Logger, DataStoreAction, BackgroundProcessManager, } from '@aws-amplify/core/internals/utils';
 import Observable from 'zen-observable-ts';
 import { ProcessName, } from '../../types';
 import { buildSubscriptionGraphQLOperation, getAuthorizationRules, getModelAuthModes, getUserGroupsFromToken, TransformerMutationType, getTokenForCustomAuth, predicateToGraphQLFilter, RTFError, generateRTFRemediation, } from '../utils';
 import { ModelPredicateCreator } from '../../predicates';
 import { validatePredicate } from '../../util';
 import { getSubscriptionErrorType } from './errorMaps';
+import { CONTROL_MSG as PUBSUB_CONTROL_MSG } from '@aws-amplify/api-graphql';
 var logger = new Logger('DataStore');
 export var CONTROL_MSG;
 (function (CONTROL_MSG) {
@@ -28,9 +95,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,
             InternalAPI: InternalAPI,
-            Cache: Cache,
         }; }
         this.schema = schema;
         this.syncPredicates = syncPredicates;
@@ -42,19 +107,17 @@ var SubscriptionProcessor = /** @class */ (function () {
         this.buffer = [];
         this.runningProcesses = new 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 _a = this.getAuthorizationInfo(model, userCredentials, aws_appsync_authenticationType, oidcTokenPayload, authMode) || {}, isOwner = _a.isOwner, ownerField = _a.ownerField, ownerValue = _a.ownerValue;
         var _b = __read(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 = {}; }
+    SubscriptionProcessor.prototype.getAuthorizationInfo = function (model, userCredentials, defaultAuthType, oidcTokenPayload, authMode) {
         var rules = getAuthorizationRules(model);
         // Return null if user doesn't have proper credentials for private API with IAM auth
-        var iamPrivateAuth = authMode === 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;
@@ -67,15 +130,15 @@ var SubscriptionProcessor = /** @class */ (function () {
             return rule.authStrategy === 'groups' &&
                 ['userPools', 'oidc'].includes(rule.provider);
         });
-        var validGroup = (authMode === GRAPHQL_AUTH_MODE.AMAZON_COGNITO_USER_POOLS ||
-            authMode === GRAPHQL_AUTH_MODE.OPENID_CONNECT) &&
+        var validGroup = authMode === 'jwt' &&
             groupAuthRules.find(function (groupAuthRule) {
                 // validate token against groupClaim
-                var cognitoUserGroups = getUserGroupsFromToken(cognitoTokenPayload, groupAuthRule);
-                var oidcUserGroups = getUserGroupsFromToken(oidcTokenPayload, groupAuthRule);
-                return __spread(cognitoUserGroups, oidcUserGroups).find(function (userGroup) {
-                    return groupAuthRule.groups.find(function (group) { return group === userGroup; });
-                });
+                if (oidcTokenPayload) {
+                    var oidcUserGroups = getUserGroupsFromToken(oidcTokenPayload, groupAuthRule);
+                    return __spreadArray([], __read(oidcUserGroups), false).find(function (userGroup) {
+                        return groupAuthRule.groups.find(function (group) { return group === userGroup; });
+                    });
+                }
             });
         if (validGroup) {
             return {
@@ -83,40 +146,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 === 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: 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 === 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;
@@ -125,10 +166,10 @@ var SubscriptionProcessor = /** @class */ (function () {
             var isOwnerArgRequired = singleOwner && !ownerAuthRule.areSubscriptionsPublic;
             if (ownerValue) {
                 ownerAuthInfo = {
-                    authMode: GRAPHQL_AUTH_MODE.OPENID_CONNECT,
+                    authMode: 'jwt',
                     isOwner: isOwnerArgRequired,
                     ownerField: ownerAuthRule.ownerField,
-                    ownerValue: ownerValue,
+                    ownerValue: String(ownerValue),
                 };
             }
         });
@@ -156,66 +197,38 @@ var SubscriptionProcessor = /** @class */ (function () {
             // 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 __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;
+                var credentials, err_1, session, err_2;
                 var _this = this;
-                return __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*/, 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*/, 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) {
@@ -264,7 +277,7 @@ var SubscriptionProcessor = /** @class */ (function () {
                                                                 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;
+                                                                            _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*/, getTokenForCustomAuth(authMode, this.amplifyConfig)];
                                                                         case 1:
                                                                             authToken = _b.sent();
@@ -284,30 +297,26 @@ var SubscriptionProcessor = /** @class */ (function () {
                                                                                 }
                                                                                 variables[ownerField] = ownerValue;
                                                                             }
-                                                                            logger.debug("Attempting " + operation + " subscription with authMode: " + readAuthModes[operationAuthModeAttempts[operation]]);
-                                                                            queryObservable = this.amplifyContext.InternalAPI.graphql(__assign(__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 = 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.
@@ -318,13 +327,13 @@ var SubscriptionProcessor = /** @class */ (function () {
                                                                                     _this.drainBuffer();
                                                                                 },
                                                                                 error: function (subscriptionError) { return __awaiter(_this, void 0, void 0, function () {
-                                                                                    var _a, _b, _c, _d, message, isRTFError, e_1;
-                                                                                    return __generator(this, function (_e) {
-                                                                                        switch (_e.label) {
+                                                                                    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 = __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 &&
@@ -351,20 +360,20 @@ 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,
@@ -377,10 +386,10 @@ var SubscriptionProcessor = /** @class */ (function () {
                                                                                                         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:
@@ -398,18 +407,18 @@ var SubscriptionProcessor = /** @class */ (function () {
                                                                                 }); },
                                                                             }));
                                                                             promises.push((function () { return __awaiter(_this, void 0, void 0, function () {
-                                                                                var boundFunction;
+                                                                                var boundFunction, removeBoundFunctionListener;
                                                                                 var _this = this;
                                                                                 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);
-                                                                                                Hub.listen('api', boundFunction);
+                                                                                                removeBoundFunctionListener = Hub.listen('api', boundFunction);
                                                                                             })];
                                                                                         case 1:
                                                                                             _a.sent();
-                                                                                            Hub.remove('api', boundFunction);
+                                                                                            removeBoundFunctionListener();
                                                                                             return [2 /*return*/];
                                                                                     }
                                                                                 });
@@ -513,7 +522,7 @@ var SubscriptionProcessor = /** @class */ (function () {
         }) || [], 2), _errorMsg = _a[0], errorType = _a[1];
         if (errorType !== undefined) {
             var remediationMessage = generateRTFRemediation(errorType, modelDefinition, predicatesGroup);
-            logger.warn(header + "\n" + message + "\n" + remediationMessage);
+            logger.warn("".concat(header, "\n").concat(message, "\n").concat(remediationMessage));
             return true;
         }
         return false;
@@ -521,4 +530,3 @@ var SubscriptionProcessor = /** @class */ (function () {
     return SubscriptionProcessor;
 }());
 export { SubscriptionProcessor };
-//# sourceMappingURL=subscription.js.map

package/lib-esm/sync/processors/sync.d.ts

@@ -17,7 +17,7 @@ declare class SyncProcessor {
     start(typesLastSync: Map<SchemaModel, [string, number]>): Observable<SyncModelPage>;
     stop(): Promise<void>;
 }
-export declare type SyncModelPage = {
+export type SyncModelPage = {
     namespace: string;
     modelDefinition: SchemaModel;
     items: ModelInstanceMetadata[];

package/lib-esm/sync/processors/sync.js

@@ -1,9 +1,72 @@
-import { __awaiter, __generator, __read, __values } from "tslib";
+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 __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
 import { InternalAPI } from '@aws-amplify/api/internals';
 import Observable from 'zen-observable-ts';
 import { ProcessName, } from '../../types';
 import { buildGraphQLOperation, getModelAuthModes, getClientSideAuthError, getForbiddenError, predicateToGraphQLFilter, getTokenForCustomAuth, } from '../utils';
-import { jitteredExponentialRetry, Category, ConsoleLogger as Logger, DataStoreAction, Hub, NonRetryableError, BackgroundProcessManager, } from '@aws-amplify/core';
+import { jitteredExponentialRetry, Category, ConsoleLogger as Logger, DataStoreAction, NonRetryableError, BackgroundProcessManager, } from '@aws-amplify/core/internals/utils';
+import { Hub } from '@aws-amplify/core';
 import { ModelPredicateCreator } from '../../predicates';
 import { getSyncErrorType } from './errorMaps';
 var opResultDefaults = {
@@ -87,7 +150,7 @@ var SyncProcessor = /** @class */ (function () {
                                         _b.label = 1;
                                     case 1:
                                         _b.trys.push([1, 3, , 5]);
-                                        logger.debug("Attempting sync with authMode: " + readAuthModes[authModeAttempts]);
+                                        logger.debug("Attempting sync with authMode: ".concat(readAuthModes[authModeAttempts]));
                                         return [4 /*yield*/, this.jitteredRetry({
                                                 query: query,
                                                 variables: variables,
@@ -98,17 +161,17 @@ var SyncProcessor = /** @class */ (function () {
                                             })];
                                     case 2:
                                         response = _b.sent();
-                                        logger.debug("Sync successful with authMode: " + readAuthModes[authModeAttempts]);
+                                        logger.debug("Sync successful with authMode: ".concat(readAuthModes[authModeAttempts]));
                                         return [2 /*return*/, response];
                                     case 3:
                                         error_1 = _b.sent();
                                         authModeAttempts++;
                                         if (authModeAttempts >= readAuthModes.length) {
                                             authMode = readAuthModes[authModeAttempts - 1];
-                                            logger.debug("Sync failed with authMode: " + authMode, error_1);
+                                            logger.debug("Sync failed with authMode: ".concat(authMode), error_1);
                                             if (getClientSideAuthError(error_1) || getForbiddenError(error_1)) {
                                                 // return empty list of data so DataStore will continue to sync other models
-                                                logger.warn("User is unauthorized to query " + opName + " with auth mode " + authMode + ". No data could be returned.");
+                                                logger.warn("User is unauthorized to query ".concat(opName, " with auth mode ").concat(authMode, ". No data could be returned."));
                                                 return [2 /*return*/, {
                                                         data: (_a = {},
                                                             _a[opName] = opResultDefaults,
@@ -117,7 +180,7 @@ var SyncProcessor = /** @class */ (function () {
                                             }
                                             throw error_1;
                                         }
-                                        logger.debug("Sync failed with authMode: " + readAuthModes[authModeAttempts - 1] + ". Retrying with authMode: " + readAuthModes[authModeAttempts]);
+                                        logger.debug("Sync failed with authMode: ".concat(readAuthModes[authModeAttempts - 1], ". Retrying with authMode: ").concat(readAuthModes[authModeAttempts]));
                                         return [4 /*yield*/, authModeRetry()];
                                     case 4: return [2 /*return*/, _b.sent()];
                                     case 5: return [2 /*return*/];
@@ -318,7 +381,7 @@ var SyncProcessor = /** @class */ (function () {
                                     filter = this.graphqlFilterFromPredicate(modelDefinition);
                                     parents = this.schema.namespaces[namespace].modelTopologicalOrdering.get(modelDefinition.name);
                                     promises = parents.map(function (parent) {
-                                        return parentPromises.get(namespace + "_" + parent);
+                                        return parentPromises.get("".concat(namespace, "_").concat(parent));
                                     });
                                     promise = new Promise(function (res) { return __awaiter(_this, void 0, void 0, function () {
                                         var limit, error_3, e_3;
@@ -336,7 +399,7 @@ var SyncProcessor = /** @class */ (function () {
                                                      * finished terminating and/or waiting for its background processes to complete.
                                                      */
                                                     if (!this.runningProcesses.isOpen) {
-                                                        logger.debug("Sync processor has been stopped, terminating sync for " + modelDefinition.name);
+                                                        logger.debug("Sync processor has been stopped, terminating sync for ".concat(modelDefinition.name));
                                                         return [2 /*return*/, res()];
                                                     }
                                                     limit = Math.min(maxRecordsToSync - recordsReceived, syncPageSize);
@@ -403,14 +466,14 @@ var SyncProcessor = /** @class */ (function () {
                                             }
                                         });
                                     }); });
-                                    parentPromises.set(namespace + "_" + modelDefinition.name, promise);
+                                    parentPromises.set("".concat(namespace, "_").concat(modelDefinition.name), promise);
                                     return [4 /*yield*/, promise];
                                 case 1:
                                     _a.sent();
                                     return [2 /*return*/];
                             }
                         });
-                    }); }, "adding model " + modelDefinition.name);
+                    }); }, "adding model ".concat(modelDefinition.name));
             });
             Promise.all(allModelsReady).then(function () {
                 observer.complete();
@@ -439,4 +502,3 @@ var SyncProcessor = /** @class */ (function () {
     return SyncProcessor;
 }());
 export { SyncProcessor };
-//# sourceMappingURL=sync.js.map