@aws-amplify/datastore 4.7.5 → 5.0.1-console-preview.4208d73.0

package/lib-esm/authModeStrategies/defaultAuthStrategy.js

@@ -2,4 +2,3 @@
 // so we are returning an empty array so that DataStore will default
 // to using the primary auth mode.
 export var defaultAuthStrategy = function () { return []; };
-//# sourceMappingURL=defaultAuthStrategy.js.map

package/lib-esm/authModeStrategies/index.js

@@ -2,4 +2,3 @@
 // SPDX-License-Identifier: Apache-2.0
 export { defaultAuthStrategy } from './defaultAuthStrategy';
 export { multiAuthStrategy } from './multiAuthStrategy';
-//# sourceMappingURL=index.js.map

package/lib-esm/authModeStrategies/multiAuthStrategy.js

@@ -1,8 +1,67 @@
-import { __awaiter, __generator, __read, __spread } from "tslib";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { Auth } from '@aws-amplify/auth';
-import { GRAPHQL_AUTH_MODE } from '@aws-amplify/api-graphql';
+import { fetchAuthSession } from '@aws-amplify/core';
 import { ModelAttributeAuthProvider, ModelAttributeAuthAllow, } from '../types';
 function getProviderFromRule(rule) {
     // private with no provider means userPools
@@ -30,7 +89,7 @@ function sortAuthRulesWithPriority(rules) {
         ModelAttributeAuthProvider.IAM,
         ModelAttributeAuthProvider.API_KEY,
     ];
-    return __spread(rules).sort(function (a, b) {
+    return __spreadArray([], __read(rules), false).sort(function (a, b) {
         if (a.allow === b.allow) {
             return (providerSortPriority.indexOf(getProviderFromRule(a)) -
                 providerSortPriority.indexOf(getProviderFromRule(b)));
@@ -48,7 +107,7 @@ function getAuthRules(_a) {
                 // custom with no provider -> function
                 if (!rule.provider ||
                     rule.provider === ModelAttributeAuthProvider.FUNCTION) {
-                    authModes.add(GRAPHQL_AUTH_MODE.AWS_LAMBDA);
+                    authModes.add('lambda');
                 }
                 break;
             case ModelAttributeAuthAllow.GROUPS:
@@ -56,10 +115,10 @@ function getAuthRules(_a) {
                 // We shouldn't attempt User Pool or OIDC if there isn't an authenticated user
                 if (currentUser) {
                     if (rule.provider === ModelAttributeAuthProvider.USER_POOLS) {
-                        authModes.add(GRAPHQL_AUTH_MODE.AMAZON_COGNITO_USER_POOLS);
+                        authModes.add('jwt');
                     }
                     else if (rule.provider === ModelAttributeAuthProvider.OIDC) {
-                        authModes.add(GRAPHQL_AUTH_MODE.OPENID_CONNECT);
+                        authModes.add('jwt');
                     }
                 }
                 break;
@@ -70,22 +129,22 @@ function getAuthRules(_a) {
                     // private with no provider means userPools
                     if (!rule.provider ||
                         rule.provider === ModelAttributeAuthProvider.USER_POOLS) {
-                        authModes.add(GRAPHQL_AUTH_MODE.AMAZON_COGNITO_USER_POOLS);
+                        authModes.add('jwt');
                     }
                     else if (rule.provider === ModelAttributeAuthProvider.IAM) {
-                        authModes.add(GRAPHQL_AUTH_MODE.AWS_IAM);
+                        authModes.add('iam');
                     }
                 }
                 break;
             }
             case ModelAttributeAuthAllow.PUBLIC: {
                 if (rule.provider === ModelAttributeAuthProvider.IAM) {
-                    authModes.add(GRAPHQL_AUTH_MODE.AWS_IAM);
+                    authModes.add('iam');
                 }
                 else if (!rule.provider ||
                     rule.provider === ModelAttributeAuthProvider.API_KEY) {
                     // public with no provider means apiKey
-                    authModes.add(GRAPHQL_AUTH_MODE.API_KEY);
+                    authModes.add('apiKey');
                 }
                 break;
             }
@@ -115,18 +174,15 @@ export var multiAuthStrategy = function (amplifyContext) {
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        amplifyContext.Auth = amplifyContext.Auth || Auth;
-                        _c.label = 1;
+                        _c.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, fetchAuthSession()];
                     case 1:
-                        _c.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, amplifyContext.Auth.currentAuthenticatedUser()];
-                    case 2:
                         currentUser = _c.sent();
-                        return [3 /*break*/, 4];
-                    case 3:
+                        return [3 /*break*/, 3];
+                    case 2:
                         e_1 = _c.sent();
-                        return [3 /*break*/, 4];
-                    case 4:
+                        return [3 /*break*/, 3];
+                    case 3:
                         attributes = schema.namespaces.user.models[modelName].attributes;
                         if (attributes) {
                             authAttribute = attributes.find(function (attr) { return attr.type === 'auth'; });
@@ -141,4 +197,3 @@ export var multiAuthStrategy = function (amplifyContext) {
         });
     };
 };
-//# sourceMappingURL=multiAuthStrategy.js.map

package/lib-esm/datastore/datastore.d.ts

@@ -1,6 +1,6 @@
 import Observable from 'zen-observable-ts';
 import { PredicateAll } from '../predicates';
-import { ConflictHandler, DataStoreConfig, NonModelTypeConstructor, ProducerPaginationInput, PersistentModel, PersistentModelConstructor, Schema, SubscriptionMessage, DataStoreSnapshot, TypeConstructorMap, ErrorHandler, ObserveQueryOptions, PersistentModelMetaData, IdentifierFieldOrIdentifierObject, RecursiveModelPredicateExtender, ModelPredicateExtender } from '../types';
+import { ConflictHandler, DataStoreConfig, ProducerPaginationInput, PersistentModel, PersistentModelConstructor, Schema, SubscriptionMessage, DataStoreSnapshot, TypeConstructorMap, ErrorHandler, ObserveQueryOptions, PersistentModelMetaData, IdentifierFieldOrIdentifierObject, RecursiveModelPredicateExtender, ModelPredicateExtender } from '../types';
 export declare let syncClasses: TypeConstructorMap;
 /**
  * Describes whether and to what a model is attached for lazy loading purposes.
@@ -41,8 +41,8 @@ export declare function attached<T extends PersistentModel | PersistentModel[]>(
  *
  * @param instance A model instance
  */
-export declare const getAttachment: (instance: Readonly<Record<string, any>>) => ModelAttachment.Detached | ModelAttachment;
-declare const initSchema: (userSchema: Schema) => Record<string, PersistentModelConstructor<any> | NonModelTypeConstructor<unknown>>;
+export declare const getAttachment: (instance: PersistentModel) => ModelAttachment;
+declare const initSchema: (userSchema: Schema) => TypeConstructorMap;
 /**
  * Constructs a model and records it with its metadata in a weakset. Allows for
  * the separate storage of core model fields and Amplify/DataStore metadata
@@ -92,7 +92,6 @@ export declare class AsyncCollection<T> implements AsyncIterable<T> {
     }): Promise<T[]>;
 }
 declare class DataStore {
-    private Auth;
     private InternalAPI;
     private Cache;
     private amplifyConfig;