@aws-amplify/datastore 3.7.8-cloud-logging.7 → 3.7.8-cloud-logging.8

package/dist/aws-amplify-datastore.js

@@ -51312,20 +51312,8 @@ module.exports = PushStream;
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return AuthenticationDetails; });
 /*!
- * Copyright 2016 Amazon.com,
- * Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the
- * License. A copy of the License is located at
- *
- *     http://aws.amazon.com/asl/
- *
- * or in the "license" file accompanying this file. This file is
- * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, express or implied. See the License
- * for the specific language governing permissions and
- * limitations under the License.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /** @class */
@@ -51425,20 +51413,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _utils_WordArray__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./utils/WordArray */ "../amazon-cognito-identity-js/es/utils/WordArray.js");
 /* harmony import */ var _BigInteger__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./BigInteger */ "../amazon-cognito-identity-js/es/BigInteger.js");
 /*!
- * Copyright 2016 Amazon.com,
- * Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the
- * License. A copy of the License is located at
- *
- *     http://aws.amazon.com/asl/
- *
- * or in the "license" file accompanying this file. This file is
- * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, express or implied. See the License
- * for the specific language governing permissions and
- * limitations under the License.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 
@@ -53075,21 +53051,9 @@ function _setPrototypeOf(o, p) {
 
   return _setPrototypeOf(o, p);
 }
-/*
- * Copyright 2016 Amazon.com,
- * Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the
- * License. A copy of the License is located at
- *
- *     http://aws.amazon.com/asl/
- *
- * or in the "license" file accompanying this file. This file is
- * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, express or implied. See the License
- * for the specific language governing permissions and
- * limitations under the License.
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 
@@ -53145,20 +53109,8 @@ function _setPrototypeOf(o, p) {
   return _setPrototypeOf(o, p);
 }
 /*!
- * Copyright 2016 Amazon.com,
- * Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the
- * License. A copy of the License is located at
- *
- *     http://aws.amazon.com/asl/
- *
- * or in the "license" file accompanying this file. This file is
- * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, express or implied. See the License
- * for the specific language governing permissions and
- * limitations under the License.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 
@@ -53200,20 +53152,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var buffer__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! buffer */ "../../node_modules/buffer/index.js");
 /* harmony import */ var buffer__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(buffer__WEBPACK_IMPORTED_MODULE_0__);
 /*!
- * Copyright 2016 Amazon.com,
- * Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the
- * License. A copy of the License is located at
- *
- *     http://aws.amazon.com/asl/
- *
- * or in the "license" file accompanying this file. This file is
- * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, express or implied. See the License
- * for the specific language governing permissions and
- * limitations under the License.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /** @class */
@@ -53287,20 +53227,8 @@ var CognitoJwtToken = /*#__PURE__*/function () {
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return CognitoRefreshToken; });
 /*!
- * Copyright 2016 Amazon.com,
- * Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the
- * License. A copy of the License is located at
- *
- *     http://aws.amazon.com/asl/
- *
- * or in the "license" file accompanying this file. This file is
- * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, express or implied. See the License
- * for the specific language governing permissions and
- * limitations under the License.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /** @class */
@@ -53364,20 +53292,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _CognitoUserAttribute__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./CognitoUserAttribute */ "../amazon-cognito-identity-js/es/CognitoUserAttribute.js");
 /* harmony import */ var _StorageHelper__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./StorageHelper */ "../amazon-cognito-identity-js/es/StorageHelper.js");
 /*!
- * Copyright 2016 Amazon.com,
- * Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the
- * License. A copy of the License is located at
- *
- *     http://aws.amazon.com/asl/
- *
- * or in the "license" file accompanying this file. This file is
- * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, express or implied. See the License
- * for the specific language governing permissions and
- * limitations under the License.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 
@@ -55485,20 +55401,8 @@ var CognitoUser = /*#__PURE__*/function () {
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return CognitoUserAttribute; });
 /*!
- * Copyright 2016 Amazon.com,
- * Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the
- * License. A copy of the License is located at
- *
- *     http://aws.amazon.com/asl/
- *
- * or in the "license" file accompanying this file. This file is
- * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, express or implied. See the License
- * for the specific language governing permissions and
- * limitations under the License.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /** @class */
@@ -55597,20 +55501,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _CognitoUser__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./CognitoUser */ "../amazon-cognito-identity-js/es/CognitoUser.js");
 /* harmony import */ var _StorageHelper__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./StorageHelper */ "../amazon-cognito-identity-js/es/StorageHelper.js");
 /*!
- * Copyright 2016 Amazon.com,
- * Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the
- * License. A copy of the License is located at
- *
- *     http://aws.amazon.com/asl/
- *
- * or in the "license" file accompanying this file. This file is
- * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, express or implied. See the License
- * for the specific language governing permissions and
- * limitations under the License.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 
@@ -55811,20 +55703,8 @@ var CognitoUserPool = /*#__PURE__*/function () {
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return CognitoUserSession; });
 /*!
- * Copyright 2016 Amazon.com,
- * Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the
- * License. A copy of the License is located at
- *
- *     http://aws.amazon.com/asl/
- *
- * or in the "license" file accompanying this file. This file is
- * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, express or implied. See the License
- * for the specific language governing permissions and
- * limitations under the License.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /** @class */
@@ -56073,20 +55953,8 @@ var CookieStorage = /*#__PURE__*/function () {
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return DateHelper; });
 /*!
- * Copyright 2016 Amazon.com,
- * Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the
- * License. A copy of the License is located at
- *
- *     http://aws.amazon.com/asl/
- *
- * or in the "license" file accompanying this file. This file is
- * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, express or implied. See the License
- * for the specific language governing permissions and
- * limitations under the License.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
  */
 var monthNames = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
 var weekNames = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
@@ -56148,17 +56016,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Platform", function() { return Platform; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getUserAgent", function() { return getUserAgent; });
 /* harmony import */ var _version__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./version */ "../amazon-cognito-identity-js/es/Platform/version.js");
-/*
- * Copyright 2017-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with
- * the License. A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
- * and limitations under the License.
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 var BASE_USER_AGENT = "aws-amplify/" + _version__WEBPACK_IMPORTED_MODULE_0__["version"];
@@ -56224,20 +56084,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MemoryStorage", function() { return MemoryStorage; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return StorageHelper; });
 /*!
- * Copyright 2016 Amazon.com,
- * Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the
- * License. A copy of the License is located at
- *
- *     http://aws.amazon.com/asl/
- *
- * or in the "license" file accompanying this file. This file is
- * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, express or implied. See the License
- * for the specific language governing permissions and
- * limitations under the License.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
  */
 var dataMemory = {};
 /** @class */
