fix tsc

seatgeek · Feb 25, 2024 · 6186dae · 6186dae
1 parent 6c954a6
commit 6186dae
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 3 deletions.
diff --git a/plugins/awards-backend/src/awards.test.ts b/plugins/awards-backend/src/awards.test.ts
@@ -62,7 +62,7 @@ describe('Awards', () => {
         .mockImplementation(
           async (
             request: GetEntitiesByRefsRequest,
-            options?: CatalogRequestOptions,
+            _?: CatalogRequestOptions,
           ) => {
             return {
               items: request.entityRefs.map(makeUser),

diff --git a/plugins/awards-backend/src/plugin.ts b/plugins/awards-backend/src/plugin.ts
@@ -18,13 +18,24 @@ export const awardsPlugin = createBackendPlugin({
         identity: coreServices.identity,
         logger: coreServices.logger,
         httpRouter: coreServices.httpRouter,
+        discovery: coreServices.discovery,
+        tokenManager: coreServices.tokenManager,
       },
-      async init({ database, identity, logger, httpRouter }) {
+      async init({
+        database,
+        identity,
+        logger,
+        httpRouter,
+        discovery,
+        tokenManager,
+      }) {
         httpRouter.use(
           await createRouter({
             database,
             identity,
             logger: loggerToWinstonLogger(logger),
+            discovery,
+            tokenManager,
           }),
         );
       },

diff --git a/plugins/awards-backend/src/service/router.test.ts b/plugins/awards-backend/src/service/router.test.ts
@@ -55,11 +55,18 @@ describe('backend router', () => {
       ).forPlugin('awards');
     const dbm = await createDatabaseManager();
     db = await dbm.getClient();
-
     const router = await createRouter({
       logger: getVoidLogger(),
       identity: { getIdentity },
       database: dbm,
+      discovery: {
+        getBaseUrl: jest.fn().mockResolvedValue('/'),
+        getExternalBaseUrl: jest.fn().mockResolvedValue('/'),
+      },
+      tokenManager: {
+        authenticate: jest.fn(),
+        getToken: jest.fn().mockResolvedValue({ token: 'token' }),
+      },
     });
     app = express().use(router);
 

diff --git a/plugins/awards-backend/src/service/standaloneServer.ts b/plugins/awards-backend/src/service/standaloneServer.ts
@@ -5,6 +5,7 @@
 import {
   DatabaseManager,
   HostDiscovery,
+  ServerTokenManager,
   createServiceBuilder,
   loadBackendConfig,
 } from '@backstage/backend-common';
@@ -45,6 +46,11 @@ export async function startStandaloneServer(
     database,
     identity,
     logger,
+    config,
+    discovery,
+    tokenManager: ServerTokenManager.fromConfig(config, {
+      logger,
+    }),
   });
 
   let service = createServiceBuilder(module)