From afb7535c2eb3c45b136cb41b7b831391d7b755af Mon Sep 17 00:00:00 2001
From: Vincenzo Scamporlino <me@vinzscam.dev>
Date: Thu, 31 Mar 2022 10:00:05 +0200
Subject: [PATCH] Use PermissionEvaluator instead of ServerPermissionClient

Signed-off-by: Vincenzo Scamporlino <me@vinzscam.dev>
---
 .changeset/four-dolphins-report.md                          | 4 ++--
 .changeset/rare-parents-pretend.md                          | 6 +++---
 packages/backend/src/types.ts                               | 4 ++--
 .../templates/default-app/packages/backend/src/types.ts     | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.changeset/four-dolphins-report.md b/.changeset/four-dolphins-report.md
index 52bbbac1e8..ff0178c9f6 100644
--- a/.changeset/four-dolphins-report.md
+++ b/.changeset/four-dolphins-report.md
@@ -1,5 +1,5 @@
 ---
-'@backstage/plugin-permission-node': patch
+'@backstage/plugin-permission-node': minor
 ---
 
-Use new `PermissionEvaluator#query` method in `ServerPermissionClient` and test suites.
+**BREAKING:** `ServerPermissionClient` now implements `PermissionEvaluator`, which moves out the capabilities for evaluating conditional decisions from `authorize()` to `query()` method.
diff --git a/.changeset/rare-parents-pretend.md b/.changeset/rare-parents-pretend.md
index b483666e66..cb97c6999e 100644
--- a/.changeset/rare-parents-pretend.md
+++ b/.changeset/rare-parents-pretend.md
@@ -2,13 +2,13 @@
 '@backstage/create-app': patch
 ---
 
-Use `ServerPermissionClient` instead of `PermissionAuthorizer`.
+Use `PermissionEvaluator` instead of `PermissionAuthorizer`.
 
 Apply the following to `packages/backend/src/types.ts`:
 
 ```diff
 - import { PermissionAuthorizer } from '@backstage/plugin-permission-common';
-+ import { ServerPermissionClient } from '@backstage/plugin-permission-node';
++ import { PermissionEvaluator } from '@backstage/plugin-permission-common';
 
   export type PluginEnvironment = {
     ...
@@ -16,6 +16,6 @@ Apply the following to `packages/backend/src/types.ts`:
     tokenManager: TokenManager;
     scheduler: PluginTaskScheduler;
 -   permissions: PermissionAuthorizer;
-+   permissions: ServerPermissionClient;
++   permissions: PermissionEvaluator;
   };
 ```
diff --git a/packages/backend/src/types.ts b/packages/backend/src/types.ts
index 0b2543c4f5..d1f62d833b 100644
--- a/packages/backend/src/types.ts
+++ b/packages/backend/src/types.ts
@@ -23,8 +23,8 @@ import {
   TokenManager,
   UrlReader,
 } from '@backstage/backend-common';
-import { ServerPermissionClient } from '@backstage/plugin-permission-node';
 import { PluginTaskScheduler } from '@backstage/backend-tasks';
+import { PermissionEvaluator } from '@backstage/plugin-permission-common';
 
 export type PluginEnvironment = {
   logger: Logger;
@@ -34,6 +34,6 @@ export type PluginEnvironment = {
   reader: UrlReader;
   discovery: PluginEndpointDiscovery;
   tokenManager: TokenManager;
-  permissions: ServerPermissionClient;
+  permissions: PermissionEvaluator;
   scheduler: PluginTaskScheduler;
 };
diff --git a/packages/create-app/templates/default-app/packages/backend/src/types.ts b/packages/create-app/templates/default-app/packages/backend/src/types.ts
index 7984b7361f..8e0a86404b 100644
--- a/packages/create-app/templates/default-app/packages/backend/src/types.ts
+++ b/packages/create-app/templates/default-app/packages/backend/src/types.ts
@@ -8,7 +8,7 @@ import {
   UrlReader,
 } from '@backstage/backend-common';
 import { PluginTaskScheduler } from '@backstage/backend-tasks';
-import { ServerPermissionClient } from '@backstage/plugin-permission-node';
+import { PermissionEvaluator } from '@backstage/plugin-permission-common';
 
 export type PluginEnvironment = {
   logger: Logger;
@@ -19,5 +19,5 @@ export type PluginEnvironment = {
   discovery: PluginEndpointDiscovery;
   tokenManager: TokenManager;
   scheduler: PluginTaskScheduler;
-  permissions: ServerPermissionClient;
+  permissions: PermissionEvaluator;
 };