@@ -56409,20 +56257,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "WordArray", function() { return _utils_WordArray__WEBPACK_IMPORTED_MODULE_12__["default"]; });
 
 /*!
- * Copyright 2016 Amazon.com,
- * Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Amazon Software License (the "License").
- * You may not use this file except in compliance with the
- * License. A copy of the License is located at
- *
- *     http://aws.amazon.com/asl/
- *
- * or in the "license" file accompanying this file. This file is
- * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, express or implied. See the License
- * for the specific language governing permissions and
- * limitations under the License.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 
@@ -58854,17 +58690,11 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "GRAPHQL_AUTH_MODE", function() { return GRAPHQL_AUTH_MODE; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "GraphQLAuthError", function() { return GraphQLAuthError; });
-var GRAPHQL_AUTH_MODE;
+/* harmony import */ var _aws_amplify_auth__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @aws-amplify/auth */ "../auth/lib-esm/index.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "GRAPHQL_AUTH_MODE", function() { return _aws_amplify_auth__WEBPACK_IMPORTED_MODULE_0__["GRAPHQL_AUTH_MODE"]; });
+
 
-(function (GRAPHQL_AUTH_MODE) {
-  GRAPHQL_AUTH_MODE["API_KEY"] = "API_KEY";
-  GRAPHQL_AUTH_MODE["AWS_IAM"] = "AWS_IAM";
-  GRAPHQL_AUTH_MODE["OPENID_CONNECT"] = "OPENID_CONNECT";
-  GRAPHQL_AUTH_MODE["AMAZON_COGNITO_USER_POOLS"] = "AMAZON_COGNITO_USER_POOLS";
-  GRAPHQL_AUTH_MODE["AWS_LAMBDA"] = "AWS_LAMBDA";
-})(GRAPHQL_AUTH_MODE || (GRAPHQL_AUTH_MODE = {}));
 
 var GraphQLAuthError;
 
