@aws-amplify/graphql-api-construct 1.1.5-rds-4.0 → 1.1.5

package/node_modules/@aws-amplify/backend-output-schemas/lib/storage/v1.js

@@ -5,10 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.storageOutputSchema = void 0;
 var _zod = require("zod");
-const storageOutputSchema = exports.storageOutputSchema = _zod.z.object({
+const storageOutputSchema = _zod.z.object({
   version: _zod.z.literal('1'),
   payload: _zod.z.object({
     bucketName: _zod.z.string(),
     storageRegion: _zod.z.string()
   })
-});
+});
+exports.storageOutputSchema = storageOutputSchema;

package/node_modules/@aws-amplify/backend-output-storage/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/backend-output-storage",
-  "version": "0.1.1-alpha.3",
+  "version": "0.1.1-alpha.2",
   "publishConfig": {
     "access": "public"
   },
@@ -21,6 +21,6 @@
     "@aws-amplify/backend-output-schemas": "^0.2.0-alpha.5"
   },
   "peerDependencies": {
-    "aws-cdk-lib": "^2.100.0"
+    "aws-cdk-lib": "^2.80.0"
   }
 }

package/node_modules/@aws-amplify/graphql-auth-transformer/API.md

@@ -4,7 +4,6 @@
 
 ```ts
 
-import { AppSyncAuthConfiguration } from '@aws-amplify/graphql-transformer-interfaces';
 import { DirectiveNode } from 'graphql';
 import { DirectiveWrapper } from '@aws-amplify/graphql-transformer-core';
 import { FieldDefinitionNode } from 'graphql';
@@ -97,7 +96,7 @@ export type AuthStrategy = 'owner' | 'groups' | 'public' | 'private' | 'custom';
 
 // @public (undocumented)
 export class AuthTransformer extends TransformerAuthBase implements TransformerAuthProvider {
-    constructor(config?: AuthTransformerConfig);
+    constructor();
     // (undocumented)
     addAutoGeneratedDataStoreFields: (ctx: TransformerContextProvider, allowedFields: Set<string>) => void;
     // (undocumented)
@@ -124,10 +123,6 @@ export class AuthTransformer extends TransformerAuthBase implements TransformerA
     generateResolvers: (context: TransformerContextProvider) => void;
     // (undocumented)
     getRelatedModelObject: (ctx: TransformerContextProvider, typeName: string) => ObjectTypeDefinitionNode;
-    // Warning: (ae-forgotten-export) The symbol "AuthVTLGenerator" needs to be exported by the entry point index.d.ts
-    //
-    // (undocumented)
-    getVtlGenerator: (ctx: TransformerContextProvider, typename: string, field?: FieldDefinitionNode) => AuthVTLGenerator;
     // (undocumented)
     object: (def: ObjectTypeDefinitionNode, directive: DirectiveNode, context: TransformerSchemaVisitStepContextProvider) => void;
     // (undocumented)
@@ -147,7 +142,7 @@ export class AuthTransformer extends TransformerAuthBase implements TransformerA
     // (undocumented)
     protectSearchResolver: (ctx: TransformerContextProvider, def: ObjectTypeDefinitionNode, typeName: string, fieldName: string, acm: AccessControlMatrix) => void;
     // (undocumented)
-    protectSubscriptionResolver: (ctx: TransformerContextProvider, typeName: string, fieldName: string, subscriptionRoles: Array<RoleDefinition>, def: ObjectTypeDefinitionNode) => void;
+    protectSubscriptionResolver: (ctx: TransformerContextProvider, typeName: string, fieldName: string, subscriptionRoles: Array<RoleDefinition>) => void;
     // (undocumented)
     protectSyncResolver: (ctx: TransformerContextProvider, def: ObjectTypeDefinitionNode, typeName: string, fieldName: string, acm: AccessControlMatrix) => void;
     // (undocumented)
@@ -158,16 +153,6 @@ export class AuthTransformer extends TransformerAuthBase implements TransformerA
     transformSchema: (context: TransformerTransformSchemaStepContextProvider) => void;
 }
 
-// @public (undocumented)
-export interface AuthTransformerConfig {
-    // (undocumented)
-    adminRoles?: Array<string>;
-    // (undocumented)
-    authConfig?: AppSyncAuthConfiguration;
-    // (undocumented)
-    identityPoolId?: string;
-}
-
 // @public (undocumented)
 export const COGNITO_AUTH_TYPE = "User Pool Authorization";
 
@@ -191,6 +176,8 @@ export interface ConfiguredAuthProviders {
     hasUserPools: boolean;
     // (undocumented)
     onlyDefaultAuthProviderConfigured: boolean;
+    // (undocumented)
+    shouldAddDefaultServiceDirective: boolean;
 }
 
 // @public (undocumented)

package/node_modules/@aws-amplify/graphql-auth-transformer/CHANGELOG.md

@@ -3,20 +3,9 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [3.2.0-rds-4.0](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-auth-transformer@3.1.8...@aws-amplify/graphql-auth-transformer@3.2.0-rds-4.0) (2023-10-19)
+## [3.1.9](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-auth-transformer@3.1.8...@aws-amplify/graphql-auth-transformer@3.1.9) (2023-10-21)
 
-### Bug Fixes
-
-- **api:** do not allow auth directive on rds model fields ([a1f1ae0](https://github.com/aws-amplify/amplify-category-api/commit/a1f1ae081dd9523e4a3500c6a31905fd4c222fdd))
-- **api:** iam rule correct cognito pool id ([183e78b](https://github.com/aws-amplify/amplify-category-api/commit/183e78bc94aa548c02536d963129382c8b7eabe4))
-- relational auth cases; preserve auth rule schema edits, added multi-auth e2e tests ([#1965](https://github.com/aws-amplify/amplify-category-api/issues/1965)) ([df085b2](https://github.com/aws-amplify/amplify-category-api/commit/df085b2bf75dded743809b59386272070fc92251))
-- Update rds transformers to accommodate ConfiguredAuthProviders change ([ae2a451](https://github.com/aws-amplify/amplify-category-api/commit/ae2a451d419eed88fecdf4e778410bce5c9d80f8))
-
-### Features
-
-- **api:** rds auth model level rules ([d2b0217](https://github.com/aws-amplify/amplify-category-api/commit/d2b0217b9c0ba11c60441720c0fd31802b64de39))
-- **api:** refactor auth transformer to use vtl generator factory pattern ([e965d24](https://github.com/aws-amplify/amplify-category-api/commit/e965d24731fc1e2300ef0e16b61af6b39afb0cad))
-- refersTo supports field name mappings on RDS models ([#1865](https://github.com/aws-amplify/amplify-category-api/issues/1865)) ([ee60011](https://github.com/aws-amplify/amplify-category-api/commit/ee60011f5c41d0442e1096dd16d80e94b900745a))
+**Note:** Version bump only for package @aws-amplify/graphql-auth-transformer
 
 ## [3.1.8](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-auth-transformer@3.1.7...@aws-amplify/graphql-auth-transformer@3.1.8) (2023-10-12)
 

package/node_modules/@aws-amplify/graphql-auth-transformer/lib/graphql-auth-transformer.d.ts

@@ -2,10 +2,8 @@ import { TransformerAuthBase } from '@aws-amplify/graphql-transformer-core';
 import { TransformerTransformSchemaStepContextProvider, TransformerContextProvider, TransformerSchemaVisitStepContextProvider, TransformerAuthProvider, TransformerBeforeStepContextProvider } from '@aws-amplify/graphql-transformer-interfaces';
 import { DirectiveNode, FieldDefinitionNode, ObjectTypeDefinitionNode, InterfaceTypeDefinitionNode } from 'graphql';
 import { AccessControlMatrix } from './accesscontrol';
-import { AuthTransformerConfig, RoleDefinition } from './utils';
-import { AuthVTLGenerator } from './vtl-generator/vtl-generator';
+import { RoleDefinition } from './utils';
 export declare class AuthTransformer extends TransformerAuthBase implements TransformerAuthProvider {
-    private config;
     private configuredAuthProviders;
     private rules;
     private roleMap;
@@ -17,7 +15,7 @@ export declare class AuthTransformer extends TransformerAuthBase implements Tran
     private generateIAMPolicyForAuthRole;
     private authPolicyResources;
     private unauthPolicyResources;
-    constructor(config?: AuthTransformerConfig);
+    constructor();
     before: (context: TransformerBeforeStepContextProvider) => void;
     object: (def: ObjectTypeDefinitionNode, directive: DirectiveNode, context: TransformerSchemaVisitStepContextProvider) => void;
     after: (context: TransformerContextProvider) => void;
@@ -36,7 +34,7 @@ export declare class AuthTransformer extends TransformerAuthBase implements Tran
     protectCreateResolver: (ctx: TransformerContextProvider, def: ObjectTypeDefinitionNode, typeName: string, fieldName: string, acm: AccessControlMatrix) => void;
     protectUpdateResolver: (ctx: TransformerContextProvider, def: ObjectTypeDefinitionNode, typeName: string, fieldName: string, acm: AccessControlMatrix) => void;
     protectDeleteResolver: (ctx: TransformerContextProvider, def: ObjectTypeDefinitionNode, typeName: string, fieldName: string, acm: AccessControlMatrix) => void;
-    protectSubscriptionResolver: (ctx: TransformerContextProvider, typeName: string, fieldName: string, subscriptionRoles: Array<RoleDefinition>, def: ObjectTypeDefinitionNode) => void;
+    protectSubscriptionResolver: (ctx: TransformerContextProvider, typeName: string, fieldName: string, subscriptionRoles: Array<RoleDefinition>) => void;
     private convertRulesToRoles;
     private doesTypeHaveRulesForOperation;
     private getAuthProviders;
@@ -44,7 +42,6 @@ export declare class AuthTransformer extends TransformerAuthBase implements Tran
     addFieldsToObject: (ctx: TransformerTransformSchemaStepContextProvider, modelName: string, ownerFields: Array<string>) => void;
     private propagateAuthDirectivesToNestedTypes;
     private getServiceDirectives;
-    private shouldAddDefaultServiceDirective;
     private generateIAMPolicies;
     private setAuthPolicyFlag;
     private setUnauthPolicyFlag;
@@ -57,6 +54,5 @@ export declare class AuthTransformer extends TransformerAuthBase implements Tran
     addAutoGeneratedHasManyFields: (ctx: TransformerContextProvider, typeDefinitions: ObjectTypeDefinitionNode[], def: ObjectTypeDefinitionNode, allowedFields: Set<string>) => void;
     addAutoGeneratedHasOneFields: (ctx: TransformerContextProvider, typeDefinitions: ObjectTypeDefinitionNode[], fields: readonly string[], def: ObjectTypeDefinitionNode, allowedFields: Set<string>) => void;
     addAutoGeneratedDataStoreFields: (ctx: TransformerContextProvider, allowedFields: Set<string>) => void;
-    getVtlGenerator: (ctx: TransformerContextProvider, typename: string, field?: FieldDefinitionNode) => AuthVTLGenerator;
 }
 //# sourceMappingURL=graphql-auth-transformer.d.ts.map

package/node_modules/@aws-amplify/graphql-auth-transformer/lib/graphql-auth-transformer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphql-auth-transformer.d.ts","sourceRoot":"","sources":["../src/graphql-auth-transformer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"graphql-auth-transformer.d.ts","sourceRoot":"","sources":["../src/graphql-auth-transformer.ts"],"names":[],"mappings":"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"}

package/node_modules/@aws-amplify/graphql-auth-transformer/lib/graphql-auth-transformer.js

@@ -33,11 +33,11 @@ const graphql_transformer_common_1 = require("graphql-transformer-common");
 const iam = __importStar(require("aws-cdk-lib/aws-iam"));
 const cdk = __importStar(require("aws-cdk-lib"));
 const graphql_relational_transformer_1 = require("@aws-amplify/graphql-relational-transformer");
+const resolvers_1 = require("./resolvers");
+const field_1 = require("./resolvers/field");
 const accesscontrol_1 = require("./accesscontrol");
 const utils_1 = require("./utils");
 const warnings_1 = require("./utils/warnings");
-const ddb_vtl_generator_1 = require("./vtl-generator/ddb/ddb-vtl-generator");
-const rds_vtl_generator_1 = require("./vtl-generator/rds/rds-vtl-generator");
 const getReadRolesForField = (acm, readRoles, fieldName) => {
     const hasCognitoPrivateRole = readRoles.some((r) => r === 'userPools:private') &&
         acm.isAllowed('userPools:private', fieldName, 'get') &&
@@ -61,14 +61,12 @@ const getReadRolesForField = (acm, readRoles, fieldName) => {
     return allowedRoles;
 };
 class AuthTransformer extends graphql_transformer_core_1.TransformerAuthBase {
-    constructor(config = {}) {
+    constructor() {
         super('amplify-auth-transformer', utils_1.authDirectiveDefinition);
         this.authPolicyResources = new Set();
         this.unauthPolicyResources = new Set();
         this.before = (context) => {
-            var _a;
-            this.config.authConfig = (_a = this.config.authConfig) !== null && _a !== void 0 ? _a : context.authConfig;
-            this.configuredAuthProviders = (0, utils_1.getConfiguredAuthProviders)(this.config);
+            this.configuredAuthProviders = (0, utils_1.getConfiguredAuthProviders)(context);
         };
         this.object = (def, directive, context) => {
             var _a;
@@ -124,7 +122,7 @@ class AuthTransformer extends graphql_transformer_core_1.TransformerAuthBase {
             const fieldName = field.name.value;
             const getAuthRulesOptions = (0, lodash_1.merge)({ isField: true }, (0, graphql_transformer_core_1.generateGetArgumentsInput)(context.transformParameters));
             const rules = (0, utils_1.getAuthDirectiveRules)(new graphql_transformer_core_1.DirectiveWrapper(directive), getAuthRulesOptions);
-            (0, utils_1.validateFieldRules)(new graphql_transformer_core_1.DirectiveWrapper(directive), isParentTypeBuiltinType, modelDirective !== undefined, field.name.value, context.transformParameters, parent, context);
+            (0, utils_1.validateFieldRules)(new graphql_transformer_core_1.DirectiveWrapper(directive), isParentTypeBuiltinType, modelDirective !== undefined, field.name.value, context.transformParameters);
             (0, utils_1.validateRules)(rules, this.configuredAuthProviders, field.name.value);
             this.setAuthPolicyFlag(rules);
             this.setUnauthPolicyFlag(rules);
@@ -171,7 +169,8 @@ class AuthTransformer extends graphql_transformer_core_1.TransformerAuthBase {
                 const modelHasSearchable = def.directives.some((dir) => dir.name.value === 'searchable');
                 this.addFieldsToObject(context, modelName, getOwnerFields(acm));
                 const providers = this.getAuthProviders(acm.getRoles());
-                const directives = this.getServiceDirectives(providers, providers.length === 0 ? this.shouldAddDefaultServiceDirective() : false);
+                const addDefaultIfNeeded = providers.length === 0 ? this.configuredAuthProviders.shouldAddDefaultServiceDirective : false;
+                const directives = this.getServiceDirectives(providers, addDefaultIfNeeded);
                 if (modelHasSearchable) {
                     providers.forEach((p) => searchableAggregateServiceDirectives.add(p));
                 }
@@ -223,7 +222,7 @@ class AuthTransformer extends graphql_transformer_core_1.TransformerAuthBase {
                 if (context.metadata.has(indexKeyName)) {
                     context.metadata.get(indexKeyName).forEach((index) => {
                         const [indexName, indexQueryName] = index.split(':');
-                        this.protectListResolver(context, def, 'Query', indexQueryName, acm, indexName);
+                        this.protectListResolver(context, def, def.name.value, indexQueryName, acm, indexName);
                     });
                 }
                 if (searchableDirective) {
@@ -272,7 +271,7 @@ class AuthTransformer extends graphql_transformer_core_1.TransformerAuthBase {
                 const subscriptionFieldNames = (0, utils_1.getSubscriptionFieldNames)(this.modelDirectiveConfig.get(modelName));
                 const subscriptionRoles = acm.getRolesPerOperation('listen').map((role) => this.roleMap.get(role));
                 subscriptionFieldNames.forEach((subscription) => {
-                    this.protectSubscriptionResolver(context, subscription.typeName, subscription.fieldName, subscriptionRoles, def);
+                    this.protectSubscriptionResolver(context, subscription.typeName, subscription.fieldName, subscriptionRoles);
                 });
                 if (context.transformParameters.useSubUsernameForDefaultIdentityClaim) {
                     const roleDefinitions = acm.getRoles().map((role) => this.roleMap.get(role));
@@ -307,12 +306,12 @@ class AuthTransformer extends graphql_transformer_core_1.TransformerAuthBase {
         this.addFieldResolverForDynamicAuth = (ctx, def, typeName, fieldName) => {
             let resolver = ctx.resolvers.getResolver(typeName, fieldName);
             if (resolver) {
-                resolver.addToSlot('finish', undefined, graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(this.getVtlGenerator(ctx, def.name.value).generateFieldResolverForOwner(fieldName), `${typeName}.${fieldName}.{slotName}.{slotIndex}.res.vtl`));
+                resolver.addToSlot('finish', undefined, graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString((0, resolvers_1.generateFieldResolverForOwner)(fieldName), `${typeName}.${fieldName}.{slotName}.{slotIndex}.res.vtl`));
             }
             else {
                 const hasModelDirective = def.directives.some((dir) => dir.name.value === 'model');
                 const scope = (0, utils_1.getScopeForField)(ctx, def, fieldName, hasModelDirective);
-                resolver = ctx.resolvers.addResolver(typeName, fieldName, new graphql_transformer_core_1.TransformerResolver(typeName, fieldName, graphql_transformer_common_1.ResolverResourceIDs.ResolverResourceID(typeName, fieldName), graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString('$util.toJson({"version":"2018-05-29","payload":{}})', `${typeName}.${fieldName}.req.vtl`), graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(this.getVtlGenerator(ctx, def.name.value).generateFieldResolverForOwner(fieldName), `${typeName}.${fieldName}.res.vtl`), ['init'], ['finish']));
+                resolver = ctx.resolvers.addResolver(typeName, fieldName, new graphql_transformer_core_1.TransformerResolver(typeName, fieldName, graphql_transformer_common_1.ResolverResourceIDs.ResolverResourceID(typeName, fieldName), graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString('$util.toJson({"version":"2018-05-29","payload":{}})', `${typeName}.${fieldName}.req.vtl`), graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString((0, resolvers_1.generateFieldResolverForOwner)(fieldName), `${typeName}.${fieldName}.res.vtl`), ['init'], ['finish']));
                 resolver.setScope(scope);
             }
         };
@@ -379,14 +378,31 @@ class AuthTransformer extends graphql_transformer_core_1.TransformerAuthBase {
             var _a;
             const resolver = ctx.resolvers.getResolver(typeName, fieldName);
             const roleDefinitions = acm.getRolesPerOperation('get').map((r) => this.roleMap.get(r));
-            const authExpression = this.getVtlGenerator(ctx, def.name.value).generateAuthExpressionForQueries(ctx, this.configuredAuthProviders, roleDefinitions, (_a = def.fields) !== null && _a !== void 0 ? _a : [], def, undefined);
+            const tableKeySchema = (0, graphql_transformer_core_1.getTable)(ctx, def).keySchema;
+            const primaryKey = (0, utils_1.getPartitionKey)(tableKeySchema);
+            const authExpression = (0, resolvers_1.generateAuthExpressionForQueries)(this.configuredAuthProviders, roleDefinitions, (_a = def.fields) !== null && _a !== void 0 ? _a : [], tableKeySchema, false, primaryKey);
             resolver.addToSlot('auth', graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(authExpression, `${typeName}.${fieldName}.{slotName}.{slotIndex}.req.vtl`));
         };
         this.protectListResolver = (ctx, def, typeName, fieldName, acm, indexName) => {
             var _a;
             const resolver = ctx.resolvers.getResolver(typeName, fieldName);
             const roleDefinitions = acm.getRolesPerOperation('list').map((r) => this.roleMap.get(r));
-            const authExpression = this.getVtlGenerator(ctx, def.name.value).generateAuthExpressionForQueries(ctx, this.configuredAuthProviders, roleDefinitions, (_a = def.fields) !== null && _a !== void 0 ? _a : [], def, indexName);
+            let keySchema;
+            let partitionKey;
+            const table = (0, graphql_transformer_core_1.getTable)(ctx, def);
+            try {
+                if (indexName) {
+                    keySchema = (0, graphql_transformer_core_1.getKeySchema)(table, indexName);
+                }
+                else {
+                    keySchema = table.keySchema;
+                    partitionKey = (0, utils_1.getPartitionKey)(table.keySchema);
+                }
+            }
+            catch (err) {
+                throw new graphql_transformer_core_1.InvalidDirectiveError(`Could not fetch keySchema for ${def.name.value}.`);
+            }
+            const authExpression = (0, resolvers_1.generateAuthExpressionForQueries)(this.configuredAuthProviders, roleDefinitions, (_a = def.fields) !== null && _a !== void 0 ? _a : [], keySchema, !!indexName, partitionKey);
             resolver.addToSlot('auth', graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(authExpression, `${typeName}.${fieldName}.{slotName}.{slotIndex}.req.vtl`));
         };
         this.protectRelationalResolver = (ctx, def, typeName, field, fieldRoles) => {
@@ -405,16 +421,17 @@ class AuthTransformer extends graphql_transformer_core_1.TransformerAuthBase {
                         ...acm.getRolesPerOperation('listen'),
                     ]),
                 ].map((r) => this.roleMap.get(r));
-                relatedAuthExpression = this.getVtlGenerator(ctx, def.name.value).generateAuthExpressionForRelationQuery(ctx, def, field, relatedModelObject, this.configuredAuthProviders, roleDefinitions, (_a = relatedModelObject.fields) !== null && _a !== void 0 ? _a : []);
+                const relationalPrimaryMap = (0, utils_1.getRelationalPrimaryMap)(ctx, def, field, relatedModelObject);
+                relatedAuthExpression = (0, resolvers_1.generateAuthExpressionForRelationQuery)(this.configuredAuthProviders, roleDefinitions, (_a = relatedModelObject.fields) !== null && _a !== void 0 ? _a : [], relationalPrimaryMap);
             }
             else {
-                relatedAuthExpression = this.getVtlGenerator(ctx, def.name.value).generateSandboxExpressionForField(ctx.transformParameters.sandboxModeEnabled);
+                relatedAuthExpression = (0, field_1.generateSandboxExpressionForField)(ctx.transformParameters.sandboxModeEnabled);
             }
             if (fieldRoles) {
                 const roleDefinitions = fieldRoles.map((r) => this.roleMap.get(r));
                 const hasSubsEnabled = ((_b = this.modelDirectiveConfig.get(typeName).subscriptions) === null || _b === void 0 ? void 0 : _b.level) === 'on';
-                relatedAuthExpression = `${this.getVtlGenerator(ctx, def.name.value).setDeniedFieldFlag('Mutation', hasSubsEnabled)}\n${relatedAuthExpression}`;
-                fieldAuthExpression = this.getVtlGenerator(ctx, def.name.value).generateAuthExpressionForField(this.configuredAuthProviders, roleDefinitions, (_c = def.fields) !== null && _c !== void 0 ? _c : [], undefined);
+                relatedAuthExpression = `${(0, resolvers_1.setDeniedFieldFlag)('Mutation', hasSubsEnabled)}\n${relatedAuthExpression}`;
+                fieldAuthExpression = (0, resolvers_1.generateAuthExpressionForField)(this.configuredAuthProviders, roleDefinitions, (_c = def.fields) !== null && _c !== void 0 ? _c : []);
             }
             const resolver = ctx.resolvers.getResolver(typeName, field.name.value);
             if (fieldAuthExpression) {
@@ -429,7 +446,8 @@ class AuthTransformer extends graphql_transformer_core_1.TransformerAuthBase {
             if (ctx.isProjectUsingDataStore()) {
                 const resolver = ctx.resolvers.getResolver(typeName, fieldName);
                 const roleDefinitions = acm.getRolesPerOperation('sync').map((r) => this.roleMap.get(r));
-                const authExpression = this.getVtlGenerator(ctx, def.name.value).generateAuthExpressionForQueries(ctx, this.configuredAuthProviders, roleDefinitions, (_a = def.fields) !== null && _a !== void 0 ? _a : [], def, undefined);
+                const keySchema = (0, graphql_transformer_core_1.getTable)(ctx, def).keySchema;
+                const authExpression = (0, resolvers_1.generateAuthExpressionForQueries)(this.configuredAuthProviders, roleDefinitions, (_a = def.fields) !== null && _a !== void 0 ? _a : [], keySchema);
                 resolver.addToSlot('auth', graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(authExpression, `${typeName}.${fieldName}.{slotName}.{slotIndex}.req.vtl`));
             }
         };
@@ -453,18 +471,17 @@ class AuthTransformer extends graphql_transformer_core_1.TransformerAuthBase {
                 return roleDefinition;
             });
             allowedAggFields.push(...leastAllowedFields);
-            const authExpression = this.getVtlGenerator(ctx, def.name.value).generateAuthExpressionForSearchQueries(this.configuredAuthProviders, readRoleDefinitions, modelFields, allowedAggFields);
+            const authExpression = (0, resolvers_1.generateAuthExpressionForSearchQueries)(this.configuredAuthProviders, readRoleDefinitions, modelFields, allowedAggFields);
             resolver.addToSlot('auth', graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(authExpression, `${typeName}.${fieldName}.{slotName}.{slotIndex}.req.vtl`));
         };
         this.protectFieldResolver = (ctx, def, typeName, fieldName, roles) => {
             var _a, _b;
             const roleDefinitions = roles.map((r) => this.roleMap.get(r));
             const hasModelDirective = def.directives.some((dir) => dir.name.value === 'model');
-            const fieldNode = def.fields.find((f) => f.name.value === fieldName);
             const scope = (0, utils_1.getScopeForField)(ctx, def, fieldName, hasModelDirective);
             if (ctx.api.host.hasResolver(typeName, fieldName)) {
                 const fieldResolver = ctx.api.host.getResolver(typeName, fieldName);
-                const fieldAuthExpression = this.getVtlGenerator(ctx, def.name.value, fieldNode).generateAuthExpressionForField(this.configuredAuthProviders, roleDefinitions, [], fieldName);
+                const fieldAuthExpression = (0, resolvers_1.generateAuthExpressionForField)(this.configuredAuthProviders, roleDefinitions, [], fieldName);
                 if (!ctx.api.host.hasDataSource(utils_1.NONE_DS)) {
                     ctx.api.host.addNoneDataSource(utils_1.NONE_DS);
                 }
@@ -472,19 +489,11 @@ class AuthTransformer extends graphql_transformer_core_1.TransformerAuthBase {
                 fieldResolver.pipelineConfig.functions.unshift(authFunction.functionId);
             }
             else {
-                const fieldAuthExpression = this.getVtlGenerator(ctx, def.name.value, fieldNode).generateAuthExpressionForField(this.configuredAuthProviders, roleDefinitions, (_a = def.fields) !== null && _a !== void 0 ? _a : [], fieldName);
+                const fieldAuthExpression = (0, resolvers_1.generateAuthExpressionForField)(this.configuredAuthProviders, roleDefinitions, (_a = def.fields) !== null && _a !== void 0 ? _a : [], fieldName);
                 const subsEnabled = hasModelDirective ? ((_b = this.modelDirectiveConfig.get(typeName).subscriptions) === null || _b === void 0 ? void 0 : _b.level) === 'on' : false;
-                const fieldResponse = this.getVtlGenerator(ctx, def.name.value, fieldNode).generateFieldAuthResponse('Mutation', fieldName, subsEnabled);
-                const existingResolver = ctx.resolvers.hasResolver(typeName, fieldName);
-                if (existingResolver) {
-                    const resolver = ctx.resolvers.getResolver(typeName, fieldName);
-                    resolver.addToSlot('auth', graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(fieldAuthExpression, `${typeName}.${fieldName}.{slotName}.{slotIndex}.req.vtl`), graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(fieldResponse, `${typeName}.${fieldName}.{slotName}.{slotIndex}.res.vtl`));
-                    resolver.setScope(scope);
-                }
-                else {
-                    const resolver = ctx.resolvers.addResolver(typeName, fieldName, new graphql_transformer_core_1.TransformerResolver(typeName, fieldName, graphql_transformer_common_1.ResolverResourceIDs.ResolverResourceID(typeName, fieldName), graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(fieldAuthExpression, `${typeName}.${fieldName}.req.vtl`), graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(fieldResponse, `${typeName}.${fieldName}.res.vtl`), ['init'], ['finish']));
-                    resolver.setScope(scope);
-                }
+                const fieldResponse = (0, resolvers_1.generateFieldAuthResponse)('Mutation', fieldName, subsEnabled);
+                const resolver = ctx.resolvers.addResolver(typeName, fieldName, new graphql_transformer_core_1.TransformerResolver(typeName, fieldName, graphql_transformer_common_1.ResolverResourceIDs.ResolverResourceID(typeName, fieldName), graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(fieldAuthExpression, `${typeName}.${fieldName}.req.vtl`), graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(fieldResponse, `${typeName}.${fieldName}.res.vtl`), ['init'], ['finish']));
+                resolver.setScope(scope);
             }
         };
         this.protectCreateResolver = (ctx, def, typeName, fieldName, acm) => {
@@ -498,7 +507,7 @@ class AuthTransformer extends graphql_transformer_core_1.TransformerAuthBase {
                 roleDefinition.allowedFields = this.addAutoGeneratedFields(ctx, def, allowedFields, fields);
                 return roleDefinition;
             });
-            const authExpression = this.getVtlGenerator(ctx, def.name.value).generateAuthExpressionForCreate(ctx, this.configuredAuthProviders, createRoles, (_a = def.fields) !== null && _a !== void 0 ? _a : []);
+            const authExpression = (0, resolvers_1.generateAuthExpressionForCreate)(ctx, this.configuredAuthProviders, createRoles, (_a = def.fields) !== null && _a !== void 0 ? _a : []);
             resolver.addToSlot('auth', graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(authExpression, `${typeName}.${fieldName}.{slotName}.{slotIndex}.req.vtl`));
         };
         this.protectUpdateResolver = (ctx, def, typeName, fieldName, acm) => {
@@ -516,36 +525,23 @@ class AuthTransformer extends graphql_transformer_core_1.TransformerAuthBase {
                 roleDefinition.nullAllowedFields = nullAllowedFields;
                 return roleDefinition;
             });
-            const { RDSLambdaDataSourceLogicalID } = graphql_transformer_common_1.ResourceConstants.RESOURCES;
-            const dataSource = ((0, graphql_transformer_core_1.isRDSModel)(ctx, def.name.value)
-                ? ctx.api.host.getDataSource(RDSLambdaDataSourceLogicalID)
-                : ctx.api.host.getDataSource(`${def.name.value}Table`));
-            const requestExpression = this.getVtlGenerator(ctx, def.name.value).generateAuthRequestExpression(ctx, def);
-            const authExpression = this.getVtlGenerator(ctx, def.name.value).generateAuthExpressionForUpdate(this.configuredAuthProviders, totalRoles, (_a = def.fields) !== null && _a !== void 0 ? _a : []);
+            const dataSource = ctx.api.host.getDataSource(`${def.name.value}Table`);
+            const requestExpression = (0, resolvers_1.generateAuthRequestExpression)();
+            const authExpression = (0, resolvers_1.generateAuthExpressionForUpdate)(this.configuredAuthProviders, totalRoles, (_a = def.fields) !== null && _a !== void 0 ? _a : []);
             resolver.addToSlot('auth', graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(requestExpression, `${typeName}.${fieldName}.{slotName}.{slotIndex}.req.vtl`), graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(authExpression, `${typeName}.${fieldName}.{slotName}.{slotIndex}.res.vtl`), dataSource);
         };
         this.protectDeleteResolver = (ctx, def, typeName, fieldName, acm) => {
             var _a;
             const resolver = ctx.resolvers.getResolver(typeName, fieldName);
-            const fields = acm.getResources();
-            const deleteRoleNames = acm.getRolesPerOperation('delete', true);
-            const deleteRoles = deleteRoleNames.map((role) => {
-                const allowedFields = fields.filter((resource) => acm.isAllowed(role, resource, 'delete'));
-                const roleDefinition = this.roleMap.get(role);
-                roleDefinition.allowedFields = allowedFields;
-                return roleDefinition;
-            });
-            const { RDSLambdaDataSourceLogicalID } = graphql_transformer_common_1.ResourceConstants.RESOURCES;
-            const dataSource = ((0, graphql_transformer_core_1.isRDSModel)(ctx, def.name.value)
-                ? ctx.api.host.getDataSource(RDSLambdaDataSourceLogicalID)
-                : ctx.api.host.getDataSource(`${def.name.value}Table`));
-            const requestExpression = this.getVtlGenerator(ctx, def.name.value).generateAuthRequestExpression(ctx, def);
-            const authExpression = this.getVtlGenerator(ctx, def.name.value).generateAuthExpressionForDelete(this.configuredAuthProviders, deleteRoles, (_a = def.fields) !== null && _a !== void 0 ? _a : []);
+            const deleteRoles = acm.getRolesPerOperation('delete', true).map((role) => this.roleMap.get(role));
+            const dataSource = ctx.api.host.getDataSource(`${def.name.value}Table`);
+            const requestExpression = (0, resolvers_1.generateAuthRequestExpression)();
+            const authExpression = (0, resolvers_1.generateAuthExpressionForDelete)(this.configuredAuthProviders, deleteRoles, (_a = def.fields) !== null && _a !== void 0 ? _a : []);
             resolver.addToSlot('auth', graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(requestExpression, `${typeName}.${fieldName}.{slotName}.{slotIndex}.req.vtl`), graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(authExpression, `${typeName}.${fieldName}.{slotName}.{slotIndex}.res.vtl`), dataSource);
         };
-        this.protectSubscriptionResolver = (ctx, typeName, fieldName, subscriptionRoles, def) => {
+        this.protectSubscriptionResolver = (ctx, typeName, fieldName, subscriptionRoles) => {
             const resolver = ctx.resolvers.getResolver(typeName, fieldName);
-            const authExpression = this.getVtlGenerator(ctx, def.name.value).generateAuthExpressionForSubscriptions(this.configuredAuthProviders, subscriptionRoles);
+            const authExpression = (0, resolvers_1.generateAuthExpressionForSubscriptions)(this.configuredAuthProviders, subscriptionRoles);
             resolver.addToSlot('auth', graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(authExpression, `${typeName}.${fieldName}.{slotName}.{slotIndex}.req.vtl`));
         };
         this.getRelatedModelObject = (ctx, typeName) => {
@@ -619,9 +615,7 @@ class AuthTransformer extends graphql_transformer_core_1.TransformerAuthBase {
                     if (directive.name.value === 'hasOne' ||
                         (directive.name.value === 'belongsTo' &&
                             relatedType.fields.some((f) => { var _a; return (0, graphql_transformer_common_1.getBaseType)(f.type) === def.name.value && ((_a = f.directives) === null || _a === void 0 ? void 0 : _a.some((d) => d.name.value === 'hasOne')); }))) {
-                        if (!(0, graphql_transformer_core_1.isRDSModel)(ctx, def.name.value)) {
-                            allowedFields.add((0, graphql_relational_transformer_1.getConnectionAttributeName)(ctx.transformParameters, def.name.value, field, (0, graphql_relational_transformer_1.getObjectPrimaryKey)(relatedType).name.value));
-                        }
+                        allowedFields.add((0, graphql_relational_transformer_1.getConnectionAttributeName)(ctx.transformParameters, def.name.value, field, (0, graphql_relational_transformer_1.getObjectPrimaryKey)(relatedType).name.value));
                         (0, graphql_transformer_core_1.getSortKeyFieldNames)(def).forEach((sortKeyFieldName) => {
                             allowedFields.add((0, graphql_relational_transformer_1.getSortKeyConnectionAttributeName)(def.name.value, field, sortKeyFieldName));
                         });
@@ -633,16 +627,6 @@ class AuthTransformer extends graphql_transformer_core_1.TransformerAuthBase {
             const dataStoreFields = ctx.isProjectUsingDataStore() ? ['_version', '_deleted', '_lastChangedAt'] : [];
             dataStoreFields.forEach((item) => allowedFields.add(item));
         };
-        this.getVtlGenerator = (ctx, typename, field) => {
-            if (field && field.directives.some((dir) => dir.name.value === 'sql')) {
-                return new rds_vtl_generator_1.RDSAuthVTLGenerator();
-            }
-            if ((0, graphql_transformer_core_1.isRDSModel)(ctx, typename)) {
-                return new rds_vtl_generator_1.RDSAuthVTLGenerator();
-            }
-            return new ddb_vtl_generator_1.DDBAuthVTLGenerator();
-        };
-        this.config = config;
         this.modelDirectiveConfig = new Map();
         this.seenNonModelTypes = new Map();
         this.authModelConfig = new Map();
@@ -760,7 +744,7 @@ class AuthTransformer extends graphql_transformer_core_1.TransformerAuthBase {
     doesTypeHaveRulesForOperation(acm, operation) {
         const rolesHasDefaultProvider = (roles) => roles.some((r) => this.roleMap.get(r).provider === this.configuredAuthProviders.default);
         const roles = acm.getRolesPerOperation(operation, operation === 'delete');
-        return rolesHasDefaultProvider(roles) || (roles.length === 0 && this.shouldAddDefaultServiceDirective());
+        return rolesHasDefaultProvider(roles) || (roles.length === 0 && this.configuredAuthProviders.shouldAddDefaultServiceDirective);
     }
     getAuthProviders(roles) {
         const providers = new Set();
@@ -828,9 +812,6 @@ class AuthTransformer extends graphql_transformer_core_1.TransformerAuthBase {
         }
         return directives;
     }
-    shouldAddDefaultServiceDirective() {
-        return (this.configuredAuthProviders.hasAdminRolesEnabled && this.config.authConfig.defaultAuthentication.authenticationType !== 'AWS_IAM');
-    }
     generateIAMPolicies(ctx) {
         if (this.generateIAMPolicyForAuthRole) {
             if (this.authPolicyResources.size === 0) {