fix dup logging, rm prm

Author: pcarleton

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

@@ -5,6 +5,7 @@ import { createRequestLogger } from '../../../request-logger.js';
 export interface AuthServerOptions {
   metadataPath?: string;
   isOpenIdConfiguration?: boolean;
+  loggingEnabled?: boolean;
 }
 
 export function createAuthServer(
@@ -14,18 +15,21 @@ export function createAuthServer(
 ): express.Application {
   const {
     metadataPath = '/.well-known/oauth-authorization-server',
-    isOpenIdConfiguration = false
+    isOpenIdConfiguration = false,
+    loggingEnabled = true
   } = options;
   const app = express();
   app.use(express.json());
   app.use(express.urlencoded({ extended: true }));
 
-  app.use(
-    createRequestLogger(checks, {
-      incomingId: 'incoming-auth-request',
-      outgoingId: 'outgoing-auth-response'
-    })
-  );
+  if (loggingEnabled) {
+    app.use(
+      createRequestLogger(checks, {
+        incomingId: 'incoming-auth-request',
+        outgoingId: 'outgoing-auth-response'
+      })
+    );
+  }
 
   app.get(metadataPath, (req: Request, res: Response) => {
     checks.push({

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

@@ -8,7 +8,7 @@ import { createRequestLogger } from '../../../request-logger.js';
 import { MockTokenVerifier } from './mockTokenVerifier.js';
 
 export interface ServerOptions {
-  prmPath?: string;
+  prmPath?: string | null;
 }
 
 export function createServer(
@@ -47,30 +47,32 @@ export function createServer(
     })
   );
 
-  app.get(prmPath, (req: Request, res: Response) => {
-    checks.push({
-      id: 'prm-pathbased-requested',
-      name: 'PRMPathBasedRequested',
-      description: 'Client requested PRM metadata at path-based location',
-      status: 'SUCCESS',
-      timestamp: new Date().toISOString(),
-      specReferences: [
-        {
-          id: 'RFC-9728-3',
-          url: 'https://tools.ietf.org/html/rfc9728#section-3'
+  if (prmPath !== null) {
+    app.get(prmPath, (req: Request, res: Response) => {
+      checks.push({
+        id: 'prm-pathbased-requested',
+        name: 'PRMPathBasedRequested',
+        description: 'Client requested PRM metadata at path-based location',
+        status: 'SUCCESS',
+        timestamp: new Date().toISOString(),
+        specReferences: [
+          {
+            id: 'RFC-9728-3',
+            url: 'https://tools.ietf.org/html/rfc9728#section-3'
+          }
+        ],
+        details: {
+          url: req.url,
+          path: req.path
         }
-      ],
-      details: {
-        url: req.url,
-        path: req.path
-      }
-    });
+      });
 
-    res.json({
-      resource: getBaseUrl(),
-      authorization_servers: [getAuthServerUrl()]
+      res.json({
+        resource: getBaseUrl(),
+        authorization_servers: [getAuthServerUrl()]
+      });
     });
-  });
+  }
 
   app.post('/mcp', async (req: Request, res: Response, next: NextFunction) => {
     // Apply bearer token auth per-request in order to delay setting PRM URL

src/scenarios/client/auth/march-spec-backcompat.ts

@@ -17,11 +17,16 @@ export class AuthMarchSpecBackcompatScenario implements Scenario {
 
     // Legacy server, so we create the auth server endpoints on the
     // same URL as the main server (rather than separating AS / RS).
-    const authApp = createAuthServer(this.checks, this.server.getUrl);
+    const authApp = createAuthServer(this.checks, this.server.getUrl, {
+      // Disable logging since the main server will already have logging enabled
+      loggingEnabled: false
+    });
     const app = createServer(
       this.checks,
       this.server.getUrl,
-      this.server.getUrl
+      this.server.getUrl,
+      // Explicitly set to null to indicate no PRM available
+      { prmPath: null }
     );
     app.use(authApp);