@aws-amplify/datastore 4.7.6-api-v6-models.b3abc9b.0 → 5.0.0

package/lib-esm/authModeStrategies/defaultAuthStrategy.js

@@ -1,5 +1,4 @@
 // Default behavior is to use the primary auth mode for an API,
 // 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
+export const defaultAuthStrategy = () => [];

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,6 @@
-import { __awaiter, __generator, __read, __spread } from "tslib";
 // 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
@@ -16,21 +14,21 @@ function getProviderFromRule(rule) {
     return rule.provider;
 }
 function sortAuthRulesWithPriority(rules) {
-    var allowSortPriority = [
+    const allowSortPriority = [
         ModelAttributeAuthAllow.CUSTOM,
         ModelAttributeAuthAllow.OWNER,
         ModelAttributeAuthAllow.GROUPS,
         ModelAttributeAuthAllow.PRIVATE,
         ModelAttributeAuthAllow.PUBLIC,
     ];
-    var providerSortPriority = [
+    const providerSortPriority = [
         ModelAttributeAuthProvider.FUNCTION,
         ModelAttributeAuthProvider.USER_POOLS,
         ModelAttributeAuthProvider.OIDC,
         ModelAttributeAuthProvider.IAM,
         ModelAttributeAuthProvider.API_KEY,
     ];
-    return __spread(rules).sort(function (a, b) {
+    return [...rules].sort((a, b) => {
         if (a.allow === b.allow) {
             return (providerSortPriority.indexOf(getProviderFromRule(a)) -
                 providerSortPriority.indexOf(getProviderFromRule(b)));
@@ -38,17 +36,16 @@ function sortAuthRulesWithPriority(rules) {
         return (allowSortPriority.indexOf(a.allow) - allowSortPriority.indexOf(b.allow));
     });
 }
-function getAuthRules(_a) {
-    var rules = _a.rules, currentUser = _a.currentUser;
+function getAuthRules({ rules, currentUser, }) {
     // Using Set to ensure uniqueness
-    var authModes = new Set();
-    rules.forEach(function (rule) {
+    const authModes = new Set();
+    rules.forEach(rule => {
         switch (rule.allow) {
             case ModelAttributeAuthAllow.CUSTOM:
                 // 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 +53,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('userPool');
                     }
                     else if (rule.provider === ModelAttributeAuthProvider.OIDC) {
-                        authModes.add(GRAPHQL_AUTH_MODE.OPENID_CONNECT);
+                        authModes.add('oidc');
                     }
                 }
                 break;
@@ -70,22 +67,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('userPool');
                     }
                     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;
             }
@@ -106,39 +103,25 @@ function getAuthRules(_a) {
  * @param param0 The `{schema, modelName}` to inspect.
  * @returns A sorted array of auth modes to attempt.
  */
-export var multiAuthStrategy = function (amplifyContext) {
-    return function (_a) {
-        var schema = _a.schema, modelName = _a.modelName;
-        return __awaiter(void 0, void 0, void 0, function () {
-            var currentUser, e_1, attributes, authAttribute, sortedRules;
-            var _b;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        amplifyContext.Auth = amplifyContext.Auth || Auth;
-                        _c.label = 1;
-                    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:
-                        e_1 = _c.sent();
-                        return [3 /*break*/, 4];
-                    case 4:
-                        attributes = schema.namespaces.user.models[modelName].attributes;
-                        if (attributes) {
-                            authAttribute = attributes.find(function (attr) { return attr.type === 'auth'; });
-                            if ((_b = authAttribute === null || authAttribute === void 0 ? void 0 : authAttribute.properties) === null || _b === void 0 ? void 0 : _b.rules) {
-                                sortedRules = sortAuthRulesWithPriority(authAttribute.properties.rules);
-                                return [2 /*return*/, getAuthRules({ currentUser: currentUser, rules: sortedRules })];
-                            }
-                        }
-                        return [2 /*return*/, []];
-                }
-            });
-        });
-    };
+export const multiAuthStrategy = (amplifyContext) => async ({ schema, modelName }) => {
+    let currentUser;
+    try {
+        const authSession = await fetchAuthSession();
+        if (authSession.tokens.accessToken) {
+            // the user is authenticated
+            currentUser = authSession;
+        }
+    }
+    catch (e) {
+        // No current user
+    }
+    const { attributes } = schema.namespaces.user.models[modelName];
+    if (attributes) {
+        const authAttribute = attributes.find(attr => attr.type === 'auth');
+        if (authAttribute?.properties?.rules) {
+            const sortedRules = sortAuthRulesWithPriority(authAttribute.properties.rules);
+            return getAuthRules({ currentUser, rules: sortedRules });
+        }
+    }
+    return [];
 };
-//# sourceMappingURL=multiAuthStrategy.js.map

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

@@ -1,6 +1,6 @@
-import Observable from 'zen-observable-ts';
+import { Observable } from 'rxjs';
 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;