fix: make sure existing modified permissions are not overwritten (#424)

* fix: make sure existing modified permissions are not overwritten * chore: add changeset
nhost · Nov 13, 2023 · 003cfd6 · 003cfd6
1 parent ffba7d8
commit 003cfd6
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/.changeset/brown-shoes-pump.md b/.changeset/brown-shoes-pump.md
@@ -0,0 +1,5 @@
+---
+'hasura-auth': patch
+---
+
+fix: make sure existing modified permissions are not overwritten
diff --git a/src/utils/hasura-metadata/helpers.ts b/src/utils/hasura-metadata/helpers.ts
@@ -115,16 +115,34 @@ export const patchTableObject = (
   }
 
   if (select_permissions) {
-    const mergedSelectPermissions = [...(existingTable.select_permissions ?? []), ...select_permissions];
+    const mergedSelectPermissions = [
+      ...select_permissions,
+      ...(existingTable.select_permissions ?? []),
+    ];
+
     existingTable.select_permissions = [
-      ...new Map(mergedSelectPermissions.map((permission) => [permission.role, permission])).values()
+      ...new Map(
+        mergedSelectPermissions.map((permission) => [
+          permission.role,
+          permission,
+        ])
+      ).values(),
     ];
   }
 
   if (delete_permissions) {
-    const mergedDeletePermissions = [...(existingTable.delete_permissions ?? []), ...delete_permissions];
+    const mergedDeletePermissions = [
+      ...delete_permissions,
+      ...(existingTable.delete_permissions ?? []),
+    ];
+
     existingTable.delete_permissions = [
-      ...new Map(mergedDeletePermissions.map((permission) => [permission.role, permission])).values()
+      ...new Map(
+        mergedDeletePermissions.map((permission) => [
+          permission.role,
+          permission,
+        ])
+      ).values(),
     ];
   }