clean up constructor calls for server lifecycle

Author: pcarleton

src/scenarios/client/auth/basic-dcr.ts

@@ -9,22 +9,20 @@ export class AuthBasicDCRScenario implements Scenario {
   name = 'auth/basic-dcr';
   description =
     'Tests Basic OAuth flow with DCR, PRM at path-based location, OAuth metadata at root location, and no scopes required';
-  private authServer = new ServerLifecycle(() => this.authBaseUrl);
-  private server = new ServerLifecycle(() => this.baseUrl);
+  private authServer = new ServerLifecycle();
+  private server = new ServerLifecycle();
   private checks: ConformanceCheck[] = [];
-  private baseUrl: string = '';
-  private authBaseUrl: string = '';
 
   async start(): Promise<ScenarioUrls> {
     this.checks = [];
 
-    const authApp = createAuthServer(this.checks, () => this.authBaseUrl);
-    this.authBaseUrl = await this.authServer.start(authApp);
+    const authApp = createAuthServer(this.checks, this.authServer.getUrl);
+    await this.authServer.start(authApp);
 
     const app = createServer(
       this.checks,
-      () => this.baseUrl,
-      () => this.authBaseUrl
+      this.server.getUrl,
+      this.authServer.getUrl
     );
 
     // For this scenario, reject PRM requests at root location since we have the path-based PRM.
@@ -58,9 +56,9 @@ export class AuthBasicDCRScenario implements Scenario {
       }
     );
 
-    this.baseUrl = await this.server.start(app);
+    await this.server.start(app);
 
-    return { serverUrl: `${this.baseUrl}/mcp` };
+    return { serverUrl: `${this.server.getUrl()}/mcp` };
   }
 
   async stop() {

src/scenarios/client/auth/basic-metadata-var1.ts

@@ -9,25 +9,23 @@ export class AuthBasicMetadataVar1Scenario implements Scenario {
   name = 'auth/basic-metadata-var1';
   description =
     'Tests Basic OAuth flow with DCR, PRM at root location, OAuth metadata at OpenID discovery path, and no scopes required';
-  private authServer = new ServerLifecycle(() => this.authBaseUrl);
-  private server = new ServerLifecycle(() => this.baseUrl);
+  private authServer = new ServerLifecycle();
+  private server = new ServerLifecycle();
   private checks: ConformanceCheck[] = [];
-  private baseUrl: string = '';
-  private authBaseUrl: string = '';
 
   async start(): Promise<ScenarioUrls> {
     this.checks = [];
 
-    const authApp = createAuthServer(this.checks, () => this.authBaseUrl, {
+    const authApp = createAuthServer(this.checks, this.authServer.getUrl, {
       metadataPath: '/.well-known/openid-configuration',
       isOpenIdConfiguration: true
     });
-    this.authBaseUrl = await this.authServer.start(authApp);
+    await this.authServer.start(authApp);
 
     const app = createServer(
       this.checks,
-      () => this.baseUrl,
-      () => this.authBaseUrl,
+      this.server.getUrl,
+      this.authServer.getUrl,
       {
         // TODO: this will put this path in the WWW-Authenticate header
         // but RFC 9728 states that in that case, the resource in the PRM
@@ -38,9 +36,9 @@ export class AuthBasicMetadataVar1Scenario implements Scenario {
         prmPath: '/.well-known/oauth-protected-resource'
       }
     );
-    this.baseUrl = await this.server.start(app);
+    await this.server.start(app);
 
-    return { serverUrl: `${this.baseUrl}/mcp` };
+    return { serverUrl: `${this.server.getUrl()}/mcp` };
   }
 
   async stop() {

src/scenarios/client/auth/helpers/serverLifecycle.ts

@@ -5,8 +5,6 @@ export class ServerLifecycle {
   private httpServer: any = null;
   private baseUrl: string = '';
 
-  constructor(private getBaseUrl: () => string) {}
-
   async start(app: express.Application): Promise<string> {
     this.app = app;
     this.httpServer = this.app.listen(0);