@aws-amplify/datastore 3.12.1 → 3.12.2-auto-sign-in.10

package/dist/aws-amplify-datastore.js

@@ -60708,6 +60708,7 @@ var dispatchAuthEvent = function dispatchAuthEvent(event, data, message) {
 
 
 var MAX_DEVICES = 60;
+var MAX_AUTOSIGNIN_POLLING_MS = 3 * 60 * 1000;
 /**
  * Provide authentication steps
  */
@@ -60725,6 +60726,7 @@ function () {
     this.userPool = null;
     this.user = null;
     this.oAuthFlowInProgress = false;
+    this.autoSignInInitiated = false;
     this.Credentials = _aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["Credentials"];
 
     this.wrapRefreshSessionCallback = function (callback) {
@@ -60870,6 +60872,17 @@ function () {
     }
 
     dispatchAuthEvent('configured', null, "The Auth category has been configured successfully");
+
+    if (!this.autoSignInInitiated && typeof this._storage['getItem'] === 'function') {
+      var pollingInitiated = this.isTrueStorageValue('amplify-polling-started');
+
+      if (pollingInitiated) {
+        dispatchAuthEvent('autoSignIn_failure', null, _types_Auth__WEBPACK_IMPORTED_MODULE_7__["AuthErrorTypes"].AutoSignInError);
+      }
+
+      this._storage.removeItem('amplify-polling-started');
+    }
+
     return this._config;
   };
   /**
@@ -60889,6 +60902,8 @@ function () {
       restOfAttrs[_i - 1] = arguments[_i];
     }
 
+    var _a, _b, _c;
+
     if (!this.userPool) {
       return this.rejectNoUserPool();
     }
@@ -60898,6 +60913,11 @@ function () {
     var attributes = [];
     var validationData = null;
     var clientMetadata;
+    var autoSignIn = {
+      enabled: false
+    };
+    var autoSignInValidationData = {};
+    var autoSignInClientMetaData = {};
 
     if (params && typeof params === 'string') {
       username = params;
@@ -60944,6 +60964,17 @@ function () {
           }));
         });
       }
+
+      autoSignIn = (_a = params.autoSignIn) !== null && _a !== void 0 ? _a : {
+        enabled: false
+      };
+
+      if (autoSignIn.enabled) {
+        this._storage.setItem('amplify-auto-sign-in', true);
+
+        autoSignInValidationData = (_b = autoSignIn.validationData) !== null && _b !== void 0 ? _b : {};
+        autoSignInClientMetaData = (_c = autoSignIn.clientMetaData) !== null && _c !== void 0 ? _c : {};
+      }
     } else {
       return this.rejectAuthError(_types_Auth__WEBPACK_IMPORTED_MODULE_7__["AuthErrorTypes"].SignUpError);
     }
@@ -60965,11 +60996,122 @@ function () {
           reject(err);
         } else {
           dispatchAuthEvent('signUp', data, username + " has signed up successfully");
+
+          if (autoSignIn.enabled) {
+            _this.handleAutoSignIn(username, password, autoSignInValidationData, autoSignInClientMetaData, data);
+          }
+
           resolve(data);
         }
       }, clientMetadata);
     });
   };
+
+  AuthClass.prototype.handleAutoSignIn = function (username, password, validationData, clientMetadata, data) {
+    this.autoSignInInitiated = true;
+    var authDetails = new amazon_cognito_identity_js__WEBPACK_IMPORTED_MODULE_2__["AuthenticationDetails"]({
+      Username: username,
+      Password: password,
+      ValidationData: validationData,
+      ClientMetadata: clientMetadata
+    });
+
+    if (data.userConfirmed) {
+      this.signInAfterUserConfirmed(authDetails);
+    } else if (this._config.signUpVerificationMethod === 'link') {
+      this.handleLinkAutoSignIn(authDetails);
+    } else {
+      this.handleCodeAutoSignIn(authDetails);
+    }
+  };
+
+  AuthClass.prototype.handleCodeAutoSignIn = function (authDetails) {
+    var _this = this;
+
+    var listenEvent = function listenEvent(_a) {
+      var payload = _a.payload;
+
+      if (payload.event === 'confirmSignUp') {
+        _this.signInAfterUserConfirmed(authDetails, listenEvent);
+      }
+    };
+
+    _aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["Hub"].listen('auth', listenEvent);
+  };
+
+  AuthClass.prototype.handleLinkAutoSignIn = function (authDetails) {
+    var _this = this;
+
+    this._storage.setItem('amplify-polling-started', true);
+
+    var start = Date.now();
+    var autoSignInPollingIntervalId = setInterval(function () {
+      if (Date.now() - start > MAX_AUTOSIGNIN_POLLING_MS) {
+        clearInterval(autoSignInPollingIntervalId);
+        dispatchAuthEvent('autoSignIn_failure', null, 'Please confirm your account and use your credentials to sign in.');
+      } else {
+        _this.signInAfterUserConfirmed(authDetails, null, autoSignInPollingIntervalId);
+      }
+    }, 5000);
+  };
+
+  AuthClass.prototype.signInAfterUserConfirmed = function (authDetails, listenEvent, autoSignInPollingIntervalId) {
+    return __awaiter(this, void 0, void 0, function () {
+      var user, error_1;
+
+      var _this = this;
+
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            user = this.createCognitoUser(authDetails.getUsername());
+            _a.label = 1;
+
+          case 1:
+            _a.trys.push([1, 3,, 4]);
+
+            return [4
+            /*yield*/
+            , user.authenticateUser(authDetails, this.authCallbacks(user, function (value) {
+              dispatchAuthEvent('autoSignIn', value, authDetails.getUsername() + " has signed in successfully");
+
+              if (listenEvent) {
+                _aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["Hub"].remove('auth', listenEvent);
+              }
+
+              if (autoSignInPollingIntervalId) {
+                clearInterval(autoSignInPollingIntervalId);
+
+                _this._storage.removeItem('amplify-polling-started');
+              }
+
+              _this._storage.removeItem('amplify-auto-sign-in');
+            }, function (error) {
+              logger.error(error);
+            }))];
+
+          case 2:
+            _a.sent();
+
+            return [3
+            /*break*/
+            , 4];
+
+          case 3:
+            error_1 = _a.sent();
+            logger.error(error_1);
+            return [3
+            /*break*/
+            , 4];
+
+          case 4:
+            return [2
+            /*return*/
+            ];
+        }
+      });
+    });
+  };
   /**
    * Send the verification code to confirm sign up
    * @param {String} username - The username to be confirmed
@@ -60980,6 +61122,8 @@ function () {
 
 
   AuthClass.prototype.confirmSignUp = function (username, code, options) {
+    var _this = this;
+
     if (!this.userPool) {
       return this.rejectNoUserPool();
     }
@@ -61007,11 +61151,25 @@ function () {
         if (err) {
           reject(err);
         } else {
+          dispatchAuthEvent('confirmSignUp', data, username + " has been confirmed successfully");
+
+          var autoSignIn = _this.isTrueStorageValue('amplify-auto-sign-in');
+
+          if (autoSignIn && !_this.autoSignInInitiated) {
+            dispatchAuthEvent('autoSignIn_failure', null, _types_Auth__WEBPACK_IMPORTED_MODULE_7__["AuthErrorTypes"].AutoSignInError);
+          }
+
           resolve(data);
         }
       }, clientMetadata);
     });
   };
+
+  AuthClass.prototype.isTrueStorageValue = function (value) {
+    var item = this._storage.getItem(value);
+
+    return item ? item === 'true' : false;
+  };
   /**
    * Resend the verification code
    * @param {String} username - The username to be confirmed
@@ -63054,7 +63212,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);
@@ -63512,7 +63670,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) {
@@ -63709,7 +63867,7 @@ function () {
 
   AuthClass.prototype.rememberDevice = function () {
     return __awaiter(this, void 0, void 0, function () {
-      var currUser, error_1;
+      var currUser, error_2;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -63726,8 +63884,8 @@ function () {
             , 3];
 
           case 2:
-            error_1 = _a.sent();
-            logger.debug('The user is not authenticated by the error', error_1);
+            error_2 = _a.sent();
+            logger.debug('The user is not authenticated by the error', error_2);
             return [2
             /*return*/
             , Promise.reject('The user is not authenticated')];
