@aws-amplify/datastore 5.0.1-console-preview.11cf989.0 → 5.0.1-console-preview.4ae78ed.0

package/lib/authModeStrategies/multiAuthStrategy.js

@@ -118,10 +118,10 @@ function getAuthRules(_a) {
                 // We shouldn't attempt User Pool or OIDC if there isn't an authenticated user
                 if (currentUser) {
                     if (rule.provider === types_1.ModelAttributeAuthProvider.USER_POOLS) {
-                        authModes.add('jwt');
+                        authModes.add('userPool');
                     }
                     else if (rule.provider === types_1.ModelAttributeAuthProvider.OIDC) {
-                        authModes.add('jwt');
+                        authModes.add('oidc');
                     }
                 }
                 break;
@@ -132,7 +132,7 @@ function getAuthRules(_a) {
                     // private with no provider means userPools
                     if (!rule.provider ||
                         rule.provider === types_1.ModelAttributeAuthProvider.USER_POOLS) {
-                        authModes.add('jwt');
+                        authModes.add('userPool');
                     }
                     else if (rule.provider === types_1.ModelAttributeAuthProvider.IAM) {
                         authModes.add('iam');

package/lib/datastore/datastore.js

@@ -2055,16 +2055,12 @@ var DataStore = /** @class */ (function () {
             if (config === void 0) { config = {}; }
             _this.amplifyContext.InternalAPI = _this.InternalAPI;
             var configDataStore = config.DataStore, configAuthModeStrategyType = config.authModeStrategyType, configConflictHandler = config.conflictHandler, configErrorHandler = config.errorHandler, configMaxRecordsToSync = config.maxRecordsToSync, configSyncPageSize = config.syncPageSize, configFullSyncInterval = config.fullSyncInterval, configSyncExpressions = config.syncExpressions, configAuthProviders = config.authProviders, configStorageAdapter = config.storageAdapter, configFromAmplify = __rest(config, ["DataStore", "authModeStrategyType", "conflictHandler", "errorHandler", "maxRecordsToSync", "syncPageSize", "fullSyncInterval", "syncExpressions", "authProviders", "storageAdapter"]);
-            var apiKey = '';
-            var currentAppSyncConfig = (_a = core_1.Amplify.getConfig().API) === null || _a === void 0 ? void 0 : _a.AppSync;
-            if ((currentAppSyncConfig === null || currentAppSyncConfig === void 0 ? void 0 : currentAppSyncConfig.defaultAuthMode.type) === 'apiKey') {
-                apiKey = currentAppSyncConfig.defaultAuthMode.apiKey;
-            }
+            var currentAppSyncConfig = (_a = core_1.Amplify.getConfig().API) === null || _a === void 0 ? void 0 : _a.GraphQL;
             var appSyncConfig = {
                 aws_appsync_graphqlEndpoint: currentAppSyncConfig === null || currentAppSyncConfig === void 0 ? void 0 : currentAppSyncConfig.endpoint,
-                aws_appsync_authenticationType: currentAppSyncConfig === null || currentAppSyncConfig === void 0 ? void 0 : currentAppSyncConfig.defaultAuthMode.type,
+                aws_appsync_authenticationType: currentAppSyncConfig === null || currentAppSyncConfig === void 0 ? void 0 : currentAppSyncConfig.defaultAuthMode,
                 aws_appsync_region: currentAppSyncConfig === null || currentAppSyncConfig === void 0 ? void 0 : currentAppSyncConfig.region,
-                aws_appsync_apiKey: apiKey,
+                aws_appsync_apiKey: currentAppSyncConfig === null || currentAppSyncConfig === void 0 ? void 0 : currentAppSyncConfig.apiKey,
             };
             _this.amplifyConfig = __assign(__assign(__assign({}, _this.amplifyConfig), configFromAmplify), (currentAppSyncConfig && appSyncConfig));
             _this.conflictHandler = _this.setConflictHandler(config);

package/lib/sync/datastoreReachability/index.native.js

@@ -1,11 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReachabilityMonitor = void 0;
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 var utils_1 = require("@aws-amplify/core/internals/utils");
-var netinfo_1 = __importDefault(require("@react-native-community/netinfo"));
-exports.ReachabilityMonitor = new utils_1.Reachability().networkMonitor(netinfo_1.default);
+var react_native_1 = require("@aws-amplify/react-native");
+exports.ReachabilityMonitor = new utils_1.Reachability().networkMonitor((0, react_native_1.loadNetInfo)());

package/lib/sync/processors/subscription.js

@@ -133,7 +133,7 @@ var SubscriptionProcessor = /** @class */ (function () {
             return rule.authStrategy === 'groups' &&
                 ['userPools', 'oidc'].includes(rule.provider);
         });
-        var validGroup = authMode === 'jwt' &&
+        var validGroup = (authMode === 'oidc' || authMode === 'userPool') &&
             groupAuthRules.find(function (groupAuthRule) {
                 // validate token against groupClaim
                 if (oidcTokenPayload) {
@@ -156,7 +156,7 @@ var SubscriptionProcessor = /** @class */ (function () {
         // Owner auth needs additional values to be returned in order to create the subscription with
         // the correct parameters so we are getting the owner value from the OIDC token via the
         // identityClaim from the auth rule.
-        var oidcOwnerAuthRules = authMode === 'jwt'
+        var oidcOwnerAuthRules = authMode === 'oidc' || authMode === 'userPool'
             ? rules.filter(function (rule) {
                 return rule.authStrategy === 'owner' &&
                     (rule.provider === 'oidc' || rule.provider === 'userPools');
@@ -169,7 +169,7 @@ var SubscriptionProcessor = /** @class */ (function () {
             var isOwnerArgRequired = singleOwner && !ownerAuthRule.areSubscriptionsPublic;
             if (ownerValue) {
                 ownerAuthInfo = {
-                    authMode: 'jwt',
+                    authMode: authMode,
                     isOwner: isOwnerArgRequired,
                     ownerField: ownerAuthRule.ownerField,
                     ownerValue: String(ownerValue),

package/lib/sync/utils.d.ts

@@ -1,5 +1,5 @@
 import { GraphQLAuthError } from '@aws-amplify/api';
-import { GraphQLAuthModeKeys } from '@aws-amplify/core/internals/utils';
+import { APIAuthMode } from '@aws-amplify/core/internals/utils';
 import { ModelInstanceCreator } from '../datastore/datastore';
 import { AuthorizationRule, GraphQLCondition, GraphQLFilter, ModelInstanceMetadata, OpType, PersistentModel, PersistentModelConstructor, PredicatesGroup, RelationshipType, SchemaModel, SchemaNamespace, SchemaNonModel, ModelOperation, InternalSchema, AuthModeStrategy } from '../types';
 import { MutationEvent } from './';
@@ -93,14 +93,14 @@ export declare function getUserGroupsFromToken(token: {
 }, rule: AuthorizationRule): string[];
 export declare function getModelAuthModes({ authModeStrategy, defaultAuthMode, modelName, schema, }: {
     authModeStrategy: AuthModeStrategy;
-    defaultAuthMode: GraphQLAuthModeKeys;
+    defaultAuthMode: APIAuthMode;
     modelName: string;
     schema: InternalSchema;
 }): Promise<{
-    [key in ModelOperation]: GraphQLAuthModeKeys[];
+    [key in ModelOperation]: APIAuthMode[];
 }>;
 export declare function getForbiddenError(error: any): any;
 export declare function getClientSideAuthError(error: any): GraphQLAuthError;
-export declare function getTokenForCustomAuth(authMode: GraphQLAuthModeKeys, amplifyConfig?: Record<string, any>): Promise<string | undefined>;
+export declare function getTokenForCustomAuth(authMode: APIAuthMode, amplifyConfig?: Record<string, any>): Promise<string | undefined>;
 export declare function getIdentifierValue(modelDefinition: SchemaModel, model: ModelInstanceMetadata | PersistentModel): string;
 export {};