From 16032660cd3ef8e189b0f0c621b997beae7c7057 Mon Sep 17 00:00:00 2001
From: Vincenzo Scamporlino <vincenzos@spotify.com>
Date: Fri, 7 Mar 2025 12:58:52 +0100
Subject: [PATCH 1/2] catalog-backend: use rules from permissionsRegistry

Signed-off-by: Vincenzo Scamporlino <vincenzos@spotify.com>
---
 plugins/catalog-backend/src/service/CatalogBuilder.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/catalog-backend/src/service/CatalogBuilder.ts b/plugins/catalog-backend/src/service/CatalogBuilder.ts
index fe7f9d8bb5..99752ca5cf 100644
--- a/plugins/catalog-backend/src/service/CatalogBuilder.ts
+++ b/plugins/catalog-backend/src/service/CatalogBuilder.ts
@@ -557,7 +557,13 @@ export class CatalogBuilder {
     const entitiesCatalog = new AuthorizedEntitiesCatalog(
       unauthorizedEntitiesCatalog,
       permissionsService,
-      createConditionTransformer(this.permissionRules),
+      permissionsRegistry
+        ? createConditionTransformer(
+            permissionsRegistry.getPermissionRuleset(
+              catalogEntityPermissionResourceRef,
+            ),
+          )
+        : createConditionTransformer(this.permissionRules),
     );
 
     const getResources = async (resourceRefs: string[]) => {

From 5243aa4104ad16e2461f57e7be56e897217f31b3 Mon Sep 17 00:00:00 2001
From: Vincenzo Scamporlino <vincenzos@spotify.com>
Date: Fri, 7 Mar 2025 13:02:10 +0100
Subject: [PATCH 2/2] catalog-backend: changeset

Signed-off-by: Vincenzo Scamporlino <vincenzos@spotify.com>
---
 .changeset/quick-schools-grin.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/quick-schools-grin.md

diff --git a/.changeset/quick-schools-grin.md b/.changeset/quick-schools-grin.md
new file mode 100644
index 0000000000..a659a1bcb2
--- /dev/null
+++ b/.changeset/quick-schools-grin.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Fixed an issue occurred when authorizing permissions using custom rules passed via the `PermissionsRegistryService`.