From a8eeaa13b434297b4e87442c76fedf08cab05b39 Mon Sep 17 00:00:00 2001
From: MT Lewis <mtlewis@users.noreply.github.com>
Date: Fri, 26 Nov 2021 13:38:32 +0000
Subject: [PATCH] backend-common: refactor away namespace usage in
 ServerTokenManager

Signed-off-by: MT Lewis <mtlewis@users.noreply.github.com>
---
 packages/backend-common/api-report.md         | 14 +--------
 .../src/tokens/ServerTokenManager.ts          | 31 ++++++-------------
 2 files changed, 11 insertions(+), 34 deletions(-)

diff --git a/packages/backend-common/api-report.md b/packages/backend-common/api-report.md
index 6efc504fc5..9c66c0573e 100644
--- a/packages/backend-common/api-report.md
+++ b/packages/backend-common/api-report.md
@@ -537,19 +537,7 @@ export class ServerTokenManager implements TokenManager {
     token: string;
   }>;
   // (undocumented)
-  static noop(): ServerTokenManager.NoopTokenManager;
-}
-
-// @public (undocumented)
-export namespace ServerTokenManager {
-  export class NoopTokenManager implements TokenManager {
-    // (undocumented)
-    authenticate(): Promise<void>;
-    // (undocumented)
-    getToken(): Promise<{
-      token: string;
-    }>;
-  }
+  static noop(): TokenManager;
 }
 
 // @public (undocumented)
diff --git a/packages/backend-common/src/tokens/ServerTokenManager.ts b/packages/backend-common/src/tokens/ServerTokenManager.ts
index 2eeb7b5506..35a07509b6 100644
--- a/packages/backend-common/src/tokens/ServerTokenManager.ts
+++ b/packages/backend-common/src/tokens/ServerTokenManager.ts
@@ -19,6 +19,14 @@ import { Config } from '@backstage/config';
 import { AuthenticationError } from '@backstage/errors';
 import { TokenManager } from './types';
 
+class NoopTokenManager implements TokenManager {
+  async getToken() {
+    return { token: '' };
+  }
+
+  async authenticate() {}
+}
+
 /**
  * Creates and validates tokens for use during backend-to-backend
  * authentication.
@@ -29,8 +37,8 @@ export class ServerTokenManager implements TokenManager {
   private readonly verificationKeys: JWKS.KeyStore;
   private readonly signingKey: JWK.Key;
 
-  static noop() {
-    return new ServerTokenManager.NoopTokenManager();
+  static noop(): TokenManager {
+    return new NoopTokenManager();
   }
 
   static fromConfig(config: Config) {
@@ -70,22 +78,3 @@ export class ServerTokenManager implements TokenManager {
     }
   }
 }
-
-/**
- * @public
- */
-export namespace ServerTokenManager {
-  /**
-   * Stub token manager which returns empty tokens and always
-   * authenticates successfully.
-   *
-   * @public
-   */
-  export class NoopTokenManager implements TokenManager {
-    async getToken() {
-      return { token: '' };
-    }
-
-    async authenticate() {}
-  }
-}