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

package/dist/aws-amplify-datastore.js

@@ -60725,6 +60725,8 @@ 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) {
@@ -62352,12 +62354,12 @@ function () {
     return new Promise(function (res, rej) {
       _this._storageSync.then(function () {
         return __awaiter(_this, void 0, void 0, function () {
-          var user, clientMetadata;
+          var user, session, bypassCache, clientMetadata, _a, scope, err_1;
 
           var _this = this;
 
-          return __generator(this, function (_a) {
-            switch (_a.label) {
+          return __generator(this, function (_b) {
+            switch (_b.label) {
               case 0:
                 if (!this.isOAuthInProgress()) return [3
                 /*break*/
@@ -62387,9 +62389,9 @@ function () {
                 })];
 
               case 1:
-                _a.sent();
+                _b.sent();
 
-                _a.label = 2;
+                _b.label = 2;
 
               case 2:
                 user = this.userPool.getCurrentUser();
@@ -62402,167 +62404,135 @@ function () {
                   ];
                 }
 
-                clientMetadata = this._config.clientMetadata; // refresh the session if the session expired.
-
-                user.getSession(function (err, session) {
-                  return __awaiter(_this, void 0, void 0, function () {
-                    var cleanUpError_5, bypassCache, clientMetadata, _a, scope;
-
-                    var _this = this;
-
-                    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 1:
-                          _b.trys.push([1, 3,, 4]);
-
-                          return [4
-                          /*yield*/
-                          , this.cleanUpInvalidSession(user)];
-
-                        case 2:
-                          _b.sent();
-
-                          return [3
-                          /*break*/
-                          , 4];
+                _b.label = 3;
 
-                        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 3:
+                _b.trys.push([3, 7,, 8]);
 
-                        case 4:
-                          rej(err);
-                          return [2
-                          /*return*/
-                          ];
+                return [4
+                /*yield*/
+                , this._userSession({
+                  user: user
+                })];
 
-                        case 5:
-                          bypassCache = params ? params.bypassCache : false;
-                          if (!bypassCache) return [3
-                          /*break*/
-                          , 7];
-                          return [4
-                          /*yield*/
-                          , this.Credentials.clear()];
+              case 4:
+                session = _b.sent();
+                bypassCache = params ? params.bypassCache : false;
+                if (!bypassCache) return [3
+                /*break*/
+                , 6];
+                return [4
+                /*yield*/
+                , this.Credentials.clear()];
 
-                        case 6:
-                          _b.sent();
+              case 5:
+                _b.sent();
 
-                          _b.label = 7;
+                _b.label = 6;
 
-                        case 7:
-                          clientMetadata = this._config.clientMetadata;
-                          _a = session.getAccessToken().decodePayload().scope, scope = _a === void 0 ? '' : _a;
+              case 6:
+                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) {
-                              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;
+                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;
 
-                                    case 1:
-                                      _a.trys.push([1, 3,, 4]);
+                          case 1:
+                            _a.trys.push([1, 3,, 4]);
 
-                                      return [4
-                                      /*yield*/
-                                      , this.cleanUpInvalidSession(user)];
+                            return [4
+                            /*yield*/
+                            , this.cleanUpInvalidSession(user)];
 
-                                    case 2:
-                                      _a.sent();
+                          case 2:
+                            _a.sent();
 
-                                      return [3
-                                      /*break*/
-                                      , 4];
+                            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 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*/
+                            ];
 
-                                    case 4:
-                                      rej(err);
-                                      return [3
-                                      /*break*/
-                                      , 6];
+                          case 4:
+                            rej(err);
+                            return [3
+                            /*break*/
+                            , 6];
 
-                                    case 5:
-                                      res(user);
-                                      _a.label = 6;
+                          case 5:
+                            res(user);
+                            _a.label = 6;
 
-                                    case 6:
-                                      return [2
-                                      /*return*/
-                                      ];
+                          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);
-                                      }
+                          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
+                            attributes = this.attributesToObject(attributeList);
+                            Object.assign(user, {
+                              attributes: attributes,
+                              preferredMFA: preferredMFA
                             });
-                          } 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
                   });
-                }, {
-                  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:
                 return [2
                 /*return*/
                 ];
@@ -62707,16 +62677,14 @@ function () {
       });
     });
   };
-  /**
-   * Get the corresponding user session
-   * @param {Object} user - The CognitoUser object
-   * @return - A promise resolves to the session
-   */
 
-
-  AuthClass.prototype.userSession = function (user) {
+  AuthClass.prototype._userSession = function (_a) {
     var _this = this;
 
+    var user = _a.user,
+        _b = _a.bypassCache,
+        bypassCache = _b === void 0 ? false : _b;
+
     if (!user) {
       logger.debug('the user is null');
       return this.rejectAuthError(_types_Auth__WEBPACK_IMPORTED_MODULE_7__["AuthErrorTypes"].NoUserSession);
@@ -62724,64 +62692,138 @@ function () {
 
     var clientMetadata = this._config.clientMetadata; // TODO: verify behavior if this is override during signIn
 
-    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 new Promise(function (resolve, rej) {
+      return __awaiter(_this, void 0, void 0, function () {
+        var debounceResolver;
 
-              case 1:
-                _a.trys.push([1, 3,, 4]);
+        var _this = this;
 
-                return [4
-                /*yield*/
-                , this.cleanUpInvalidSession(user)];
+        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 2:
-                _a.sent();
+            case 1:
+              _a.sent();
 
-                return [3
-                /*break*/
-                , 4];
+              logger.debug('Debouncer resolved');
+              return [3
+              /*break*/
+              , 3];
 
-              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 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 4:
-                rej(err);
-                return [2
-                /*return*/
-                ];
+            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 5:
-                logger.debug('Succeed to get the user session', session);
-                res(session);
-                return [2
-                /*return*/
-                ];
-            }
-          });
+                      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 [2
+                        /*return*/
+                        ];
+
+                      case 4:
+                        rej(err);
+
+                        if (debounceResolver) {
+                          debounceResolver();
+                        }
+
+                        return [2
+                        /*return*/
+                        ];
+
+                      case 5:
+                        logger.debug('Succeed to get the user session', session);
+                        resolve(session);
+
+                        if (debounceResolver) {
+                          debounceResolver();
+                        }
+
+                        return [2
+                        /*return*/
+                        ];
+                    }
+                  });
+                });
+              }, {
+                clientMetadata: clientMetadata,
+                bypassCache: bypassCache
+              });
+              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
@@ -62970,7 +63012,7 @@ function () {
 
                 user.getSession(function (err, result) {
                   return __awaiter(_this, void 0, void 0, function () {
-                    var cleanUpError_8;
+                    var cleanUpError_7;
 
                     var _this = this;
 
@@ -63001,8 +63043,8 @@ function () {
                           , 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));
+                          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*/
                           ];
@@ -63306,7 +63348,7 @@ function () {
 
   AuthClass.prototype.currentUserInfo = function () {
     return __awaiter(this, void 0, void 0, function () {
-      var source, user, attributes, userAttrs, credentials, e_12, info, err_1, user;
+      var source, user, attributes, userAttrs, credentials, e_12, info, err_2, user;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -63375,8 +63417,8 @@ function () {
             , info];
 
           case 8:
-            err_1 = _a.sent();
-            logger.error('currentUserInfo error', err_1);
+            err_2 = _a.sent();
+            logger.error('currentUserInfo error', err_2);
             return [2
             /*return*/
             , {}];
@@ -63486,7 +63528,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_2;
+      var currentUrl, hasCodeOrError, hasTokenOrError, _a, accessToken, idToken, refreshToken, state, session, credentials, isCustomStateIncluded, currentUser, customState, err_3;
 
       return __generator(this, function (_b) {
         switch (_b.label) {
@@ -63594,17 +63636,17 @@ function () {
             , credentials];
 
           case 6:
-            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`.
+            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`.
             // 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_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");
+            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");
             return [3
             /*break*/
             , 7];
@@ -71245,7 +71287,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.5.7';
+var version = '4.5.8';
 
 /***/ }),