@aws-amplify/data-schema 1.20.3 → 1.20.5

package/dist/cjs/SchemaProcessor.js

@@ -606,6 +606,7 @@ function getAppSyncAuthDirectiveFromRule(rule) {
 function mapToNativeAppSyncAuthDirectives(authorization, isCustomHandler) {
     const rules = new Set();
     const groupProvider = new Map();
+    const generalProviderUsed = new Set();
     for (const entry of authorization) {
         const rule = (0, Authorization_1.accessData)(entry);
         isCustomHandler && validateCustomHandlerAuthRule(rule);
@@ -617,14 +618,15 @@ function mapToNativeAppSyncAuthDirectives(authorization, isCustomHandler) {
             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(' ');
     return { authString };