From 13bb2ee787ef34eb30f16aa12c1607c94745bcd0 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 27 Feb 2024 09:48:58 +0100
Subject: [PATCH] backend-app-api: make sure auth service is compatible with
 existing plugins in dev

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../auth/authServiceFactory.test.ts           |  2 ++
 .../auth/authServiceFactory.ts                | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/backend-app-api/src/services/implementations/auth/authServiceFactory.test.ts b/packages/backend-app-api/src/services/implementations/auth/authServiceFactory.test.ts
index f24264930a..4600110b5c 100644
--- a/packages/backend-app-api/src/services/implementations/auth/authServiceFactory.test.ts
+++ b/packages/backend-app-api/src/services/implementations/auth/authServiceFactory.test.ts
@@ -28,10 +28,12 @@ import {
   BackstageServicePrincipal,
   BackstageUserPrincipal,
 } from '@backstage/backend-plugin-api';
+import { tokenManagerServiceFactory } from '../tokenManager';
 
 // TODO: Ship discovery mock service in the service factory tester
 const mockDeps = [
   discoveryServiceFactory(),
+  tokenManagerServiceFactory,
   mockServices.rootConfig.factory({
     data: {
       backend: {
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 72d5635f61..19dfbe1299 100644
--- a/packages/backend-app-api/src/services/implementations/auth/authServiceFactory.ts
+++ b/packages/backend-app-api/src/services/implementations/auth/authServiceFactory.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { ServerTokenManager, TokenManager } from '@backstage/backend-common';
+import { TokenManager } from '@backstage/backend-common';
 import {
   AuthService,
   BackstageCredentials,
@@ -27,10 +27,7 @@ import {
   createServiceFactory,
 } from '@backstage/backend-plugin-api';
 import { AuthenticationError } from '@backstage/errors';
-import {
-  DefaultIdentityClient,
-  IdentityApiGetIdentityRequest,
-} from '@backstage/plugin-auth-node';
+import { IdentityApiGetIdentityRequest } from '@backstage/plugin-auth-node';
 import { decodeJwt } from 'jose';
 
 /** @internal */
@@ -204,14 +201,15 @@ export const authServiceFactory = createServiceFactory({
   deps: {
     config: coreServices.rootConfig,
     logger: coreServices.rootLogger,
-    discovery: coreServices.discovery,
     plugin: coreServices.pluginMetadata,
+    identity: coreServices.identity,
+    // Re-using the token manager makes sure that we use the same generated keys for
+    // development as plugins that have not yet been migrated. It's important that this
+    // keeps working as long as there are plugins that have not been migrated to the
+    // new auth services in the new backend system.
+    tokenManager: coreServices.tokenManager,
   },
-  createRootContext({ config, logger }) {
-    return ServerTokenManager.fromConfig(config, { logger });
-  },
-  async factory({ discovery, config, plugin }, tokenManager) {
-    const identity = DefaultIdentityClient.create({ discovery });
+  async factory({ config, plugin, identity, tokenManager }) {
     const disableDefaultAuthPolicy = Boolean(
       config.getOptionalBoolean(
         'backend.auth.dangerouslyDisableDefaultAuthPolicy',