@aws-amplify/datastore 3.7.4-custom-pk.94 → 3.7.4-custom-pk.98

package/dist/aws-amplify-datastore.js

@@ -60712,6 +60712,7 @@ var dispatchAuthEvent = function dispatchAuthEvent(event, data, message) {
 
 
 var MAX_DEVICES = 60;
+var MAX_AUTOSIGNIN_POLLING_MS = 3 * 60 * 1000;
 /**
  * Provide authentication steps
  */
@@ -60729,6 +60730,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) {
@@ -60874,6 +60876,19 @@ 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-auto-sign-in');
+      }
+
+      this._storage.removeItem('amplify-polling-started');
+    }
+
     return this._config;
   };
   /**
@@ -60893,6 +60908,8 @@ function () {
       restOfAttrs[_i - 1] = arguments[_i];
     }
 
+    var _a, _b, _c;
+
     if (!this.userPool) {
       return this.rejectNoUserPool();
     }
@@ -60902,6 +60919,11 @@ function () {
     var attributes = [];
     var validationData = null;
     var clientMetadata;
+    var autoSignIn = {
+      enabled: false
+    };
+    var autoSignInValidationData = {};
+    var autoSignInClientMetaData = {};
 
     if (params && typeof params === 'string') {
       username = params;
@@ -60948,6 +60970,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);
     }
@@ -60969,11 +61002,126 @@ 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.');
+
+        _this._storage.removeItem('amplify-auto-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);
+
+              _this._storage.removeItem('amplify-auto-sign-in');
+            }))];
+
+          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
@@ -60984,6 +61132,8 @@ function () {
 
 
   AuthClass.prototype.confirmSignUp = function (username, code, options) {
+    var _this = this;
+
     if (!this.userPool) {
       return this.rejectNoUserPool();
     }
@@ -61011,11 +61161,27 @@ 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);
+
+            _this._storage.removeItem('amplify-auto-sign-in');
+          }
+
           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
@@ -62691,7 +62857,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 this.rejectNoUserPool();
+      return Promise.reject(new Error('No User Pool in the configuration.'));
     }
 
     return new Promise(function (res, rej) {
@@ -63713,7 +63879,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:
@@ -63730,8 +63896,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')];
@@ -63763,7 +63929,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:
@@ -63780,8 +63946,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')];
@@ -63813,7 +63979,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:
@@ -63830,8 +63996,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:
@@ -64027,6 +64193,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
   }
@@ -64753,6 +64922,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 = {}));
 
 /***/ }),
@@ -64886,6 +65056,7 @@ var AuthErrorTypes;
   AuthErrorTypes["Default"] = "default";
   AuthErrorTypes["DeviceConfig"] = "deviceConfig";
   AuthErrorTypes["NetworkError"] = "networkError";
+  AuthErrorTypes["AutoSignInError"] = "autoSignInError";
 })(AuthErrorTypes || (AuthErrorTypes = {}));
 
 function isUsernamePasswordOpts(obj) {
@@ -71111,7 +71282,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
 
@@ -71249,7 +71421,7 @@ var getAmplifyUserAgent = function getAmplifyUserAgent(content) {
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "version", function() { return version; });
 // generated by genversion
-var version = '4.5.10';
+var version = '4.7.2';
 
 /***/ }),
 
@@ -72915,7 +73087,12 @@ function () {
       service_info = null;
     }
 
-    request.headers = request.headers || {}; // datetime string and date string
+    request.headers = request.headers || {};
+
+    if (request.body && !request.data) {
+      throw new Error('The attribute "body" was found on the request object. Please use the attribute "data" instead.');
+    } // datetime string and date string
+
 
     var dt = _Util__WEBPACK_IMPORTED_MODULE_4__["DateUtils"].getDateWithClockOffset(),
         dt_str = dt.toISOString().replace(/[:\-]|\.\d{3}/g, ''),
