Fix permission query after rebase

opsmill · Jul 26, 2024 · 8d3cc2c · 8d3cc2c
1 parent a2cb304
commit 8d3cc2c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/backend/infrahub/core/account.py b/backend/infrahub/core/account.py
@@ -32,7 +32,7 @@ async def query_init(self, db: InfrahubDatabase, **kwargs: Any) -> None:
 
         # ruff: noqa: E501
         query = """
-        MATCH (account:CoreAccount { uuid: $account_id })-[]->(:Relationship {name: "usergroup__users"})<-[]-(group:CoreUserGroup)-[]->(:Relationship {name: "role__usergroups"})<-[]-(role:CoreUserRole)-[]->(:Relationship {name: "role__permissions"})<-[]-(permission:CoreBasePermission)-[:HAS_ATTRIBUTE]->(:Attribute {name: "action"})-[:HAS_VALUE]->(permission_action:AttributeValue)
+        MATCH (account:CoreGenericAccount { uuid: $account_id })-[]->(:Relationship {name: "usergroup__users"})<-[]-(group:CoreUserGroup)-[]->(:Relationship {name: "role__usergroups"})<-[]-(role:CoreUserRole)-[]->(:Relationship {name: "role__permissions"})<-[]-(permission:CoreBasePermission)-[:HAS_ATTRIBUTE]->(:Attribute {name: "action"})-[:HAS_VALUE]->(permission_action:AttributeValue)
         """
 
         self.add_to_query(query)

diff --git a/backend/infrahub/core/schema/definitions/core.py b/backend/infrahub/core/schema/definitions/core.py
@@ -736,7 +736,14 @@
                 },
             ],
             "relationships": [
-                {"name": "tokens", "peer": InfrahubKind.ACCOUNTTOKEN, "optional": True, "cardinality": "many"}
+                {"name": "tokens", "peer": InfrahubKind.ACCOUNTTOKEN, "optional": True, "cardinality": "many"},
+                {
+                    "name": "groups",
+                    "peer": InfrahubKind.USERGROUP,
+                    "optional": True,
+                    "identifier": "usergroup__users",
+                    "cardinality": "many",
+                },
             ],
         },
         {