From 8cc5835c38f892f295e70a72d1a1592d3f7bd3a1 Mon Sep 17 00:00:00 2001
From: Deepankumar Loganathan <deepan0433@gmail.com>
Date: Thu, 9 Nov 2023 14:07:06 +0100
Subject: [PATCH] comments & plugin fixed

Signed-off-by: Deepankumar Loganathan <deepan0433@gmail.com>
---
 packages/backend/src/plugins/azure-sites.ts |  6 +++++-
 packages/backend/src/plugins/permission.ts  | 15 ---------------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/packages/backend/src/plugins/azure-sites.ts b/packages/backend/src/plugins/azure-sites.ts
index 7e3f53092b..54c7746cb2 100644
--- a/packages/backend/src/plugins/azure-sites.ts
+++ b/packages/backend/src/plugins/azure-sites.ts
@@ -19,12 +19,16 @@ import {
 } from '@backstage/plugin-azure-sites-backend';
 import { Router } from 'express';
 import { PluginEnvironment } from '../types';
+import { CatalogClient } from '@backstage/catalog-client';
 
 export default async function createPlugin(
   env: PluginEnvironment,
 ): Promise<Router> {
+  const catalogApi = new CatalogClient({ discoveryApi: env.discovery });
   return await createRouter({
-    ...env,
+    logger: env.logger,
+    permissions: env.permissions,
     azureSitesApi: AzureSitesApi.fromConfig(env.config),
+    catalogApi,
   });
 }
diff --git a/packages/backend/src/plugins/permission.ts b/packages/backend/src/plugins/permission.ts
index 8d8116e627..7192a1ddec 100644
--- a/packages/backend/src/plugins/permission.ts
+++ b/packages/backend/src/plugins/permission.ts
@@ -19,7 +19,6 @@ import { createRouter } from '@backstage/plugin-permission-backend';
 import {
   AuthorizeResult,
   PolicyDecision,
-  isPermission,
 } from '@backstage/plugin-permission-common';
 import {
   PermissionPolicy,
@@ -31,11 +30,6 @@ import {
 } from '@backstage/plugin-playlist-backend';
 import { Router } from 'express';
 import { PluginEnvironment } from '../types';
-import { azureSitesActionPermission } from '@backstage/plugin-azure-sites-common';
-import {
-  catalogConditions,
-  createCatalogConditionalDecision,
-} from '@backstage/plugin-catalog-backend/alpha';
 
 class ExamplePermissionPolicy implements PermissionPolicy {
   private playlistPermissionPolicy = new DefaultPlaylistPermissionPolicy();
@@ -48,15 +42,6 @@ class ExamplePermissionPolicy implements PermissionPolicy {
       return this.playlistPermissionPolicy.handle(request, user);
     }
 
-    if (isPermission(request.permission, azureSitesActionPermission)) {
-      return createCatalogConditionalDecision(
-        request.permission,
-        catalogConditions.isEntityOwner({
-          claims: user?.identity.ownershipEntityRefs ?? [],
-        }),
-      );
-    }
-
     return {
       result: AuthorizeResult.ALLOW,
     };