fix: add datastore query in config for auth (#8246)

aws-amplify · Sep 22, 2021 · 1e0a1a6 · 1e0a1a6
1 parent 74ccef0
commit 1e0a1a6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/packages/amplify-graphql-auth-transformer/src/graphql-auth-transformer.ts b/packages/amplify-graphql-auth-transformer/src/graphql-auth-transformer.ts
@@ -139,7 +139,7 @@ export class AuthTransformer extends TransformerAuthBase implements TransformerA
     this.addTypeToResourceReferences(def.name.value, rules);
     // turn rules into roles and add into acm and roleMap
     this.convertRulesToRoles(acm, rules);
-    this.modelDirectiveConfig.set(typeName, getModelConfig(modelDirective, typeName));
+    this.modelDirectiveConfig.set(typeName, getModelConfig(modelDirective, typeName, context.isProjectUsingDataStore()));
     this.authModelConfig.set(typeName, acm);
   };
 
@@ -188,7 +188,7 @@ Static group authorization should perform as expected.`,
       let acm: AccessControlMatrix;
       // check if the parent is already in the model config if not add it
       if (!this.modelDirectiveConfig.has(typeName)) {
-        this.modelDirectiveConfig.set(typeName, getModelConfig(modelDirective, typeName));
+        this.modelDirectiveConfig.set(typeName, getModelConfig(modelDirective, typeName, context.isProjectUsingDataStore()));
         acm = new AccessControlMatrix({
           operations: MODEL_OPERATIONS,
           resources: collectFieldNames(parent),

diff --git a/packages/amplify-graphql-auth-transformer/src/utils/index.ts b/packages/amplify-graphql-auth-transformer/src/utils/index.ts
@@ -61,12 +61,13 @@ export const ensureAuthRuleDefaults = (rules: AuthRule[]) => {
   }
 };
 
-export const getModelConfig = (directive: DirectiveNode, typeName: string): ModelDirectiveConfiguration => {
+export const getModelConfig = (directive: DirectiveNode, typeName: string, isDataStoreEnabled = false): ModelDirectiveConfiguration => {
   const directiveWrapped: DirectiveWrapper = new DirectiveWrapper(directive);
   const options = directiveWrapped.getArguments<ModelDirectiveConfiguration>({
     queries: {
       get: toCamelCase(['get', typeName]),
       list: toCamelCase(['list', plurality(typeName, true)]),
+      ...(isDataStoreEnabled ? { sync: toCamelCase(['sync', plurality(typeName, true)]) } : undefined),
     },
     mutations: {
       create: toCamelCase(['create', typeName]),

diff --git a/packages/amplify-graphql-auth-transformer/src/utils/schema.ts b/packages/amplify-graphql-auth-transformer/src/utils/schema.ts
@@ -123,12 +123,14 @@ export const getQueryFieldNames = (
       type: QueryFieldType.LIST,
     });
   }
-  // check if this API is sync enabled and then if the model is sync enabled
-  // fields.add({
-  //   typeName: 'Query',
-  //   fieldName: camelCase(`sync ${typeName}`),
-  //   type: QueryFieldType.SYNC,
-  // });
+
+  if (modelDirectiveConfig?.queries?.sync) {
+    fields.add({
+      typeName: 'Query',
+      fieldName: modelDirectiveConfig.queries.sync,
+      type: QueryFieldType.SYNC,
+    });
+  }
   return fields;
 };