@aws-amplify/datastore 3.12.2-auth-hotfix.4 → 3.12.2-unstable.5

package/dist/aws-amplify-datastore.js

@@ -60725,8 +60725,6 @@ function () {
     this.userPool = null;
     this.user = null;
     this.oAuthFlowInProgress = false;
-    this.inflightSessionPromise = null;
-    this.inflightSession = false;
     this.Credentials = _aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["Credentials"];
 
     this.wrapRefreshSessionCallback = function (callback) {
@@ -62354,12 +62352,12 @@ function () {
     return new Promise(function (res, rej) {
       _this._storageSync.then(function () {
         return __awaiter(_this, void 0, void 0, function () {
-          var user, session, bypassCache, clientMetadata, _a, scope, err_1;
+          var user, clientMetadata;
 
           var _this = this;
 
-          return __generator(this, function (_b) {
-            switch (_b.label) {
+          return __generator(this, function (_a) {
+            switch (_a.label) {
               case 0:
                 if (!this.isOAuthInProgress()) return [3
                 /*break*/
@@ -62389,9 +62387,9 @@ function () {
                 })];
 
               case 1:
-                _b.sent();
+                _a.sent();
 
-                _b.label = 2;
+                _a.label = 2;
 
               case 2:
                 user = this.userPool.getCurrentUser();
@@ -62404,135 +62402,167 @@ function () {
                   ];
                 }
 
-                _b.label = 3;
+                clientMetadata = this._config.clientMetadata; // refresh the session if the session expired.
 
-              case 3:
-                _b.trys.push([3, 7,, 8]);
+                user.getSession(function (err, session) {
+                  return __awaiter(_this, void 0, void 0, function () {
+                    var cleanUpError_5, bypassCache, clientMetadata, _a, scope;
 
-                return [4
-                /*yield*/
-                , this._userSession({
-                  user: user
-                })];
+                    var _this = this;
 
-              case 4:
-                session = _b.sent();
-                bypassCache = params ? params.bypassCache : false;
-                if (!bypassCache) return [3
-                /*break*/
-                , 6];
-                return [4
-                /*yield*/
-                , this.Credentials.clear()];
+                    return __generator(this, function (_b) {
+                      switch (_b.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];
+                          _b.label = 1;
 
-              case 5:
-                _b.sent();
+                        case 1:
+                          _b.trys.push([1, 3,, 4]);
 
-                _b.label = 6;
+                          return [4
+                          /*yield*/
+                          , this.cleanUpInvalidSession(user)];
 
-              case 6:
-                clientMetadata = this._config.clientMetadata;
-                _a = session.getAccessToken().decodePayload().scope, scope = _a === void 0 ? '' : _a;
+                        case 2:
+                          _b.sent();
 
-                if (scope.split(' ').includes(USER_ADMIN_SCOPE)) {
-                  user.getUserData(function (err, data) {
-                    return __awaiter(_this, void 0, void 0, function () {
-                      var cleanUpError_5, 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 [3
+                          /*break*/
+                          , 4];
 
-                          case 1:
-                            _a.trys.push([1, 3,, 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*/
+                          ];
 
-                            return [4
-                            /*yield*/
-                            , this.cleanUpInvalidSession(user)];
+                        case 4:
+                          rej(err);
+                          return [2
+                          /*return*/
+                          ];
 
-                          case 2:
-                            _a.sent();
+                        case 5:
+                          bypassCache = params ? params.bypassCache : false;
+                          if (!bypassCache) return [3
+                          /*break*/
+                          , 7];
+                          return [4
+                          /*yield*/
+                          , this.Credentials.clear()];
 
-                            return [3
-                            /*break*/
-                            , 4];
+                        case 6:
+                          _b.sent();
 
-                          case 3:
-                            cleanUpError_5 = _a.sent();
-                            rej(new Error("Session is invalid due to: " + err.message + " and failed to clean up invalid session: " + cleanUpError_5.message));
-                            return [2
-                            /*return*/
-                            ];
+                          _b.label = 7;
 
-                          case 4:
-                            rej(err);
-                            return [3
-                            /*break*/
-                            , 6];
+                        case 7:
+                          clientMetadata = this._config.clientMetadata;
+                          _a = session.getAccessToken().decodePayload().scope, scope = _a === void 0 ? '' : _a;
 
-                          case 5:
-                            res(user);
-                            _a.label = 6;
+                          if (scope.split(' ').includes(USER_ADMIN_SCOPE)) {
+                            user.getUserData(function (err, data) {
+                              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;
 
-                          case 6:
-                            return [2
-                            /*return*/
-                            ];
+                                    case 1:
+                                      _a.trys.push([1, 3,, 4]);
 
-                          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);
-                            }
+                                      return [4
+                                      /*yield*/
+                                      , this.cleanUpInvalidSession(user)];
+
+                                    case 2:
+                                      _a.sent();
+
+                                      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*/
+                                      ];
+
+                                    case 4:
+                                      rej(err);
+                                      return [3
+                                      /*break*/
+                                      , 6];
+
+                                    case 5:
+                                      res(user);
+                                      _a.label = 6;
 
-                            attributes = this.attributesToObject(attributeList);
-                            Object.assign(user, {
-                              attributes: attributes,
-                              preferredMFA: preferredMFA
+                                    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);
+                                      }
+
+                                      attributes = this.attributesToObject(attributeList);
+                                      Object.assign(user, {
+                                        attributes: attributes,
+                                        preferredMFA: preferredMFA
+                                      });
+                                      return [2
+                                      /*return*/
+                                      , res(user)];
+                                  }
+                                });
+                              });
+                            }, {
+                              bypassCache: bypassCache,
+                              clientMetadata: clientMetadata
                             });
+                          } else {
+                            logger.debug("Unable to get the user data because the " + USER_ADMIN_SCOPE + " " + "is not in the scopes of the access token");
                             return [2
                             /*return*/
                             , res(user)];
-                        }
-                      });
+                          }
+
+                          return [2
+                          /*return*/
+                          ];
+                      }
                     });
-                  }, {
-                    bypassCache: bypassCache,
-                    clientMetadata: clientMetadata
                   });
-                } else {
-                  logger.debug("Unable to get the user data because the " + USER_ADMIN_SCOPE + " " + "is not in the scopes of the access token");
-                  return [2
-                  /*return*/
-                  , res(user)];
-                }
-
-                return [3
-                /*break*/
-                , 8];
-
-              case 7:
-                err_1 = _b.sent();
-                rej(err_1);
-                return [3
-                /*break*/
-                , 8];
-
-              case 8:
+                }, {
+                  clientMetadata: clientMetadata
+                });
                 return [2
                 /*return*/
                 ];
@@ -62677,13 +62707,15 @@ function () {
       });
     });
   };
+  /**
+   * Get the corresponding user session
+   * @param {Object} user - The CognitoUser object
+   * @return - A promise resolves to the session
+   */
 
-  AuthClass.prototype._userSession = function (_a) {
-    var _this = this;
 
-    var user = _a.user,
-        _b = _a.bypassCache,
-        bypassCache = _b === void 0 ? false : _b;
+  AuthClass.prototype.userSession = function (user) {
+    var _this = this;
 
     if (!user) {
       logger.debug('the user is null');
@@ -62692,138 +62724,64 @@ function () {
 
     var clientMetadata = this._config.clientMetadata; // TODO: verify behavior if this is override during signIn
 
-    return new Promise(function (resolve, rej) {
-      return __awaiter(_this, void 0, void 0, function () {
-        var debounceResolver;
-
-        var _this = this;
-
-        return __generator(this, function (_a) {
-          switch (_a.label) {
-            case 0:
-              // debugger;
-              logger.debug('Getting the session from this user:', user);
-              if (!this.inflightSession) return [3
-              /*break*/
-              , 2];
-              logger.debug('Waiting for another userSession call:');
-              return [4
-              /*yield*/
-              , this.inflightSessionPromise];
-
-            case 1:
-              _a.sent();
-
-              logger.debug('Debouncer resolved');
-              return [3
-              /*break*/
-              , 3];
-
-            case 2:
-              logger.debug('Debouncer head');
-              this.inflightSession = true;
-              this.inflightSessionPromise = new Promise(function (res) {
-                debounceResolver = function debounceResolver() {
-                  logger.debug('Debouncer resolving');
-                  _this.inflightSessionPromise = null;
-                  _this.inflightSession = false;
-                  res();
-                };
-              });
-              _a.label = 3;
-
-            case 3:
-              user.getSession(function (err, session) {
-                return __awaiter(_this, void 0, void 0, function () {
-                  var cleanUpError_6;
-                  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_6 = _a.sent();
-                        rej(new Error("Session is invalid due to: " + err.message + " and failed to clean up invalid session: " + cleanUpError_6.message));
-
-                        if (debounceResolver) {
-                          debounceResolver();
-                        }
+    return new Promise(function (res, rej) {
+      logger.debug('Getting the session from this user:', user);
+      user.getSession(function (err, session) {
+        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;
 
-                        return [2
-                        /*return*/
-                        ];
+              case 1:
+                _a.trys.push([1, 3,, 4]);
 
-                      case 4:
-                        rej(err);
+                return [4
+                /*yield*/
+                , this.cleanUpInvalidSession(user)];
 
-                        if (debounceResolver) {
-                          debounceResolver();
-                        }
+              case 2:
+                _a.sent();
 
-                        return [2
-                        /*return*/
-                        ];
+                return [3
+                /*break*/
+                , 4];
 
-                      case 5:
-                        logger.debug('Succeed to get the user session', session);
-                        resolve(session);
+              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*/
+                ];
 
-                        if (debounceResolver) {
-                          debounceResolver();
-                        }
+              case 4:
+                rej(err);
+                return [2
+                /*return*/
+                ];
 
-                        return [2
-                        /*return*/
-                        ];
-                    }
-                  });
-                });
-              }, {
-                clientMetadata: clientMetadata,
-                bypassCache: bypassCache
-              });
-              return [2
-              /*return*/
-              ];
-          }
+              case 5:
+                logger.debug('Succeed to get the user session', session);
+                res(session);
+                return [2
+                /*return*/
+                ];
+            }
+          });
         });
+      }, {
+        clientMetadata: clientMetadata
       });
     });
   };
-  /**
-   * Get the corresponding user session
-   * @param {Object} user - The CognitoUser object
-   * @return - A promise resolves to the session
-   */
-
-
-  AuthClass.prototype.userSession = function (user) {
-    return this._userSession({
-      user: user,
-      bypassCache: false
-    });
-  };
   /**
    * Get authenticated credentials of current user.
    * @return - A promise resolves to be current user's credentials
@@ -63012,7 +62970,7 @@ function () {
 
                 user.getSession(function (err, result) {
                   return __awaiter(_this, void 0, void 0, function () {
-                    var cleanUpError_7;
+                    var cleanUpError_8;
 
                     var _this = this;
 
@@ -63043,8 +63001,8 @@ function () {
                           , 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));
+                          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*/
                           ];
@@ -63096,7 +63054,7 @@ function () {
   };
 
   AuthClass.prototype.oAuthSignOutRedirect = function (resolve, reject) {
-    var isBrowser = _aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["JS"].browserOrNode().isBrowser;
+    var isBrowser = Object(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["browserOrNode"])().isBrowser;
 
     if (isBrowser) {
       this.oAuthSignOutRedirectOrReject(reject);
@@ -63348,7 +63306,7 @@ function () {
 
   AuthClass.prototype.currentUserInfo = function () {
     return __awaiter(this, void 0, void 0, function () {
-      var source, user, attributes, userAttrs, credentials, e_12, info, err_2, user;
+      var source, user, attributes, userAttrs, credentials, e_12, info, err_1, user;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -63417,8 +63375,8 @@ function () {
             , info];
 
           case 8:
-            err_2 = _a.sent();
-            logger.error('currentUserInfo error', err_2);
+            err_1 = _a.sent();
+            logger.error('currentUserInfo error', err_1);
             return [2
             /*return*/
             , {}];
@@ -63528,7 +63486,7 @@ function () {
 
   AuthClass.prototype._handleAuthResponse = function (URL) {
     return __awaiter(this, void 0, void 0, function () {
-      var currentUrl, hasCodeOrError, hasTokenOrError, _a, accessToken, idToken, refreshToken, state, session, credentials, isCustomStateIncluded, currentUser, customState, err_3;
+      var currentUrl, hasCodeOrError, hasTokenOrError, _a, accessToken, idToken, refreshToken, state, session, credentials, isCustomStateIncluded, currentUser, customState, err_2;
 
       return __generator(this, function (_b) {
         switch (_b.label) {
@@ -63554,7 +63512,7 @@ function () {
             dispatchAuthEvent('parsingCallbackUrl', {
               url: URL
             }, "The callback url is being parsed");
-            currentUrl = URL || (_aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["JS"].browserOrNode().isBrowser ? window.location.href : '');
+            currentUrl = URL || (Object(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["browserOrNode"])().isBrowser ? window.location.href : '');
             hasCodeOrError = !!(Object(url__WEBPACK_IMPORTED_MODULE_3__["parse"])(currentUrl).query || '').split('&').map(function (entry) {
               return entry.split('=');
             }).find(function (_a) {
@@ -63636,17 +63594,17 @@ function () {
             , credentials];
 
           case 6:
-            err_3 = _b.sent();
-            logger.debug('Error in cognito hosted auth response', err_3); // Just like a successful handling of `?code`, replace the window history to "dispose" of the `code`.
+            err_2 = _b.sent();
+            logger.debug('Error in cognito hosted auth response', err_2); // Just like a successful handling of `?code`, replace the window history to "dispose" of the `code`.
             // Otherwise, reloading the page will throw errors as the `code` has already been spent.
 
             if (window && typeof window.history !== 'undefined') {
               window.history.replaceState({}, null, this._config.oauth.redirectSignIn);
             }
 
-            dispatchAuthEvent('signIn_failure', err_3, "The OAuth response flow failed");
-            dispatchAuthEvent('cognitoHostedUI_failure', err_3, "A failure occurred when returning to the Cognito Hosted UI");
-            dispatchAuthEvent('customState_failure', err_3, "A failure occurred when returning state");
+            dispatchAuthEvent('signIn_failure', err_2, "The OAuth response flow failed");
+            dispatchAuthEvent('cognitoHostedUI_failure', err_2, "A failure occurred when returning to the Cognito Hosted UI");
+            dispatchAuthEvent('customState_failure', err_2, "A failure occurred when returning state");
             return [3
             /*break*/
             , 7];
@@ -65007,12 +64965,12 @@ __webpack_require__.r(__webpack_exports__);
  */
 
 /* harmony default export */ __webpack_exports__["default"] = (function (callback) {
-  if (_aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["JS"].browserOrNode().isBrowser && window.location) {
+  if (Object(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["browserOrNode"])().isBrowser && window.location) {
     var url = window.location.href;
     callback({
       url: url
     });
-  } else if (_aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["JS"].browserOrNode().isNode) {
+  } else if (Object(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["browserOrNode"])().isNode) {
     // continue building on ssr
     (function () {}); // noop
 
@@ -94306,6 +94264,32 @@ function () {
                                                   _a = subscriptionError.error, _b = __read((_a === void 0 ? {
                                                     errors: []
                                                   } : _a).errors, 1), _c = _b[0], _d = (_c === void 0 ? {} : _c).message, message = _d === void 0 ? '' : _d;
+
+                                                  if (message.includes(_aws_amplify_pubsub__WEBPACK_IMPORTED_MODULE_4__["CONTROL_MSG"].REALTIME_SUBSCRIPTION_INIT_ERROR) || message.includes(_aws_amplify_pubsub__WEBPACK_IMPORTED_MODULE_4__["CONTROL_MSG"].CONNECTION_FAILED)) {
+                                                    // Unsubscribe and clear subscription array for model/operation
+                                                    subscriptions[modelDefinition.name][transformerMutationType].forEach(function (subscription) {
+                                                      return subscription.unsubscribe();
+                                                    });
+                                                    subscriptions[modelDefinition.name][transformerMutationType] = [];
+                                                    operationAuthModeAttempts[operation]++;
+
+                                                    if (operationAuthModeAttempts[operation] >= readAuthModes.length) {
+                                                      // last auth mode retry. Continue with error
+                                                      logger.debug(operation + " subscription failed with authMode: " + 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]]);
+
+                                                      _authModeRetry(operation);
+
+                                                      return [2
+                                                      /*return*/
+                                                      ];
+                                                    }
+                                                  }
+
+                                                  logger.warn('subscriptionError', message);
                                                   _e.label = 1;
 
                                                 case 1:
@@ -94334,39 +94318,12 @@ function () {
 
                                                 case 3:
                                                   e_1 = _e.sent();
-                                                  logger.error('Sync error handler failed with:', e_1);
+                                                  logger.error('Subscription error handler failed with:', e_1);
                                                   return [3
                                                   /*break*/
                                                   , 4];
 
                                                 case 4:
-                                                  if (message.includes(_aws_amplify_pubsub__WEBPACK_IMPORTED_MODULE_4__["CONTROL_MSG"].REALTIME_SUBSCRIPTION_INIT_ERROR) || message.includes(_aws_amplify_pubsub__WEBPACK_IMPORTED_MODULE_4__["CONTROL_MSG"].CONNECTION_FAILED)) {
-                                                    // Unsubscribe and clear subscription array for model/operation
-                                                    subscriptions[modelDefinition.name][transformerMutationType].forEach(function (subscription) {
-                                                      return subscription.unsubscribe();
-                                                    });
-                                                    subscriptions[modelDefinition.name][transformerMutationType] = [];
-                                                    operationAuthModeAttempts[operation]++;
-
-                                                    if (operationAuthModeAttempts[operation] >= readAuthModes.length) {
-                                                      logger.debug(operation + " subscription failed with authMode: " + readAuthModes[operationAuthModeAttempts[operation] - 1]);
-                                                      logger.warn('subscriptionError', message);
-                                                      return [2
-                                                      /*return*/
-                                                      ];
-                                                    } else {
-                                                      logger.debug(operation + " subscription failed with authMode: " + readAuthModes[operationAuthModeAttempts[operation] - 1] + ". Retrying with authMode: " + readAuthModes[operationAuthModeAttempts[operation]]);
-
-                                                      _authModeRetry(operation);
-
-                                                      return [2
-                                                      /*return*/
-                                                      ];
-                                                    }
-                                                  }
-
-                                                  logger.warn('subscriptionError', message);
-
                                                   if (typeof subscriptionReadyCallback === 'function') {
                                                     subscriptionReadyCallback();
                                                   }