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

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.12.2](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/datastore@3.12.1...@aws-amplify/datastore@3.12.2) (2022-07-07)
+
+
+### Bug Fixes
+
+* decrease error handler verbosity on self recovering errors ([#10030](https://github.com/aws-amplify/amplify-js/issues/10030)) ([fb1f02c](https://github.com/aws-amplify/amplify-js/commit/fb1f02cfa914b81fe0411e8f4d654c69aed22385))
+
+
+
+
+
 ## [3.12.1](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/datastore@3.12.0...@aws-amplify/datastore@3.12.1) (2022-06-18)
 
 

package/dist/aws-amplify-datastore.js

@@ -60726,7 +60726,6 @@ function () {
     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) {
@@ -62679,60 +62678,39 @@ function () {
   };
 
   AuthClass.prototype._userSession = function (_a) {
-    var _this = this;
-
     var user = _a.user,
         _b = _a.bypassCache,
         bypassCache = _b === void 0 ? false : _b;
+    return __awaiter(this, void 0, void 0, function () {
+      var clientMetadata;
 
-    if (!user) {
-      logger.debug('the user is null');
-      return this.rejectAuthError(_types_Auth__WEBPACK_IMPORTED_MODULE_7__["AuthErrorTypes"].NoUserSession);
-    }
-
-    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];
+      var _this = this;
 
-            case 1:
-              _a.sent();
+      return __generator(this, function (_c) {
+        switch (_c.label) {
+          case 0:
+            if (!user) {
+              logger.debug('the user is null');
+              return [2
+              /*return*/
+              , this.rejectAuthError(_types_Auth__WEBPACK_IMPORTED_MODULE_7__["AuthErrorTypes"].NoUserSession)];
+            }
 
-              logger.debug('Debouncer resolved');
-              return [3
-              /*break*/
-              , 3];
+            clientMetadata = this._config.clientMetadata;
+            if (!this.inflightSessionPromise) return [3
+            /*break*/
+            , 2];
+            return [4
+            /*yield*/
+            , this.inflightSessionPromise];
 
-            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 1:
+            return [2
+            /*return*/
+            , _c.sent()];
 
-            case 3:
+          case 2:
+            this.inflightSessionPromise = new Promise(function (resolve, rej) {
               user.getSession(function (err, session) {
                 return __awaiter(_this, void 0, void 0, function () {
                   var cleanUpError_6;
@@ -62765,22 +62743,12 @@ function () {
                       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*/
                         ];
@@ -62788,11 +62756,6 @@ function () {
                       case 5:
                         logger.debug('Succeed to get the user session', session);
                         resolve(session);
-
-                        if (debounceResolver) {
-                          debounceResolver();
-                        }
-
                         return [2
                         /*return*/
                         ];
@@ -62803,11 +62766,17 @@ function () {
                 clientMetadata: clientMetadata,
                 bypassCache: bypassCache
               });
-              return [2
-              /*return*/
-              ];
-          }
-        });
+            }).then(function (session) {
+              _this.inflightSessionPromise = null;
+              return session;
+            })["catch"](function (err) {
+              _this.inflightSessionPromise = null;
+              throw err;
+            });
+            return [2
+            /*return*/
+            , this.inflightSessionPromise];
+        }
       });
     });
   };
@@ -63096,7 +63065,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);
@@ -63554,7 +63523,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) {
@@ -65007,12 +64976,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
 
@@ -71287,7 +71256,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.8';
+var version = '4.5.9';
 
 /***/ }),
 
@@ -94306,6 +94275,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 +94329,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();
                                                   }