From 5e64df0b22fb5441bd36bfd0e181fac3bf6545c2 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Wed, 21 Aug 2024 13:27:20 +0200
Subject: [PATCH] backend-common: review fixes for service shims

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/lucky-sheep-cover.md                     | 2 +-
 packages/backend-common/api-report.md               | 4 ++--
 packages/backend-common/src/compat/legacy/legacy.ts | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.changeset/lucky-sheep-cover.md b/.changeset/lucky-sheep-cover.md
index ea54a14b8c..9b9420a73a 100644
--- a/.changeset/lucky-sheep-cover.md
+++ b/.changeset/lucky-sheep-cover.md
@@ -2,4 +2,4 @@
 '@backstage/backend-common': patch
 ---
 
-The `legacyPlugin` and `makeLeagcyPlugin` helpers now provide their own shim implementation of the identity and token manager services, as these services are being removed from the new backend system.
+The `legacyPlugin` and `makeLegacyPlugin` helpers now provide their own shim implementation of the identity and token manager services, as these services are being removed from the new backend system.
diff --git a/packages/backend-common/api-report.md b/packages/backend-common/api-report.md
index 85885eeabe..b1d752cef2 100644
--- a/packages/backend-common/api-report.md
+++ b/packages/backend-common/api-report.md
@@ -362,7 +362,7 @@ export const legacyPlugin: (
           };
         }
       > & {
-        tokenManager: ServerTokenManager;
+        tokenManager: TokenManager;
         identity: LegacyIdentityService;
       }
     >;
@@ -405,7 +405,7 @@ export function makeLegacyPlugin<
   createRouterImport: Promise<{
     default: LegacyCreateRouter<
       TransformedEnv<TEnv, TEnvTransforms> & {
-        tokenManager: ServerTokenManager;
+        tokenManager: TokenManager;
         identity: LegacyIdentityService;
       }
     >;
diff --git a/packages/backend-common/src/compat/legacy/legacy.ts b/packages/backend-common/src/compat/legacy/legacy.ts
index 1ca8fb7482..dc4ddbcdf0 100644
--- a/packages/backend-common/src/compat/legacy/legacy.ts
+++ b/packages/backend-common/src/compat/legacy/legacy.ts
@@ -76,7 +76,7 @@ function createTokenManagerShim(
 }
 
 /**
- * Originally IdentityApi from `@backstage/plugin-auth-node`, not re-declared here for backwards compatibility
+ * Originally IdentityApi from `@backstage/plugin-auth-node`, re-declared here for backwards compatibility
  * @public
  * @deprecated Only relevant for legacy plugins, which are deprecated.
  */
@@ -154,7 +154,7 @@ export function makeLegacyPlugin<
     createRouterImport: Promise<{
       default: LegacyCreateRouter<
         TransformedEnv<TEnv, TEnvTransforms> & {
-          tokenManager: ServerTokenManager;
+          tokenManager: TokenManager;
           identity: LegacyIdentityService;
         }
       >;
@@ -207,7 +207,7 @@ export function makeLegacyPlugin<
 
             const pluginRouter = await createRouter(
               pluginEnv as TransformedEnv<TEnv, TEnvTransforms> & {
-                tokenManager: ServerTokenManager;
+                tokenManager: TokenManager;
                 identity: LegacyIdentityService;
               },
             );