@aws-amplify/data-schema 1.20.1 → 1.20.2

package/package.json

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

package/src/SchemaProcessor.ts

@@ -896,6 +896,8 @@ function mapToNativeAppSyncAuthDirectives(
 ) {
   const rules = new Set<string>();
 
+  const groupProvider: Map<string, Set<string>> = new Map();
+
   for (const entry of authorization) {
     const rule = accessData(entry);
 
@@ -904,17 +906,25 @@ function mapToNativeAppSyncAuthDirectives(
     const provider = getAppSyncAuthDirectiveFromRule(rule);
 
     if (rule.groups) {
-      // example: (cognito_groups: ["Bloggers", "Readers"])
+      if(!groupProvider.has(provider)) {
+        groupProvider.set(provider, new Set());
+      };
+      rule.groups.forEach((group) => groupProvider.get(provider)?.add(group));
+    } else {
+      rules.add(provider);
+    }
+
+    groupProvider.forEach((groups, provider) => {
       rules.add(
-        `${provider}(cognito_groups: [${rule.groups
+        `${provider}(cognito_groups: [${Array.from(groups)
           .map((group) => `"${group}"`)
           .join(', ')}])`,
       );
-    } else {
-      rules.add(provider);
-    }
+      // example: (cognito_groups: ["Bloggers", "Readers"])
+    })
   }
 
+
   const authString = [...rules].join(' ');
 
   return { authString };