From 8c861be144569b9a2243f57a87848045bae711b1 Mon Sep 17 00:00:00 2001
From: Vincenzo Scamporlino <vincenzos@spotify.com>
Date: Tue, 26 Mar 2024 20:02:55 +0100
Subject: [PATCH] backend-app-api: fix typings

Signed-off-by: Vincenzo Scamporlino <vincenzos@spotify.com>
---
 .../src/services/implementations/auth/authServiceFactory.ts  | 5 -----
 .../publicKeyStore/publicKeyStoreServiceFactory.ts           | 4 ++--
 .../src/services/definitions/PublicKeyStoreService.ts        | 2 +-
 yarn.lock                                                    | 3 +++
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/backend-app-api/src/services/implementations/auth/authServiceFactory.ts b/packages/backend-app-api/src/services/implementations/auth/authServiceFactory.ts
index f1e7d4b8ef..c380040b64 100644
--- a/packages/backend-app-api/src/services/implementations/auth/authServiceFactory.ts
+++ b/packages/backend-app-api/src/services/implementations/auth/authServiceFactory.ts
@@ -25,7 +25,6 @@ import {
   coreServices,
   createServiceFactory,
   DatabaseService,
-  AnyJWK,
 } from '@backstage/backend-plugin-api';
 import { AuthenticationError } from '@backstage/errors';
 import { decodeJwt } from 'jose';
@@ -230,10 +229,6 @@ class DefaultAuthService implements AuthService {
     }
     return new Date(exp * 1000);
   }
-
-  listPublicKeys(): Promise<AnyJWK[]> {
-    return this.pluginTokenHandler.listPublicKeys();
-  }
 }
 
 /** @public */
diff --git a/packages/backend-app-api/src/services/implementations/publicKeyStore/publicKeyStoreServiceFactory.ts b/packages/backend-app-api/src/services/implementations/publicKeyStore/publicKeyStoreServiceFactory.ts
index 3251f1bf99..cb2c346376 100644
--- a/packages/backend-app-api/src/services/implementations/publicKeyStore/publicKeyStoreServiceFactory.ts
+++ b/packages/backend-app-api/src/services/implementations/publicKeyStore/publicKeyStoreServiceFactory.ts
@@ -39,7 +39,7 @@ export class DatabaseKeyStore implements PublicKeyStoreService {
     id: string;
     key: JsonObject & { kid: string };
     expiresAt: Date;
-  }): Promise<void> {
+  }) {
     await this.client<Row>(TABLE).insert({
       id: options.key.kid,
       key: JSON.stringify(options.key),
@@ -48,7 +48,7 @@ export class DatabaseKeyStore implements PublicKeyStoreService {
     });
   }
 
-  async listKeys(): Promise<{ keys: { key: JsonObject; expiresAt: Date }[] }> {
+  async listKeys() {
     const rows = await this.client<Row>(TABLE).select();
 
     // TODO: move over filter/delete the logic from listPublicKeys() in plugins/auth-backend/src/identity/TokenFactory.ts
diff --git a/packages/backend-plugin-api/src/services/definitions/PublicKeyStoreService.ts b/packages/backend-plugin-api/src/services/definitions/PublicKeyStoreService.ts
index 68ba2ad0c9..6f4f80e534 100644
--- a/packages/backend-plugin-api/src/services/definitions/PublicKeyStoreService.ts
+++ b/packages/backend-plugin-api/src/services/definitions/PublicKeyStoreService.ts
@@ -20,7 +20,7 @@ import { JsonObject } from '@backstage/types';
  * @public
  */
 export interface PublicKeyStoreService {
-  listKeys(): Promise<{ keys: JsonObject[] }>;
+  listKeys(): Promise<{ keys: { key: JsonObject; expiresAt: Date }[] }>;
   addKey(options: {
     id: string;
     key: JsonObject;
diff --git a/yarn.lock b/yarn.lock
index d96b24dbbe..aeaba30baf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3300,8 +3300,10 @@ __metadata:
     helmet: ^6.0.0
     http-errors: ^2.0.0
     jose: ^5.0.0
+    knex: ^3.0.0
     lodash: ^4.17.21
     logform: ^2.3.2
+    luxon: ^3.0.0
     minimatch: ^9.0.0
     minimist: ^1.2.5
     morgan: ^1.10.0
@@ -3311,6 +3313,7 @@ __metadata:
     selfsigned: ^2.0.0
     stoppable: ^1.1.0
     supertest: ^6.1.3
+    uuid: ^9.0.0
     winston: ^3.2.1
     winston-transport: ^4.5.0
   languageName: unknown