permissions: rename authorize request and response types to avoid envelope suffix

Signed-off-by: MT Lewis <mtlewis@users.noreply.github.com>

plugins/permission-node/src/ServerPermissionClient.test.ts

@@ -18,7 +18,7 @@ import { ServerPermissionClient } from './ServerPermissionClient';
 import {
   Permission,
   Identified,
-  AuthorizeRequest,
+  AuthorizeQuery,
   AuthorizeResult,
 } from '@backstage/plugin-permission-common';
 import { ConfigReader } from '@backstage/config';
@@ -32,7 +32,7 @@ import { RestContext, rest } from 'msw';
 
 const server = setupServer();
 const mockAuthorizeHandler = jest.fn((req, res, { json }: RestContext) => {
-  const responses = req.body.items.map((r: Identified<AuthorizeRequest>) => ({
+  const responses = req.body.items.map((r: Identified<AuthorizeQuery>) => ({
     id: r.id,
     result: AuthorizeResult.ALLOW,
   }));

plugins/permission-node/src/ServerPermissionClient.ts

@@ -20,9 +20,9 @@ import {
 } from '@backstage/backend-common';
 import { Config } from '@backstage/config';
 import {
-  AuthorizeRequest,
+  AuthorizeQuery,
   AuthorizeRequestOptions,
-  AuthorizeResponse,
+  AuthorizeDecision,
   AuthorizeResult,
   PermissionClient,
   PermissionAuthorizer,
@@ -78,9 +78,9 @@ export class ServerPermissionClient implements PermissionAuthorizer {
   }
 
   async authorize(
-    requests: AuthorizeRequest[],
+    queries: AuthorizeQuery[],
     options?: AuthorizeRequestOptions,
-  ): Promise<AuthorizeResponse[]> {
+  ): Promise<AuthorizeDecision[]> {
     // Check if permissions are enabled before validating the server token. That
     // way when permissions are disabled, the noop token manager can be used
     // without fouling up the logic inside the ServerPermissionClient, because
@@ -89,9 +89,9 @@ export class ServerPermissionClient implements PermissionAuthorizer {
       !this.permissionEnabled ||
       (await this.isValidServerToken(options?.token))
     ) {
-      return requests.map(_ => ({ result: AuthorizeResult.ALLOW }));
+      return queries.map(_ => ({ result: AuthorizeResult.ALLOW }));
     }
-    return this.permissionClient.authorize(requests, options);
+    return this.permissionClient.authorize(queries, options);
   }
 
   private async isValidServerToken(

plugins/permission-node/src/policy/index.ts

@@ -18,6 +18,6 @@ export type {
   ConditionalPolicyDecision,
   DefinitivePolicyDecision,
   PermissionPolicy,
-  PolicyAuthorizeRequest,
+  PolicyAuthorizeQuery,
   PolicyDecision,
 } from './types';

plugins/permission-node/src/policy/types.ts

@@ -15,7 +15,7 @@
  */
 
 import {
-  AuthorizeRequest,
+  AuthorizeQuery,
   AuthorizeResult,
   PermissionCondition,
   PermissionCriteria,
@@ -27,13 +27,13 @@ import { BackstageIdentityResponse } from '@backstage/plugin-auth-backend';
  *
  * @remarks
  *
- * This differs from {@link @backstage/permission-common#AuthorizeRequest} in that `resourceRef`
+ * This differs from {@link @backstage/permission-common#AuthorizeQuery} in that `resourceRef`
  * should never be provided. This forces policies to be written in a way that's compatible with
  * filtering collections of resources at data load time.
  *
  * @public
  */
-export type PolicyAuthorizeRequest = Omit<AuthorizeRequest, 'resourceRef'>;
+export type PolicyAuthorizeQuery = Omit<AuthorizeQuery, 'resourceRef'>;
 
 /**
  * A definitive result to an authorization request, returned by the {@link PermissionPolicy}.
@@ -57,7 +57,7 @@ export type DefinitivePolicyDecision = {
  * conditions hold when evaluated. The conditions will be evaluated by the corresponding plugin
  * which knows about the referenced permission rules.
  *
- * Similar to {@link @backstage/permission-common#AuthorizeResult}, but with the plugin and resource
+ * Similar to {@link @backstage/permission-common#AuthorizeDecision}, but with the plugin and resource
  * identifiers needed to evaluate the returned conditions.
  * @public
  */
@@ -95,7 +95,7 @@ export type PolicyDecision =
  */
 export interface PermissionPolicy {
   handle(
-    request: PolicyAuthorizeRequest,
+    request: PolicyAuthorizeQuery,
     user?: BackstageIdentityResponse,
   ): Promise<PolicyDecision>;
 }

plugins/permission-node/src/types.ts

@@ -18,7 +18,7 @@ import type { PermissionCriteria } from '@backstage/plugin-permission-common';
 
 /**
  * A conditional rule that can be provided in an
- * {@link @backstage/permission-common#AuthorizeResult} response to an authorization request.
+ * {@link @backstage/permission-common#AuthorizeDecision} response to an authorization request.
  *
  * @remarks
  *