backend-plugin-api,permission-node: remove deprecated token option from permissions service

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>

packages/backend-plugin-api/api-report.md

@@ -9,6 +9,7 @@ import { AuthorizePermissionRequest } from '@backstage/plugin-permission-common'
 import { AuthorizePermissionResponse } from '@backstage/plugin-permission-common';
 import { Config } from '@backstage/config';
 import { Duration } from 'luxon';
+import { EvaluatorRequestOptions } from '@backstage/plugin-permission-common';
 import { Handler } from 'express';
 import { HumanDuration } from '@backstage/types';
 import { IdentityApi } from '@backstage/plugin-auth-node';
@@ -423,22 +424,20 @@ export interface LoggerService {
 export interface PermissionsService extends PermissionEvaluator {
   authorize(
     requests: AuthorizePermissionRequest[],
-    options?: PermissionsServiceRequestOptions,
+    options: PermissionsServiceRequestOptions,
   ): Promise<AuthorizePermissionResponse[]>;
   authorizeConditional(
     requests: QueryPermissionRequest[],
-    options?: PermissionsServiceRequestOptions,
+    options: PermissionsServiceRequestOptions,
   ): Promise<QueryPermissionResponse[]>;
 }
 
 // @public
-export type PermissionsServiceRequestOptions =
-  | {
-      token?: string;
-    }
-  | {
-      credentials: BackstageCredentials;
-    };
+export interface PermissionsServiceRequestOptions
+  extends EvaluatorRequestOptions {
+  // (undocumented)
+  credentials: BackstageCredentials;
+}
 
 // @public
 export interface PluginMetadataService {

packages/backend-plugin-api/src/services/definitions/PermissionsService.ts

@@ -17,6 +17,7 @@
 import {
   AuthorizePermissionRequest,
   AuthorizePermissionResponse,
+  EvaluatorRequestOptions,
   PermissionEvaluator,
   QueryPermissionRequest,
   QueryPermissionResponse,
@@ -24,18 +25,14 @@ import {
 import { BackstageCredentials } from './AuthService';
 
 /**
- * Options for {@link @backstage/plugin-permission-common#PermissionEvaluator} requests.
+ * Options for {@link PermissionsService} requests.
  *
  * @public
  */
-export type PermissionsServiceRequestOptions =
-  | {
-      /** @deprecated use the `credentials` option instead. */
-      token?: string;
-    }
-  | {
-      credentials: BackstageCredentials;
-    };
+export interface PermissionsServiceRequestOptions
+  extends EvaluatorRequestOptions {
+  credentials: BackstageCredentials;
+}
 
 /**
  * Permission system integration for authorization of user/service actions.
@@ -59,7 +56,7 @@ export interface PermissionsService extends PermissionEvaluator {
    */
   authorize(
     requests: AuthorizePermissionRequest[],
-    options?: PermissionsServiceRequestOptions,
+    options: PermissionsServiceRequestOptions,
   ): Promise<AuthorizePermissionResponse[]>;
 
   /**
@@ -79,6 +76,6 @@ export interface PermissionsService extends PermissionEvaluator {
    */
   authorizeConditional(
     requests: QueryPermissionRequest[],
-    options?: PermissionsServiceRequestOptions,
+    options: PermissionsServiceRequestOptions,
   ): Promise<QueryPermissionResponse[]>;
 }