@@ -61367,21 +61197,68 @@ function () {
 
       var bypassCache = params ? params.bypassCache : false;
       user.getUserData(function (err, data) {
-        if (err) {
-          logger.debug('getting preferred mfa failed', err);
-          rej(err);
-          return;
-        }
+        return __awaiter(_this, void 0, void 0, function () {
+          var cleanUpError_1, mfaType;
+          return __generator(this, function (_a) {
+            switch (_a.label) {
+              case 0:
+                if (!err) return [3
+                /*break*/
+                , 5];
+                logger.debug('getting preferred mfa failed', err);
+                if (!this.isSessionInvalid(err)) return [3
+                /*break*/
+                , 4];
+                _a.label = 1;
 
-        var mfaType = that._getMfaTypeFromUserData(data);
+              case 1:
+                _a.trys.push([1, 3,, 4]);
 
-        if (!mfaType) {
-          rej('invalid MFA Type');
-          return;
-        } else {
-          res(mfaType);
-          return;
-        }
+                return [4
+                /*yield*/
+                , this.cleanUpInvalidSession(user)];
+
+              case 2:
+                _a.sent();
+
+                return [3
+                /*break*/
+                , 4];
+
+              case 3:
+                cleanUpError_1 = _a.sent();
+                rej(new Error("Session is invalid due to: " + err.message + " and failed to clean up invalid session: " + cleanUpError_1.message));
+                return [2
+                /*return*/
+                ];
+
+              case 4:
+                rej(err);
+                return [2
+                /*return*/
+                ];
+
+              case 5:
+                mfaType = that._getMfaTypeFromUserData(data);
+
+                if (!mfaType) {
+                  rej('invalid MFA Type');
+                  return [2
+                  /*return*/
+                  ];
+                } else {
+                  res(mfaType);
+                  return [2
+                  /*return*/
+                  ];
+                }
+
+                return [2
+                /*return*/
+                ];
+            }
+          });
+        });
       }, {
         bypassCache: bypassCache,
         clientMetadata: clientMetadata
@@ -61423,16 +61300,62 @@ function () {
   };
 
   AuthClass.prototype._getUserData = function (user, params) {
+    var _this = this;
+
     return new Promise(function (res, rej) {
       user.getUserData(function (err, data) {
-        if (err) {
-          logger.debug('getting user data failed', err);
-          rej(err);
-          return;
-        } else {
-          res(data);
-          return;
-        }
+        return __awaiter(_this, void 0, void 0, function () {
+          var cleanUpError_2;
+          return __generator(this, function (_a) {
+            switch (_a.label) {
+              case 0:
+                if (!err) return [3
+                /*break*/
+                , 5];
+                logger.debug('getting user data failed', err);
+                if (!this.isSessionInvalid(err)) return [3
+                /*break*/
+                , 4];
+                _a.label = 1;
+
+              case 1:
+                _a.trys.push([1, 3,, 4]);
+
+                return [4
+                /*yield*/
+                , this.cleanUpInvalidSession(user)];
+
+              case 2:
+                _a.sent();
+
+                return [3
+                /*break*/
+                , 4];
+
+              case 3:
+                cleanUpError_2 = _a.sent();
+                rej(new Error("Session is invalid due to: " + err.message + " and failed to clean up invalid session: " + cleanUpError_2.message));
+                return [2
+                /*return*/
+                ];
+
+              case 4:
+                rej(err);
+                return [2
+                /*return*/
+                ];
+
+              case 5:
+                res(data);
+                _a.label = 6;
+
+              case 6:
+                return [2
+                /*return*/
+                ];
+            }
+          });
+        });
       }, params);
     });
   };
@@ -61448,6 +61371,8 @@ function () {
     return __awaiter(this, void 0, void 0, function () {
       var clientMetadata, userData, smsMfaSettings, totpMfaSettings, _a, mfaList, currentMFAType, that;
 
+      var _this = this;
+
       return __generator(this, function (_b) {
         switch (_b.label) {
           case 0:
@@ -61587,12 +61512,53 @@ function () {
                 logger.debug('Caching the latest user data into local'); // cache the latest result into user data
 
                 user.getUserData(function (err, data) {
-                  if (err) {
-                    logger.debug('getting user data failed', err);
-                    return rej(err);
-                  } else {
-                    return res(result);
-                  }
+                  return __awaiter(_this, void 0, void 0, function () {
+                    var cleanUpError_3;
+                    return __generator(this, function (_a) {
+                      switch (_a.label) {
+                        case 0:
+                          if (!err) return [3
+                          /*break*/
+                          , 5];
+                          logger.debug('getting user data failed', err);
+                          if (!this.isSessionInvalid(err)) return [3
+                          /*break*/
+                          , 4];
+                          _a.label = 1;
+
+                        case 1:
+                          _a.trys.push([1, 3,, 4]);
+
+                          return [4
+                          /*yield*/
+                          , this.cleanUpInvalidSession(user)];
+
+                        case 2:
+                          _a.sent();
+
+                          return [3
+                          /*break*/
+                          , 4];
+
+                        case 3:
+                          cleanUpError_3 = _a.sent();
+                          rej(new Error("Session is invalid due to: " + err.message + " and failed to clean up invalid session: " + cleanUpError_3.message));
+                          return [2
+                          /*return*/
+                          ];
+
+                        case 4:
+                          return [2
+                          /*return*/
+                          , rej(err)];
+
+                        case 5:
+                          return [2
+                          /*return*/
+                          , res(result)];
+                      }
+                    });
+                  });
                 }, {
                   bypassCache: true,
                   clientMetadata: clientMetadata
@@ -61981,44 +61947,80 @@ function () {
                     } else {
                       user_1.getSession(function (err, session) {
                         return __awaiter(_this, void 0, void 0, function () {
+                          var cleanUpError_4;
+
                           var _this = this;
 
                           return __generator(this, function (_a) {
-                            if (err) {
-                              logger.debug('Failed to get the user session', err);
-                              return [2
-                              /*return*/
-                              , rej(err)];
-                            } else {
-                              user_1.deleteUser(function (err, result) {
-                                if (err) {
-                                  rej(err);
-                                } else {
-                                  dispatchAuthEvent('userDeleted', result, 'The authenticated user has been deleted.');
-                                  user_1.signOut();
-                                  _this.user = null;
-
-                                  try {
-                                    _this.cleanCachedItems(); // clean aws credentials
-
-                                  } catch (e) {
-                                    // TODO: change to rejects in refactor
-                                    logger.debug('failed to clear cached items');
-                                  }
+                            switch (_a.label) {
+                              case 0:
+                                if (!err) return [3
+                                /*break*/
+                                , 5];
+                                logger.debug('Failed to get the user session', err);
+                                if (!this.isSessionInvalid(err)) return [3
+                                /*break*/
+                                , 4];
+                                _a.label = 1;
+
+                              case 1:
+                                _a.trys.push([1, 3,, 4]);
+
+                                return [4
+                                /*yield*/
+                                , this.cleanUpInvalidSession(user_1)];
+
+                              case 2:
+                                _a.sent();
+
+                                return [3
+                                /*break*/
+                                , 4];
+
+                              case 3:
+                                cleanUpError_4 = _a.sent();
+                                rej(new Error("Session is invalid due to: " + err.message + " and failed to clean up invalid session: " + cleanUpError_4.message));
+                                return [2
+                                /*return*/
+                                ];
+
+                              case 4:
+                                return [2
+                                /*return*/
+                                , rej(err)];
 
-                                  if (isSignedInHostedUI) {
-                                    _this.oAuthSignOutRedirect(res, rej);
+                              case 5:
+                                user_1.deleteUser(function (err, result) {
+                                  if (err) {
+                                    rej(err);
                                   } else {
-                                    dispatchAuthEvent('signOut', _this.user, "A user has been signed out");
-                                    res(result);
+                                    dispatchAuthEvent('userDeleted', result, 'The authenticated user has been deleted.');
+                                    user_1.signOut();
+                                    _this.user = null;
+
+                                    try {
+                                      _this.cleanCachedItems(); // clean aws credentials
+
+                                    } catch (e) {
+                                      // TODO: change to rejects in refactor
+                                      logger.debug('failed to clear cached items');
+                                    }
+
+                                    if (isSignedInHostedUI) {
+                                      _this.oAuthSignOutRedirect(res, rej);
+                                    } else {
+                                      dispatchAuthEvent('signOut', _this.user, "A user has been signed out");
+                                      res(result);
+                                    }
                                   }
-                                }
-                              });
-                            }
+                                });
+                                _a.label = 6;
 
-                            return [2
-                            /*return*/
-                            ];
+                              case 6:
+                                return [2
+                                /*return*/
+                                ];
+                            }
                           });
                         });
                       });
@@ -62126,6 +62128,93 @@ function () {
       };
     });
   };
+
+  AuthClass.prototype.isErrorWithMessage = function (err) {
+    return _typeof(err) === 'object' && Object.prototype.hasOwnProperty.call(err, 'message');
+  }; // Session revoked by another app
+
+
+  AuthClass.prototype.isTokenRevokedError = function (err) {
+    return this.isErrorWithMessage(err) && err.message === 'Access Token has been revoked';
+  };
+
+  AuthClass.prototype.isRefreshTokenRevokedError = function (err) {
+    return this.isErrorWithMessage(err) && err.message === 'Refresh Token has been revoked';
+  };
+
+  AuthClass.prototype.isUserDisabledError = function (err) {
+    return this.isErrorWithMessage(err) && err.message === 'User is disabled.';
+  };
+
+  AuthClass.prototype.isUserDoesNotExistError = function (err) {
+    return this.isErrorWithMessage(err) && err.message === 'User does not exist.';
+  };
+
+  AuthClass.prototype.isRefreshTokenExpiredError = function (err) {
+    return this.isErrorWithMessage(err) && err.message === 'Refresh Token has expired';
+  };
+
+  AuthClass.prototype.isSignedInHostedUI = function () {
+    return this._oAuthHandler && this._storage.getItem('amplify-signin-with-hostedUI') === 'true';
+  };
+
+  AuthClass.prototype.isSessionInvalid = function (err) {
+    return this.isUserDisabledError(err) || this.isUserDoesNotExistError(err) || this.isTokenRevokedError(err) || this.isRefreshTokenRevokedError(err) || this.isRefreshTokenExpiredError(err);
+  };
+
+  AuthClass.prototype.cleanUpInvalidSession = function (user) {
+    return __awaiter(this, void 0, void 0, function () {
+      var e_6;
+
+      var _this = this;
+
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            user.signOut();
+            this.user = null;
+            _a.label = 1;
+
+          case 1:
+            _a.trys.push([1, 3,, 4]);
+
+            return [4
+            /*yield*/
+            , this.cleanCachedItems()];
+
+          case 2:
+            _a.sent(); // clean aws credentials
+
+
+            return [3
+            /*break*/
+            , 4];
+
+          case 3:
+            e_6 = _a.sent();
+            logger.debug('failed to clear cached items');
+            return [3
+            /*break*/
+            , 4];
+
+          case 4:
+            if (this.isSignedInHostedUI()) {
+              return [2
+              /*return*/
+              , new Promise(function (res, rej) {
+                _this.oAuthSignOutRedirect(res, rej);
+              })];
+            } else {
+              dispatchAuthEvent('signOut', this.user, "A user has been signed out");
+            }
+
+            return [2
+            /*return*/
+            ];
+        }
+      });
+    });
+  };
   /**
    * Get current authenticated user
    * @return - A promise resolves to current authenticated CognitoUser if success
@@ -62196,74 +62285,143 @@ function () {
 
                 user.getSession(function (err, session) {
                   return __awaiter(_this, void 0, void 0, function () {
-                    var bypassCache, clientMetadata, _a, scope;
+                    var cleanUpError_5, bypassCache, clientMetadata, _a, scope;
 
                     var _this = this;
 
                     return __generator(this, function (_b) {
                       switch (_b.label) {
                         case 0:
-                          if (err) {
-                            logger.debug('Failed to get the user session', err);
-                            rej(err);
-                            return [2
-                            /*return*/
-                            ];
-                          }
+                          if (!err) return [3
+                          /*break*/
+                          , 5];
+                          logger.debug('Failed to get the user session', err);
+                          if (!this.isSessionInvalid(err)) return [3
+                          /*break*/
+                          , 4];
+                          _b.label = 1;
+
+                        case 1:
+                          _b.trys.push([1, 3,, 4]);
+
+                          return [4
+                          /*yield*/
+                          , this.cleanUpInvalidSession(user)];
+
+                        case 2:
+                          _b.sent();
+
+                          return [3
+                          /*break*/
+                          , 4];
+
+                        case 3:
+                          cleanUpError_5 = _b.sent();
+                          rej(new Error("Session is invalid due to: " + err.message + " and failed to clean up invalid session: " + cleanUpError_5.message));
+                          return [2
+                          /*return*/
+                          ];
+
+                        case 4:
+                          rej(err);
+                          return [2
+                          /*return*/
+                          ];
 
+                        case 5:
                           bypassCache = params ? params.bypassCache : false;
                           if (!bypassCache) return [3
                           /*break*/
-                          , 2];
+                          , 7];
                           return [4
                           /*yield*/
                           , this.Credentials.clear()];
 
-                        case 1:
+                        case 6:
                           _b.sent();
 
-                          _b.label = 2;
+                          _b.label = 7;
 
-                        case 2:
+                        case 7:
                           clientMetadata = this._config.clientMetadata;
                           _a = session.getAccessToken().decodePayload().scope, scope = _a === void 0 ? '' : _a;
 
                           if (scope.split(' ').includes(USER_ADMIN_SCOPE)) {
                             user.getUserData(function (err, data) {
-                              if (err) {
-                                logger.debug('getting user data failed', err); // Make sure the user is still valid
-
-                                if (err.message === 'User is disabled.' || err.message === 'User does not exist.' || err.message === 'Access Token has been revoked' // Session revoked by another app
-                                ) {
-                                  rej(err);
-                                } else {
-                                  // the error may also be thrown when lack of permissions to get user info etc
-                                  // in that case we just bypass the error
-                                  res(user);
-                                }
+                              return __awaiter(_this, void 0, void 0, function () {
+                                var cleanUpError_6, preferredMFA, attributeList, i, attribute, userAttribute, attributes;
+                                return __generator(this, function (_a) {
+                                  switch (_a.label) {
+                                    case 0:
+                                      if (!err) return [3
+                                      /*break*/
+                                      , 7];
+                                      logger.debug('getting user data failed', err);
+                                      if (!this.isSessionInvalid(err)) return [3
+                                      /*break*/
+                                      , 5];
+                                      _a.label = 1;
 
-                                return;
-                              }
+                                    case 1:
+                                      _a.trys.push([1, 3,, 4]);
+
+                                      return [4
+                                      /*yield*/
+                                      , this.cleanUpInvalidSession(user)];
 
-                              var preferredMFA = data.PreferredMfaSetting || 'NOMFA';
-                              var attributeList = [];
+                                    case 2:
+                                      _a.sent();
 
-                              for (var i = 0; i < data.UserAttributes.length; i++) {
-                                var attribute = {
-                                  Name: data.UserAttributes[i].Name,
-                                  Value: data.UserAttributes[i].Value
-                                };
-                                var userAttribute = new amazon_cognito_identity_js__WEBPACK_IMPORTED_MODULE_2__["CognitoUserAttribute"](attribute);
-                                attributeList.push(userAttribute);
-                              }
+                                      return [3
+                                      /*break*/
+                                      , 4];
+
+                                    case 3:
+                                      cleanUpError_6 = _a.sent();
+                                      rej(new Error("Session is invalid due to: " + err.message + " and failed to clean up invalid session: " + cleanUpError_6.message));
+                                      return [2
+                                      /*return*/
+                                      ];
 
-                              var attributes = _this.attributesToObject(attributeList);
+                                    case 4:
+                                      rej(err);
+                                      return [3
+                                      /*break*/
+                                      , 6];
+
+                                    case 5:
+                                      res(user);
+                                      _a.label = 6;
+
+                                    case 6:
+                                      return [2
+                                      /*return*/
+                                      ];
+
+                                    case 7:
+                                      preferredMFA = data.PreferredMfaSetting || 'NOMFA';
+                                      attributeList = [];
+
+                                      for (i = 0; i < data.UserAttributes.length; i++) {
+                                        attribute = {
+                                          Name: data.UserAttributes[i].Name,
+                                          Value: data.UserAttributes[i].Value
+                                        };
+                                        userAttribute = new amazon_cognito_identity_js__WEBPACK_IMPORTED_MODULE_2__["CognitoUserAttribute"](attribute);
+                                        attributeList.push(userAttribute);
+                                      }
 
-                              Object.assign(user, {
-                                attributes: attributes,
-                                preferredMFA: preferredMFA
+                                      attributes = this.attributesToObject(attributeList);
+                                      Object.assign(user, {
+                                        attributes: attributes,
+                                        preferredMFA: preferredMFA
+                                      });
+                                      return [2
+                                      /*return*/
+                                      , res(user)];
+                                  }
+                                });
                               });
-                              return res(user);
                             }, {
                               bypassCache: bypassCache,
                               clientMetadata: clientMetadata
@@ -62309,7 +62467,7 @@ function () {
 
   AuthClass.prototype.currentAuthenticatedUser = function (params) {
     return __awaiter(this, void 0, void 0, function () {
-      var federatedUser, e_6, federatedInfo, user, e_7;
+      var federatedUser, e_7, federatedInfo, user, e_8;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -62332,9 +62490,9 @@ function () {
             , 4];
 
           case 3:
-            e_6 = _a.sent();
-            logger.debug('Failed to sync cache info into memory', e_6);
-            throw e_6;
+            e_7 = _a.sent();
+            logger.debug('Failed to sync cache info into memory', e_7);
+            throw e_7;
 
           case 4:
             try {
@@ -62377,13 +62535,13 @@ function () {
             , 9];
 
           case 8:
-            e_7 = _a.sent();
+            e_8 = _a.sent();
 
-            if (e_7 === 'No userPool') {
+            if (e_8 === 'No userPool') {
               logger.error('Cannot get the current user because the user pool is missing. ' + 'Please make sure the Auth module is configured with a valid Cognito User Pool ID');
             }
 
-            logger.debug('The user is not authenticated by the error', e_7);
+            logger.debug('The user is not authenticated by the error', e_8);
             return [2
             /*return*/
             , Promise.reject('The user is not authenticated')];
@@ -62408,7 +62566,7 @@ function () {
     logger.debug('Getting current session'); // Purposely not calling the reject method here because we don't need a console error
 
     if (!this.userPool) {
-      return Promise.reject();
+      return this.rejectNoUserPool();
     }
 
     return new Promise(function (res, rej) {
@@ -62436,6 +62594,8 @@ function () {
 
 
   AuthClass.prototype.userSession = function (user) {
+    var _this = this;
+
     if (!user) {
       logger.debug('the user is null');
       return this.rejectAuthError(_types_Auth__WEBPACK_IMPORTED_MODULE_7__["AuthErrorTypes"].NoUserSession);
@@ -62443,18 +62603,59 @@ function () {
 
     var clientMetadata = this._config.clientMetadata; // TODO: verify behavior if this is override during signIn
 
-    return new Promise(function (resolve, reject) {
+    return new Promise(function (res, rej) {
       logger.debug('Getting the session from this user:', user);
       user.getSession(function (err, session) {
-        if (err) {
-          logger.debug('Failed to get the session from user', user);
-          reject(err);
-          return;
-        } else {
-          logger.debug('Succeed to get the user session', session);
-          resolve(session);
-          return;
-        }
+        return __awaiter(_this, void 0, void 0, function () {
+          var cleanUpError_7;
+          return __generator(this, function (_a) {
+            switch (_a.label) {
+              case 0:
+                if (!err) return [3
+                /*break*/
+                , 5];
+                logger.debug('Failed to get the session from user', user);
+                if (!this.isSessionInvalid(err)) return [3
+                /*break*/
+                , 4];
+                _a.label = 1;
+
+              case 1:
+                _a.trys.push([1, 3,, 4]);
+
+                return [4
+                /*yield*/
+                , this.cleanUpInvalidSession(user)];
+
+              case 2:
+                _a.sent();
+
+                return [3
+                /*break*/
+                , 4];
+
+              case 3:
+                cleanUpError_7 = _a.sent();
+                rej(new Error("Session is invalid due to: " + err.message + " and failed to clean up invalid session: " + cleanUpError_7.message));
+                return [2
+                /*return*/
+                ];
+
+              case 4:
+                rej(err);
+                return [2
+                /*return*/
+                ];
+
+              case 5:
+                logger.debug('Succeed to get the user session', session);
+                res(session);
+                return [2
+                /*return*/
+                ];
+            }
+          });
+        });
       }, {
         clientMetadata: clientMetadata
       });
@@ -62468,7 +62669,7 @@ function () {
 
   AuthClass.prototype.currentUserCredentials = function () {
     return __awaiter(this, void 0, void 0, function () {
-      var e_8, federatedInfo;
+      var e_9, federatedInfo;
 
       var _this = this;
 
@@ -62493,9 +62694,9 @@ function () {
             , 4];
 
           case 3:
-            e_8 = _a.sent();
-            logger.debug('Failed to sync cache info into memory', e_8);
-            throw e_8;
+            e_9 = _a.sent();
+            logger.debug('Failed to sync cache info into memory', e_9);
+            throw e_9;
 
           case 4:
             federatedInfo = null;
@@ -62517,8 +62718,8 @@ function () {
               , this.currentSession().then(function (session) {
                 logger.debug('getting session success', session);
                 return _this.Credentials.set(session, 'session');
-              })["catch"](function (error) {
-                logger.debug('getting session failed', error);
+              })["catch"](function () {
+                logger.debug('getting guest credentials');
                 return _this.Credentials.set(null, 'guest');
               })];
             }
@@ -62610,7 +62811,7 @@ function () {
 
   AuthClass.prototype.cognitoIdentitySignOut = function (opts, user) {
     return __awaiter(this, void 0, void 0, function () {
-      var e_9, isSignedInHostedUI;
+      var e_10, isSignedInHostedUI;
 
       var _this = this;
 
@@ -62631,9 +62832,9 @@ function () {
             , 3];
 
           case 2:
-            e_9 = _a.sent();
-            logger.debug('Failed to sync cache info into memory', e_9);
-            throw e_9;
+            e_10 = _a.sent();
+            logger.debug('Failed to sync cache info into memory', e_10);
+            throw e_10;
 
           case 3:
             isSignedInHostedUI = this._oAuthHandler && this._storage.getItem('amplify-signin-with-hostedUI') === 'true';
@@ -62647,25 +62848,70 @@ function () {
                 var clientMetadata = _this._config.clientMetadata; // TODO: verify behavior if this is override during signIn
 
                 user.getSession(function (err, result) {
-                  if (err) {
-                    logger.debug('failed to get the user session', err);
-                    return rej(err);
-                  }
+                  return __awaiter(_this, void 0, void 0, function () {
+                    var cleanUpError_8;
 
-                  user.globalSignOut({
-                    onSuccess: function onSuccess(data) {
-                      logger.debug('global sign out success');
+                    var _this = this;
 
-                      if (isSignedInHostedUI) {
-                        _this.oAuthSignOutRedirect(res, rej);
-                      } else {
-                        return res();
+                    return __generator(this, function (_a) {
+                      switch (_a.label) {
+                        case 0:
+                          if (!err) return [3
+                          /*break*/
+                          , 5];
+                          logger.debug('failed to get the user session', err);
+                          if (!this.isSessionInvalid(err)) return [3
+                          /*break*/
+                          , 4];
+                          _a.label = 1;
+
+                        case 1:
+                          _a.trys.push([1, 3,, 4]);
+
+                          return [4
+                          /*yield*/
+                          , this.cleanUpInvalidSession(user)];
+
+                        case 2:
+                          _a.sent();
+
+                          return [3
+                          /*break*/
+                          , 4];
+
+                        case 3:
+                          cleanUpError_8 = _a.sent();
+                          rej(new Error("Session is invalid due to: " + err.message + " and failed to clean up invalid session: " + cleanUpError_8.message));
+                          return [2
+                          /*return*/
+                          ];
+
+                        case 4:
+                          return [2
+                          /*return*/
+                          , rej(err)];
+
+                        case 5:
+                          user.globalSignOut({
+                            onSuccess: function onSuccess(data) {
+                              logger.debug('global sign out success');
+
+                              if (isSignedInHostedUI) {
+                                _this.oAuthSignOutRedirect(res, rej);
+                              } else {
+                                return res();
+                              }
+                            },
+                            onFailure: function onFailure(err) {
+                              logger.debug('global sign out failed', err);
+                              return rej(err);
+                            }
+                          });
+                          return [2
+                          /*return*/
+                          ];
                       }
-                    },
-                    onFailure: function onFailure(err) {
-                      logger.debug('global sign out failed', err);
-                      return rej(err);
-                    }
+                    });
                   });
                 }, {
                   clientMetadata: clientMetadata
@@ -62708,7 +62954,7 @@ function () {
 
 
     setTimeout(function () {
-      return reject('Signout timeout fail');
+      return reject(Error('Signout timeout fail'));
     }, 3000);
   };
   /**
@@ -62720,7 +62966,7 @@ function () {
 
   AuthClass.prototype.signOut = function (opts) {
     return __awaiter(this, void 0, void 0, function () {
-      var e_10, user;
+      var e_11, user;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -62738,7 +62984,7 @@ function () {
             , 3];
 
           case 2:
-            e_10 = _a.sent();
+            e_11 = _a.sent();
             logger.debug('failed to clear cached items');
             return [3
             /*break*/
@@ -62773,7 +63019,7 @@ function () {
             , 8];
 
           case 7:
-            logger.debug('no Congito User pool');
+            logger.debug('no Cognito User pool');
             _a.label = 8;
 
           case 8:
@@ -62939,7 +63185,7 @@ function () {
 
   AuthClass.prototype.currentUserInfo = function () {
     return __awaiter(this, void 0, void 0, function () {
-      var source, user, attributes, userAttrs, credentials, e_11, info, err_1, user;
+      var source, user, attributes, userAttrs, credentials, e_12, info, err_1, user;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -62991,8 +63237,8 @@ function () {
             , 7];
 
           case 6:
-            e_11 = _a.sent();
-            logger.debug('Failed to retrieve credentials while getting current user info', e_11);
+            e_12 = _a.sent();
+            logger.debug('Failed to retrieve credentials while getting current user info', e_12);
             return [3
             /*break*/
             , 7];
@@ -64390,7 +64636,7 @@ var AuthErrorStrings;
 /*!********************************!*\
   !*** ../auth/lib-esm/index.js ***!
   \********************************/
-/*! exports provided: default, Auth, CognitoUser, CookieStorage, CognitoHostedUIIdentityProvider, appendToCognitoUserAgent, AuthErrorStrings */
+/*! exports provided: default, Auth, CognitoUser, CookieStorage, CognitoHostedUIIdentityProvider, appendToCognitoUserAgent, AuthErrorStrings, GRAPHQL_AUTH_MODE */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -64401,6 +64647,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _types_Auth__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./types/Auth */ "../auth/lib-esm/types/Auth.js");
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "CognitoHostedUIIdentityProvider", function() { return _types_Auth__WEBPACK_IMPORTED_MODULE_1__["CognitoHostedUIIdentityProvider"]; });
 
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "GRAPHQL_AUTH_MODE", function() { return _types_Auth__WEBPACK_IMPORTED_MODULE_1__["GRAPHQL_AUTH_MODE"]; });
+
 /* harmony import */ var amazon_cognito_identity_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! amazon-cognito-identity-js */ "../amazon-cognito-identity-js/es/index.js");
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "CognitoUser", function() { return amazon_cognito_identity_js__WEBPACK_IMPORTED_MODULE_2__["CognitoUser"]; });
 
@@ -64440,7 +64688,7 @@ __webpack_require__.r(__webpack_exports__);
 /*!*************************************!*\
   !*** ../auth/lib-esm/types/Auth.js ***!
   \*************************************/
-/*! exports provided: CognitoHostedUIIdentityProvider, isFederatedSignInOptions, isFederatedSignInOptionsCustom, hasCustomState, isCognitoHostedOpts, AuthErrorTypes, isUsernamePasswordOpts */
+/*! exports provided: CognitoHostedUIIdentityProvider, isFederatedSignInOptions, isFederatedSignInOptionsCustom, hasCustomState, isCognitoHostedOpts, AuthErrorTypes, isUsernamePasswordOpts, GRAPHQL_AUTH_MODE */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -64452,6 +64700,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isCognitoHostedOpts", function() { return isCognitoHostedOpts; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AuthErrorTypes", function() { return AuthErrorTypes; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isUsernamePasswordOpts", function() { return isUsernamePasswordOpts; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "GRAPHQL_AUTH_MODE", function() { return GRAPHQL_AUTH_MODE; });
 /*
  * Copyright 2017-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
@@ -64517,6 +64766,15 @@ var AuthErrorTypes;
 function isUsernamePasswordOpts(obj) {
   return !!obj.username;
 }
+var GRAPHQL_AUTH_MODE;
+
+(function (GRAPHQL_AUTH_MODE) {
+  GRAPHQL_AUTH_MODE["API_KEY"] = "API_KEY";
+  GRAPHQL_AUTH_MODE["AWS_IAM"] = "AWS_IAM";
+  GRAPHQL_AUTH_MODE["OPENID_CONNECT"] = "OPENID_CONNECT";
+  GRAPHQL_AUTH_MODE["AMAZON_COGNITO_USER_POOLS"] = "AMAZON_COGNITO_USER_POOLS";
+  GRAPHQL_AUTH_MODE["AWS_LAMBDA"] = "AWS_LAMBDA";
+})(GRAPHQL_AUTH_MODE || (GRAPHQL_AUTH_MODE = {}));
 
 /***/ }),
 
@@ -64524,7 +64782,7 @@ function isUsernamePasswordOpts(obj) {
 /*!**************************************!*\
   !*** ../auth/lib-esm/types/index.js ***!
   \**************************************/
-/*! exports provided: CognitoHostedUIIdentityProvider, isFederatedSignInOptions, isFederatedSignInOptionsCustom, hasCustomState, isCognitoHostedOpts, AuthErrorTypes, isUsernamePasswordOpts */
+/*! exports provided: CognitoHostedUIIdentityProvider, isFederatedSignInOptions, isFederatedSignInOptionsCustom, hasCustomState, isCognitoHostedOpts, AuthErrorTypes, isUsernamePasswordOpts, GRAPHQL_AUTH_MODE */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -64544,6 +64802,8 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "isUsernamePasswordOpts", function() { return _Auth__WEBPACK_IMPORTED_MODULE_0__["isUsernamePasswordOpts"]; });
 
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "GRAPHQL_AUTH_MODE", function() { return _Auth__WEBPACK_IMPORTED_MODULE_0__["GRAPHQL_AUTH_MODE"]; });
+
 /*
  * Copyright 2017-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
@@ -70936,7 +71196,7 @@ var getAmplifyUserAgent = function getAmplifyUserAgent() {
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "version", function() { return version; });
 // generated by genversion
-var version = '4.4.0';
+var version = '4.5.2';
 
 /***/ }),
 
@@ -73399,13 +73659,14 @@ function () {
 /*!*************************************!*\
   !*** ../core/lib-esm/Util/Retry.js ***!
   \*************************************/
-/*! exports provided: NonRetryableError, retry, jitteredExponentialRetry */
+/*! exports provided: NonRetryableError, retry, jitteredBackoff, jitteredExponentialRetry */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "NonRetryableError", function() { return NonRetryableError; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "retry", function() { return retry; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "jitteredBackoff", function() { return jitteredBackoff; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "jitteredExponentialRetry", function() { return jitteredExponentialRetry; });
 /* harmony import */ var _Logger_ConsoleLogger__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../Logger/ConsoleLogger */ "../core/lib-esm/Logger/ConsoleLogger.js");
 var __extends = undefined && undefined.__extends || function () {
@@ -73720,8 +73981,16 @@ function retry(functionToRetry, args, delayFn, attempt) {
   });
 }
 var MAX_DELAY_MS = 5 * 60 * 1000;
+/**
+ * @private
+ * Internal use of Amplify only
+ */
 
 function jitteredBackoff(maxDelayMs) {
+  if (maxDelayMs === void 0) {
+    maxDelayMs = MAX_DELAY_MS;
+  }
+
   var BASE_TIME_MS = 100;
   var JITTER_FACTOR = 100;
   return function (attempt) {
@@ -73734,7 +74003,6 @@ function jitteredBackoff(maxDelayMs) {
  * Internal use of Amplify only
  */
 
-
 var jitteredExponentialRetry = function jitteredExponentialRetry(functionToRetry, args, maxDelayMs) {
   if (maxDelayMs === void 0) {
     maxDelayMs = MAX_DELAY_MS;
@@ -73773,7 +74041,7 @@ function urlSafeDecode(hex) {
 /*!*************************************!*\
   !*** ../core/lib-esm/Util/index.js ***!
   \*************************************/
-/*! exports provided: NonRetryableError, retry, jitteredExponentialRetry, Mutex, Reachability, DateUtils, urlSafeEncode, urlSafeDecode, AWS_CLOUDWATCH_BASE_BUFFER_SIZE, AWS_CLOUDWATCH_CATEGORY, AWS_CLOUDWATCH_MAX_BATCH_EVENT_SIZE, AWS_CLOUDWATCH_MAX_EVENT_SIZE, AWS_CLOUDWATCH_PROVIDER_NAME, NO_CREDS_ERROR_STRING, RETRY_ERROR_CODES, AMAZON_KINESIS_LOGGING_PROVIDER_NAME, AMAZON_KINESIS_LOGGING_CATEGORY */
+/*! exports provided: NonRetryableError, retry, jitteredBackoff, jitteredExponentialRetry, Mutex, Reachability, DateUtils, urlSafeEncode, urlSafeDecode, AWS_CLOUDWATCH_BASE_BUFFER_SIZE, AWS_CLOUDWATCH_CATEGORY, AWS_CLOUDWATCH_MAX_BATCH_EVENT_SIZE, AWS_CLOUDWATCH_MAX_EVENT_SIZE, AWS_CLOUDWATCH_PROVIDER_NAME, NO_CREDS_ERROR_STRING, RETRY_ERROR_CODES, AMAZON_KINESIS_LOGGING_PROVIDER_NAME, AMAZON_KINESIS_LOGGING_CATEGORY */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -73783,6 +74051,8 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "retry", function() { return _Retry__WEBPACK_IMPORTED_MODULE_0__["retry"]; });
 
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "jitteredBackoff", function() { return _Retry__WEBPACK_IMPORTED_MODULE_0__["jitteredBackoff"]; });
+
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "jitteredExponentialRetry", function() { return _Retry__WEBPACK_IMPORTED_MODULE_0__["jitteredExponentialRetry"]; });
 
 /* harmony import */ var _Mutex__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./Mutex */ "../core/lib-esm/Util/Mutex.js");
@@ -73857,6 +74127,10 @@ __webpack_require__.r(__webpack_exports__);
  * is used for AppSync/GraphQL subscriptions in the API category.
  */
 var hasSymbol = typeof Symbol !== 'undefined' && typeof Symbol["for"] === 'function';
+/**
+ * @deprecated Unused, all usecases have migrated to INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER
+ */
+
 var INTERNAL_AWS_APPSYNC_PUBSUB_PROVIDER = hasSymbol ? Symbol["for"]('INTERNAL_AWS_APPSYNC_PUBSUB_PROVIDER') : '@@INTERNAL_AWS_APPSYNC_PUBSUB_PROVIDER';
 var INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER = hasSymbol ? Symbol["for"]('INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER') : '@@INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER';
 var USER_AGENT_HEADER = 'x-amz-user-agent';
@@ -73867,7 +74141,7 @@ var USER_AGENT_HEADER = 'x-amz-user-agent';
 /*!********************************!*\
   !*** ../core/lib-esm/index.js ***!
   \********************************/
-/*! exports provided: AmplifyClass, ClientDevice, ConsoleLogger, Logger, missingConfig, invalidParameter, Hub, I18n, isEmpty, sortByField, objectLessAttributes, filenameToContentType, isTextFile, generateRandomString, makeQuerablePromise, isWebWorker, browserOrNode, transferKeyToLowerCase, transferKeyToUpperCase, isStrictObject, JS, Signer, parseMobileHubConfig, Parser, AWSCloudWatchProvider, FacebookOAuth, GoogleOAuth, Linking, AppState, AsyncStorage, Credentials, CredentialsClass, ServiceWorker, StorageHelper, MemoryStorage, UniversalStorage, Platform, getAmplifyUserAgent, INTERNAL_AWS_APPSYNC_PUBSUB_PROVIDER, INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER, USER_AGENT_HEADER, Constants, NonRetryableError, retry, jitteredExponentialRetry, Mutex, Reachability, DateUtils, urlSafeEncode, urlSafeDecode, AWS_CLOUDWATCH_BASE_BUFFER_SIZE, AWS_CLOUDWATCH_CATEGORY, AWS_CLOUDWATCH_MAX_BATCH_EVENT_SIZE, AWS_CLOUDWATCH_MAX_EVENT_SIZE, AWS_CLOUDWATCH_PROVIDER_NAME, NO_CREDS_ERROR_STRING, RETRY_ERROR_CODES, AMAZON_KINESIS_LOGGING_PROVIDER_NAME, AMAZON_KINESIS_LOGGING_CATEGORY, Amplify, default */
+/*! exports provided: AmplifyClass, ClientDevice, ConsoleLogger, Logger, missingConfig, invalidParameter, Hub, I18n, isEmpty, sortByField, objectLessAttributes, filenameToContentType, isTextFile, generateRandomString, makeQuerablePromise, isWebWorker, browserOrNode, transferKeyToLowerCase, transferKeyToUpperCase, isStrictObject, JS, Signer, parseMobileHubConfig, Parser, AWSCloudWatchProvider, FacebookOAuth, GoogleOAuth, Linking, AppState, AsyncStorage, Credentials, CredentialsClass, ServiceWorker, StorageHelper, MemoryStorage, UniversalStorage, Platform, getAmplifyUserAgent, INTERNAL_AWS_APPSYNC_PUBSUB_PROVIDER, INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER, USER_AGENT_HEADER, Constants, NonRetryableError, retry, jitteredBackoff, jitteredExponentialRetry, Mutex, Reachability, DateUtils, urlSafeEncode, urlSafeDecode, AWS_CLOUDWATCH_BASE_BUFFER_SIZE, AWS_CLOUDWATCH_CATEGORY, AWS_CLOUDWATCH_MAX_BATCH_EVENT_SIZE, AWS_CLOUDWATCH_MAX_EVENT_SIZE, AWS_CLOUDWATCH_PROVIDER_NAME, NO_CREDS_ERROR_STRING, RETRY_ERROR_CODES, AMAZON_KINESIS_LOGGING_PROVIDER_NAME, AMAZON_KINESIS_LOGGING_CATEGORY, Amplify, default */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -73980,6 +74254,8 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "retry", function() { return _Util__WEBPACK_IMPORTED_MODULE_18__["retry"]; });
 
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "jitteredBackoff", function() { return _Util__WEBPACK_IMPORTED_MODULE_18__["jitteredBackoff"]; });
+
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "jitteredExponentialRetry", function() { return _Util__WEBPACK_IMPORTED_MODULE_18__["jitteredExponentialRetry"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Mutex", function() { return _Util__WEBPACK_IMPORTED_MODULE_18__["Mutex"]; });
@@ -82875,11 +83151,30 @@ function () {
                   , this.start()];
 
                 case 1:
-                  _a.sent();
+                  _a.sent(); // Filter the events returned by Storage according to namespace,
+                  // append original element data, and subscribe to the observable
+
 
                   handle = this.storage.observe(modelConstructor, predicate).filter(function (_a) {
                     var model = _a.model;
                     return namespaceResolver(model) === _util__WEBPACK_IMPORTED_MODULE_9__["USER"];
+                  }).map(function (event) {
+                    // The `element` returned by storage only contains updated fields.
+                    // Intercept the event to send the `savedElement` so that the first
+                    // snapshot returned to the consumer contains all fields.
+                    // In the event of a delete we return `element`, as `savedElement`
+                    // here is undefined.
+                    var opType = event.opType,
+                        model = event.model,
+                        condition = event.condition,
+                        element = event.element,
+                        savedElement = event.savedElement;
+                    return {
+                      opType: opType,
+                      element: savedElement || element,
+                      model: model,
+                      condition: condition
+                    };
                   }).subscribe(observer);
                   return [2
                   /*return*/
@@ -89159,7 +89454,7 @@ function () {
             result = _a.sent();
             result.forEach(function (r) {
               var _a = __read(r, 2),
-                  originalElement = _a[0],
+                  savedElement = _a[0],
                   opType = _a[1]; // truthy when save is called by the Merger
 
 
@@ -89168,7 +89463,18 @@ function () {
               // is called by Merger, i.e., when processing an AppSync response
 
               if (opType === _types__WEBPACK_IMPORTED_MODULE_3__["OpType"].UPDATE && !syncResponse) {
-                updateMutationInput = _this.getUpdateMutationInput(model, originalElement, patchesTuple); // // an update without changed user fields
+                //
+                // TODO: LOOK!!!
+                // the `model` used here is in effect regardless of what model
+                // comes back from adapter.save().
+                // Prior to fix, SQLite adapter had been returning two models
+                // of different types, resulting in invalid outbox entries.
+                //
+                // the bug is essentially fixed in SQLite adapter.
+                // leaving as-is, because it's currently unclear whether anything
+                // depends on this remaining as-is.
+                //
+                updateMutationInput = _this.getUpdateMutationInput(model, savedElement, patchesTuple); // // an update without changed user fields
                 // => don't create mutationEvent
 
                 if (updateMutationInput === null) {
@@ -89176,15 +89482,16 @@ function () {
                 }
               }
 
-              var element = updateMutationInput || originalElement;
-              var modelConstructor = Object.getPrototypeOf(originalElement).constructor;
+              var element = updateMutationInput || savedElement;
+              var modelConstructor = Object.getPrototypeOf(savedElement).constructor;
 
               _this.pushStream.next({
                 model: modelConstructor,
                 opType: opType,
                 element: element,
                 mutator: mutator,
-                condition: _predicates__WEBPACK_IMPORTED_MODULE_2__["ModelPredicateCreator"].getPredicates(condition, false)
+                condition: _predicates__WEBPACK_IMPORTED_MODULE_2__["ModelPredicateCreator"].getPredicates(condition, false),
+                savedElement: savedElement
               });
             });
             return [2
@@ -91375,7 +91682,7 @@ var __spread = undefined && undefined.__spread || function () {
   return ar;
 };
 
-
+ // https://github.com/aws-amplify/amplify-js/blob/datastore-docs/packages/datastore/docs/sync-engine.md#merger
 
 var ModelMerger =
 /** @class */
@@ -91704,6 +92011,7 @@ var __read = undefined && undefined.__read || function (o, n) {
 
 
  // TODO: Persist deleted ids
+// https://github.com/aws-amplify/amplify-js/blob/datastore-docs/packages/datastore/docs/sync-engine.md#outbox
 
 var MutationEventOutbox =
 /** @class */
@@ -92134,11 +92442,12 @@ function () {
 /*!*********************************************!*\
   !*** ./lib-esm/sync/processors/mutation.js ***!
   \*********************************************/
-/*! exports provided: MutationProcessor */
+/*! exports provided: safeJitteredBackoff, MutationProcessor */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "safeJitteredBackoff", function() { return safeJitteredBackoff; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MutationProcessor", function() { return MutationProcessor; });
 /* harmony import */ var _aws_amplify_api__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @aws-amplify/api */ "../api/lib-esm/index.js");
 /* harmony import */ var _aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @aws-amplify/core */ "../core/lib-esm/index.js");
@@ -92692,7 +93001,7 @@ function () {
           case 0:
             return [4
             /*yield*/
-            , Object(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["jitteredExponentialRetry"])(function (model, operation, data, condition, modelConstructor, MutationEvent, mutationEvent) {
+            , Object(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["retry"])(function (model, operation, data, condition, modelConstructor, MutationEvent, mutationEvent) {
               return __awaiter(_this, void 0, void 0, function () {
                 var _a, query, variables, graphQLCondition, opName, modelDefinition, authToken, tryWith, attempt, opType, result, err_1, _b, error, _c, _d, code, retryWith, err_2, _e, _f, opName_1, query_1, authToken_1, serverData, namespace, updatedMutation, err_3;
 
@@ -92898,7 +93207,7 @@ function () {
                   }
                 });
               });
-            }, [model, operation, data, condition, modelConstructor, MutationEvent, mutationEvent])];
+            }, [model, operation, data, condition, modelConstructor, MutationEvent, mutationEvent], safeJitteredBackoff)];
 
           case 1:
             return [2
@@ -93040,6 +93349,33 @@ function () {
   return MutationProcessor;
 }();
 
+var MAX_RETRY_DELAY_MS = 5 * 60 * 1000;
+var originalJitteredBackoff = Object(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["jitteredBackoff"])(MAX_RETRY_DELAY_MS);
+/**
+ * @private
+ * Internal use of Amplify only.
+ *
+ * Wraps the jittered backoff calculation to retry Network Errors indefinitely.
+ * Backs off according to original jittered retry logic until the original retry
+ * logic hits its max. After this occurs, if the error is a Network Error, we
+ * ignore the attempt count and return MAX_RETRY_DELAY_MS to retry forever (until
+ * the request succeeds).
+ *
+ * @param attempt ignored
+ * @param _args ignored
+ * @param error tested to see if `.message` is 'Network Error'
+ * @returns number | false :
+ */
+
+var safeJitteredBackoff = function safeJitteredBackoff(attempt, _args, error) {
+  var attemptResult = originalJitteredBackoff(attempt); // If this is the last attempt and it is a network error, we retry indefinitively every 5 minutes
+
+  if (attemptResult === false && (error === null || error === void 0 ? void 0 : error.message) === 'Network Error') {
+    return MAX_RETRY_DELAY_MS;
+  }
+
+  return attemptResult;
+};
 
 
 /***/ }),