chore: use the new auth adapters

Signed-off-by: blam <ben@blam.sh>

plugins/catalog-backend-module-unprocessed/package.json

@@ -28,12 +28,14 @@
     "postpack": "backstage-cli package postpack"
   },
   "devDependencies": {
-    "@backstage/cli": "workspace:^"
+    "@backstage/cli": "workspace:^",
+    "@types/express": "^4.17.6"
   },
   "files": [
     "dist"
   ],
   "dependencies": {
+    "@backstage/backend-common": "workspace:^",
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/catalog-model": "workspace:^",
     "@backstage/errors": "workspace:^",

plugins/catalog-backend-module-unprocessed/src/UnprocessedEntitiesModule.ts

@@ -21,17 +21,23 @@ import {
   UnprocessedEntitiesResponse,
 } from './types';
 import { Knex } from 'knex';
-import { HttpRouterService } from '@backstage/backend-plugin-api';
+import {
+  DiscoveryService,
+  HttpAuthService,
+  HttpRouterService,
+  PermissionsService,
+} from '@backstage/backend-plugin-api';
 import Router from 'express-promise-router';
-import { getBearerTokenFromAuthorizationHeader } from '@backstage/plugin-auth-node';
+import type { Request } from 'express';
+
 import {
   AuthorizeResult,
   BasicPermission,
-  PermissionEvaluator,
 } from '@backstage/plugin-permission-common';
 import { createPermissionIntegrationRouter } from '@backstage/plugin-permission-node';
 import { unprocessedEntitiesDeletePermission } from '@backstage/plugin-catalog-unprocessed-entities-common';
 import { NotAllowedError } from '@backstage/errors';
+import { createLegacyAuthAdapters } from '@backstage/backend-common';
 
 /**
  * Module providing Unprocessed Entities API endpoints
@@ -41,12 +47,22 @@ import { NotAllowedError } from '@backstage/errors';
 export class UnprocessedEntitiesModule {
   private readonly moduleRouter;
 
+  private readonly httpAuth: HttpAuthService;
+
   constructor(
     private readonly database: Knex,
     private readonly router: Pick<HttpRouterService, 'use'>,
+    private readonly permissions: PermissionsService,
+    discovery: DiscoveryService,
+    httpAuth?: HttpAuthService,
   ) {
     this.moduleRouter = Router();
     this.router.use(this.moduleRouter);
+
+    this.httpAuth = createLegacyAuthAdapters({
+      discovery,
+      httpAuth,
+    }).httpAuth;
   }
 
   private async unprocessed(
@@ -112,7 +128,7 @@ export class UnprocessedEntitiesModule {
     return res;
   }
 
-  registerRoutes({ permissions }: { permissions: PermissionEvaluator }) {
+  registerRoutes() {
     const permissionIntegrationRouter = createPermissionIntegrationRouter({
       permissions: [unprocessedEntitiesDeletePermission],
     });
@@ -121,14 +137,9 @@ export class UnprocessedEntitiesModule {
       req: Request,
       permission: BasicPermission,
     ): Promise<boolean> => {
-      const token = getBearerTokenFromAuthorizationHeader(
-        // @ts-ignore
-        req.header('authorization'),
-      );
-
       const decision = (
-        await permissions.authorize([{ permission }], {
-          token,
+        await this.permissions.authorize([{ permission }], {
+          credentials: await this.httpAuth.credentials(req),
         })
       )[0];
 

plugins/catalog-backend-module-unprocessed/src/module.ts

@@ -34,15 +34,27 @@ export const catalogModuleUnprocessedEntities = createBackendModule({
         database: coreServices.database,
         router: coreServices.httpRouter,
         logger: coreServices.logger,
+        httpAuth: coreServices.httpAuth,
+        discovery: coreServices.discovery,
         permissions: coreServices.permissions,
       },
-      async init({ database, router, logger, permissions }) {
+      async init({
+        database,
+        router,
+        logger,
+        permissions,
+        httpAuth,
+        discovery,
+      }) {
         const module = new UnprocessedEntitiesModule(
           await database.getClient(),
           router,
+          permissions,
+          discovery,
+          httpAuth,
         );
 
-        module.registerRoutes({ permissions });
+        module.registerRoutes();
 
         logger.info(
           'registered additional routes for catalogModuleUnprocessedEntities',

yarn.lock

@@ -5772,6 +5772,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-catalog-backend-module-unprocessed@workspace:plugins/catalog-backend-module-unprocessed"
   dependencies:
+    "@backstage/backend-common": "workspace:^"
     "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/catalog-model": "workspace:^"
     "@backstage/cli": "workspace:^"
@@ -5780,6 +5781,7 @@ __metadata:
     "@backstage/plugin-catalog-unprocessed-entities-common": "workspace:^"
     "@backstage/plugin-permission-common": "workspace:^"
     "@backstage/plugin-permission-node": "workspace:^"
+    "@types/express": ^4.17.6
     express-promise-router: ^4.1.1
     knex: ^3.0.0
   languageName: unknown