@@ -63759,7 +63917,7 @@ function () {
 
   AuthClass.prototype.forgetDevice = function () {
     return __awaiter(this, void 0, void 0, function () {
-      var currUser, error_2;
+      var currUser, error_3;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -63776,8 +63934,8 @@ function () {
             , 3];
 
           case 2:
-            error_2 = _a.sent();
-            logger.debug('The user is not authenticated by the error', error_2);
+            error_3 = _a.sent();
+            logger.debug('The user is not authenticated by the error', error_3);
             return [2
             /*return*/
             , Promise.reject('The user is not authenticated')];
@@ -63809,7 +63967,7 @@ function () {
 
   AuthClass.prototype.fetchDevices = function () {
     return __awaiter(this, void 0, void 0, function () {
-      var currUser, error_3;
+      var currUser, error_4;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -63826,8 +63984,8 @@ function () {
             , 3];
 
           case 2:
-            error_3 = _a.sent();
-            logger.debug('The user is not authenticated by the error', error_3);
+            error_4 = _a.sent();
+            logger.debug('The user is not authenticated by the error', error_4);
             throw new Error('The user is not authenticated');
 
           case 3:
@@ -64023,6 +64181,9 @@ var authErrorMessages = {
   networkError: {
     message: _common_AuthErrorStrings__WEBPACK_IMPORTED_MODULE_1__["AuthErrorStrings"].NETWORK_ERROR
   },
+  autoSignInError: {
+    message: _common_AuthErrorStrings__WEBPACK_IMPORTED_MODULE_1__["AuthErrorStrings"].AUTOSIGNIN_ERROR
+  },
   "default": {
     message: _common_AuthErrorStrings__WEBPACK_IMPORTED_MODULE_1__["AuthErrorStrings"].DEFAULT_MSG
   }
@@ -64749,6 +64910,7 @@ var AuthErrorStrings;
   AuthErrorStrings["NO_USER_SESSION"] = "Failed to get the session because the user is empty";
   AuthErrorStrings["NETWORK_ERROR"] = "Network Error";
   AuthErrorStrings["DEVICE_CONFIG"] = "Device tracking has not been configured in this User Pool";
+  AuthErrorStrings["AUTOSIGNIN_ERROR"] = "Please use your credentials to sign in";
 })(AuthErrorStrings || (AuthErrorStrings = {}));
 
 /***/ }),
@@ -64882,6 +65044,7 @@ var AuthErrorTypes;
   AuthErrorTypes["Default"] = "default";
   AuthErrorTypes["DeviceConfig"] = "deviceConfig";
   AuthErrorTypes["NetworkError"] = "networkError";
+  AuthErrorTypes["AutoSignInError"] = "autoSignInError";
 })(AuthErrorTypes || (AuthErrorTypes = {}));
 
 function isUsernamePasswordOpts(obj) {
@@ -64965,12 +65128,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
 
@@ -71107,7 +71270,8 @@ var parseMobileHubConfig = function parseMobileHubConfig(config) {
       region: config['aws_cognito_region'],
       identityPoolId: config['aws_cognito_identity_pool_id'],
       identityPoolRegion: config['aws_cognito_region'],
-      mandatorySignIn: config['aws_mandatory_sign_in'] === 'enable'
+      mandatorySignIn: config['aws_mandatory_sign_in'] === 'enable',
+      signUpVerificationMethod: config['aws_cognito_sign_up_verification_method'] || 'code'
     };
   } // Storage
 
@@ -71245,7 +71409,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';
 
 /***/ }),
 
@@ -94264,6 +94428,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:
@@ -94292,39 +94482,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();
                                                   }