Merge branch 'feature/SSISDK-73_well-known-draftv1' into feature/SSISDK-73_auth_detail_fix

Author: sanderPostma

packages/issuer-rest/lib/OID4VCIServer.ts

@@ -175,7 +175,17 @@ export class OID4VCIServer {
       opts.asClientOpts || this._issuer.asClientOpts ? ({ ...opts.asClientOpts, ...this._issuer.asClientOpts } as ClientMetadata) : undefined
 
     pushedAuthorizationEndpoint(this.router, this.issuer, this.authRequestsData)
-    getMetadataEndpoints(this.router, this.issuer)
+
+  // Create root router for alternative .well-known endpoints if needed
+  const basePath = getBasePath(this.baseUrl)
+  let rootRouter: express.Router | undefined
+  if (basePath && basePath !== '/') {
+    rootRouter = express.Router()
+    this._app.use('/', rootRouter)
+  }
+
+  getMetadataEndpoints(this.router, this.issuer, rootRouter, this.baseUrl)
+
     let issuerPayloadPath: string | undefined
     if (this.isGetIssuePayloadEndpointEnabled(opts?.endpointOpts?.getIssuePayloadOpts)) {
       issuerPayloadPath = getCredentialOfferReferenceEndpoint(this.router, this.issuer, {
@@ -231,7 +241,7 @@ export class OID4VCIServer {
         baseUrl: this.baseUrl,
       })
     }
-    this._app.use(getBasePath(this.baseUrl), this._router)
+    this._app.use(basePath, this._router)
   }
 
   public get app(): Express {

packages/issuer-rest/lib/oid4vci-api-functions.ts

@@ -774,16 +774,27 @@ export function pushedAuthorizationEndpoint(
   })
 }
 
-export function getMetadataEndpoints(router: Router, issuer: VcIssuer) {
+export function getMetadataEndpoints(router: Router, issuer: VcIssuer, rootRouter?: Router, baseUrl?: URL | string) {
   const credentialIssuerHandler = (request: Request, response: Response) => {
     return response.json(issuer.issuerMetadata)
   }
-  router.get(WellKnownEndpoints.OPENID4VCI_ISSUER, credentialIssuerHandler)
 
   const authorizationServerHandler = (request: Request, response: Response) => {
     return response.json(issuer.authorizationServerMetadata)
   }
+
+  // Original endpoints on the context router
+  router.get(WellKnownEndpoints.OPENID4VCI_ISSUER, credentialIssuerHandler)
   router.get(WellKnownEndpoints.OAUTH_AS, authorizationServerHandler)
+
+  // Alternative root-level endpoints if rootRouter provided
+  if (rootRouter && baseUrl) {
+    const basePath = getBasePath(baseUrl)
+    if (basePath && basePath !== '/') {
+      rootRouter.get(`/.well-known/openid-credential-issuer${basePath}`, credentialIssuerHandler)
+      rootRouter.get(`/.well-known/oauth-authorization-server${basePath}`, authorizationServerHandler)
+    }
+  }
 }
 
 export function determinePath(