@aws-amplify/data-schema 1.20.4 → 1.20.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/data-schema",
-  "version": "1.20.4",
+  "version": "1.20.5",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",

package/src/SchemaProcessor.ts

@@ -897,6 +897,7 @@ function mapToNativeAppSyncAuthDirectives(
   const rules = new Set<string>();
 
   const groupProvider: Map<string, Set<string>> = new Map();
+  const generalProviderUsed = new Set<string>();
 
   for (const entry of authorization) {
     const rule = accessData(entry);
@@ -911,17 +912,20 @@ function mapToNativeAppSyncAuthDirectives(
       };
       rule.groups.forEach((group) => groupProvider.get(provider)?.add(group));
     } else {
+      generalProviderUsed.add(provider);
       rules.add(provider);
     }
   }
 
   groupProvider.forEach((groups, provider) => {
-    rules.add(
-      `${provider}(cognito_groups: [${Array.from(groups)
-        .map((group) => `"${group}"`)
-        .join(', ')}])`,
-    );
-    // example: (cognito_groups: ["Bloggers", "Readers"])
+    if(!generalProviderUsed.has(provider)) {
+      rules.add(
+        `${provider}(cognito_groups: [${Array.from(groups).reduce((acc, group) => 
+          acc == "" ? `"${group}"` : `${acc}, "${group}"`
+        , "")}])`
+      );
+      // example: (cognito_groups: ["Bloggers", "Readers"])
+    }
   })
 
   const authString = [...rules].join(' ');