From 170282ece69b7468b8ad17e8bbfd0a423b119b06 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Wed, 11 Jan 2023 11:50:32 +0100
Subject: [PATCH] backend-app-api: fix token manager factory

Co-authored-by: Johan Haals <johan.haals@gmail.com>
Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/famous-bees-applaud.md              |  5 +++++
 .../tokenManager/tokenManagerFactory.ts        | 18 +++++++-----------
 2 files changed, 12 insertions(+), 11 deletions(-)
 create mode 100644 .changeset/famous-bees-applaud.md

diff --git a/.changeset/famous-bees-applaud.md b/.changeset/famous-bees-applaud.md
new file mode 100644
index 0000000000..a39b760b5d
--- /dev/null
+++ b/.changeset/famous-bees-applaud.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-app-api': patch
+---
+
+Fixed a bug in the default token manager factory where it created multiple incompatible instances.
diff --git a/packages/backend-app-api/src/services/implementations/tokenManager/tokenManagerFactory.ts b/packages/backend-app-api/src/services/implementations/tokenManager/tokenManagerFactory.ts
index 025830afc7..cbd9e32d20 100644
--- a/packages/backend-app-api/src/services/implementations/tokenManager/tokenManagerFactory.ts
+++ b/packages/backend-app-api/src/services/implementations/tokenManager/tokenManagerFactory.ts
@@ -18,23 +18,19 @@ import {
   coreServices,
   createServiceFactory,
 } from '@backstage/backend-plugin-api';
-import {
-  loggerToWinstonLogger,
-  ServerTokenManager,
-} from '@backstage/backend-common';
+import { ServerTokenManager } from '@backstage/backend-common';
 
 /** @public */
 export const tokenManagerFactory = createServiceFactory({
   service: coreServices.tokenManager,
   deps: {
     config: coreServices.config,
-    logger: coreServices.logger,
+    logger: coreServices.rootLogger,
   },
-  async factory() {
-    return async ({ config, logger }) => {
-      return ServerTokenManager.fromConfig(config, {
-        logger: loggerToWinstonLogger(logger),
-      });
-    };
+  async factory({ config, logger }) {
+    const tokenManager = ServerTokenManager.fromConfig(config, {
+      logger,
+    });
+    return async () => tokenManager;
   },
 });