@@ -83037,17 +83214,17 @@ function () {
 
     this["delete"] = function (modelOrConstructor, identifierOrCriteria) {
       return __awaiter(_this, void 0, void 0, function () {
-        var condition, msg, modelConstructor, msg, modelDefinition, _a, keyField, msg, _b, deleted, model, modelConstructor, msg, modelDefinition, pkPredicate, msg, _c, _d, deleted;
+        var condition, msg, modelConstructor, msg, modelDefinition, keyFields, msg, msg, _a, deleted, model, modelConstructor, msg, modelDefinition, pkPredicate, msg, _b, _c, deleted;
 
-        return __generator(this, function (_e) {
-          switch (_e.label) {
+        return __generator(this, function (_d) {
+          switch (_d.label) {
             case 0:
               return [4
               /*yield*/
               , this.start()];
 
             case 1:
-              _e.sent();
+              _d.sent();
 
               if (!modelOrConstructor) {
                 msg = 'Model or Model Constructor required';
@@ -83073,8 +83250,17 @@ function () {
               modelDefinition = getModelDefinition(modelConstructor);
 
               if (typeof identifierOrCriteria === 'string') {
-                _a = __read(Object(_util__WEBPACK_IMPORTED_MODULE_12__["extractPrimaryKeyFieldNames"])(modelDefinition), 1), keyField = _a[0];
-                condition = _predicates__WEBPACK_IMPORTED_MODULE_8__["ModelPredicateCreator"].createForSingleField(getModelDefinition(modelConstructor), keyField, identifierOrCriteria);
+                keyFields = Object(_util__WEBPACK_IMPORTED_MODULE_12__["extractPrimaryKeyFieldNames"])(modelDefinition);
+
+                if (keyFields.length > 1) {
+                  msg = _util__WEBPACK_IMPORTED_MODULE_12__["errorMessages"].deleteByPkWithCompositeKeyPresent;
+                  logger.error(msg, {
+                    keyFields: keyFields
+                  });
+                  throw new Error(msg);
+                }
+
+                condition = _predicates__WEBPACK_IMPORTED_MODULE_8__["ModelPredicateCreator"].createForSingleField(getModelDefinition(modelConstructor), keyFields[0], identifierOrCriteria);
               } else {
                 if (Object(_types__WEBPACK_IMPORTED_MODULE_11__["isIdentifierObject"])(identifierOrCriteria, modelDefinition)) {
                   condition = _predicates__WEBPACK_IMPORTED_MODULE_8__["ModelPredicateCreator"].createForPk(modelDefinition, identifierOrCriteria);
@@ -83101,7 +83287,7 @@ function () {
               , this.storage["delete"](modelConstructor, condition)];
 
             case 2:
-              _b = __read.apply(void 0, [_e.sent(), 1]), deleted = _b[0];
+              _a = __read.apply(void 0, [_d.sent(), 1]), deleted = _a[0];
               return [2
               /*return*/
               , deleted];
@@ -83140,7 +83326,7 @@ function () {
               , this.storage["delete"](model, condition)];
 
             case 4:
-              _c = __read.apply(void 0, [_e.sent(), 1]), _d = __read(_c[0], 1), deleted = _d[0];
+              _b = __read.apply(void 0, [_d.sent(), 1]), _c = __read(_b[0], 1), deleted = _c[0];
               return [2
               /*return*/
               , deleted];
@@ -89264,7 +89450,7 @@ function () {
     var e_9, _a, e_10, _b, e_11, _c;
 
     return __awaiter(this, void 0, void 0, function () {
-      var rel, relationType, fieldName, modelName, targetName, targetNames, storeName, index, _d, model, hasOneIndex, hasConnectedModelFields, keyValues, values, recordToDelete, hasOneIndex_1, hasOneCustomField, keyValues, value, recordToDelete, e_10_1, model, keyValues, childrenArray, e_11_1, e_9_1;
+      var rel, relationType, modelName, targetName, targetNames, associatedWith, storeName, _d, model, hasOneIndex, values, recordToDelete, index, values, value, recordToDelete, e_10_1, model, index, keyValues, childrenArray, e_11_1, e_9_1;
 
       var _this = this;
 
@@ -89286,12 +89472,8 @@ function () {
             /*break*/
             , 37];
             rel = relations_2_1.value;
-            relationType = rel.relationType, fieldName = rel.fieldName, modelName = rel.modelName, targetName = rel.targetName, targetNames = rel.targetNames;
+            relationType = rel.relationType, modelName = rel.modelName, targetName = rel.targetName, targetNames = rel.targetNames, associatedWith = rel.associatedWith;
             storeName = this.getStorename(nameSpace, modelName);
-            index = Object(_util__WEBPACK_IMPORTED_MODULE_4__["getIndex"])(this.schema.namespaces[nameSpace].relationships[modelName].relationTypes, srcModel) || // if we were unable to find an index via relationTypes
-            // i.e. for keyName connections, attempt to find one by the
-            // associatedWith property
-            Object(_util__WEBPACK_IMPORTED_MODULE_4__["getIndexFromAssociation"])(this.schema.namespaces[nameSpace].relationships[modelName].indexes, rel.associatedWith);
             _d = relationType;
 
             switch (_d) {
@@ -89331,26 +89513,13 @@ function () {
             /*break*/
             , 12];
             model = models_1_1.value;
-            hasOneIndex = index || 'byPk';
-            if (!(targetNames && targetNames.length > 0)) return [3
+            hasOneIndex = 'byPk';
+            if (!(targetNames === null || targetNames === void 0 ? void 0 : targetNames.length)) return [3
             /*break*/
             , 8];
-            hasConnectedModelFields = targetNames.every(function (targetName) {
-              return model.hasOwnProperty(targetName);
+            values = targetNames.map(function (targetName) {
+              return model[targetName];
             });
-            keyValues = this.getIndexKeyValues(model);
-            values = [];
-
-            if (hasConnectedModelFields) {
-              // Values will be that of the child model
-              values = targetNames.map(function (targetName) {
-                return model[targetName];
-              });
-            } else {
-              // values will be that of the parent model
-              values = keyValues;
-            }
-
             if (values.length === 0) return [3
             /*break*/
             , 12];
@@ -89372,16 +89541,28 @@ function () {
             , 12];
 
           case 8:
-            hasOneIndex_1 = index || 'byPk';
-            hasOneCustomField = targetName in model;
-            keyValues = this.getIndexKeyValues(model);
-            value = hasOneCustomField ? [model[targetName]] : keyValues;
-            if (!value) return [3
+            index = void 0;
+            values = void 0;
+
+            if (targetName && targetName in model) {
+              index = hasOneIndex;
+              value = model[targetName];
+              values = [value];
+            } else {
+              // backwards compatability for older versions of codegen that did not emit targetName for HAS_ONE relations
+              // TODO: can we deprecate this? it's been ~2 years since codegen started including targetName for HAS_ONE
+              // If we deprecate, we'll need to re-gen the MIPR in __tests__/schema.ts > newSchema
+              // otherwise some unit tests will fail
+              index = Object(_util__WEBPACK_IMPORTED_MODULE_4__["getIndex"])(this.schema.namespaces[nameSpace].relationships[modelName].relationTypes, srcModel);
+              values = this.getIndexKeyValues(model);
+            }
+
+            if (!values || !index) return [3
             /*break*/
             , 12];
             return [4
             /*yield*/
-            , this.db.transaction(storeName, 'readwrite').objectStore(storeName).index(hasOneIndex_1).get(value)];
+            , this.db.transaction(storeName, 'readwrite').objectStore(storeName).index(index).get(values)];
 
           case 9:
             recordToDelete = _e.sent();
@@ -89465,6 +89646,9 @@ function () {
             /*break*/
             , 26];
             model = models_2_1.value;
+            index = // explicit bi-directional @hasMany and @manyToMany
+            Object(_util__WEBPACK_IMPORTED_MODULE_4__["getIndex"])(this.schema.namespaces[nameSpace].relationships[modelName].relationTypes, srcModel) || // uni and/or implicit @hasMany
+            Object(_util__WEBPACK_IMPORTED_MODULE_4__["getIndexFromAssociation"])(this.schema.namespaces[nameSpace].relationships[modelName].indexes, associatedWith);
             keyValues = this.getIndexKeyValues(model);
             return [4
             /*yield*/
@@ -97512,7 +97696,8 @@ var __values = undefined && undefined.__values || function (o) {
 var ID = 'id';
 var errorMessages = {
   idEmptyString: 'An index field cannot contain an empty string value',
-  queryByPkWithCompositeKeyPresent: 'Models with composite primary keys cannot by queried by a single key value. Use object literal syntax for composite keys instead: https://docs.amplify.aws/lib/datastore/advanced-workflows/q/platform/js/#querying-records-with-custom-primary-keys',
+  queryByPkWithCompositeKeyPresent: 'Models with composite primary keys cannot be queried by a single key value. Use object literal syntax for composite keys instead: https://docs.amplify.aws/lib/datastore/advanced-workflows/q/platform/js/#querying-records-with-custom-primary-keys',
+  deleteByPkWithCompositeKeyPresent: 'Models with composite primary keys cannot be deleted by a single key value, unless using a predicate. Use object literal syntax for composite keys instead: https://docs.amplify.aws/lib/datastore/advanced-workflows/q/platform/js/#querying-records-with-custom-primary-keys',
   observeWithObjectLiteral: 'Object literal syntax cannot be used with observe. Use a predicate instead: https://docs.amplify.aws/lib/datastore/data-access/q/platform/js/#predicates'
 };
 function extractKeyIfExists(modelDefinition) {