@sphereon/oid4vci-client 0.21.0 → 0.21.1-next.2

package/dist/index.cjs

@@ -53,6 +53,7 @@ __export(index_exports, {
   createAuthorizationRequestUrl: () => createAuthorizationRequestUrl,
   createJwtBearerClientAssertion: () => createJwtBearerClientAssertion,
   createSignedAuthRequestWhenNeeded: () => createSignedAuthRequestWhenNeeded,
+  determineWellknownLocations: () => determineWellknownLocations,
   generateMissingPKCEOpts: () => generateMissingPKCEOpts,
   handleCredentialOfferUri: () => handleCredentialOfferUri,
   isUriEncoded: () => isUriEncoded,
@@ -130,14 +131,67 @@ __name(sendNotification, "sendNotification");
 var import_oid4vci_common4 = require("@sphereon/oid4vci-common");
 var import_ssi_types2 = require("@sphereon/ssi-types");
 var logger = import_ssi_types2.Loggers.DEFAULT.get("sphereon:openid4vci:openid-utils");
+var determineWellknownLocations = /* @__PURE__ */ __name((host, endpointType) => {
+  const base = host.endsWith("/") ? host.slice(0, -1) : host;
+  const legacyLocation = `${base}${endpointType}`;
+  try {
+    const url = new URL(base);
+    let pathname = url.pathname;
+    while (pathname.endsWith("/")) {
+      pathname = pathname.slice(0, -1);
+    }
+    if (pathname.length > 0) {
+      const rfc8414Location = `${url.origin}${endpointType}${pathname}`;
+      return endpointType === import_oid4vci_common4.WellKnownEndpoints.OPENID_CONFIGURATION ? [
+        legacyLocation,
+        rfc8414Location
+      ] : [
+        rfc8414Location,
+        legacyLocation
+      ];
+    }
+  } catch (error) {
+    logger.debug(`host ${host} could not be parsed as URL, using legacy well-known location only`);
+  }
+  return [
+    legacyLocation
+  ];
+}, "determineWellknownLocations");
 var retrieveWellknown = /* @__PURE__ */ __name(async (host, endpointType, opts) => {
-  const result = await (0, import_oid4vci_common4.getJson)(`${host.endsWith("/") ? host.slice(0, -1) : host}${endpointType}`, {
-    exceptionOnHttpErrorStatus: opts?.errorOnNotFound
-  });
-  if (result.origResponse.status >= 400) {
-    logger.debug(`host ${host} with endpoint type ${endpointType} status: ${result.origResponse.status}, ${result.origResponse.statusText}`);
+  const locations = determineWellknownLocations(host, endpointType);
+  let successResult;
+  let errorResult;
+  let lastError;
+  for (const location of locations) {
+    try {
+      const response = await (0, import_oid4vci_common4.getJson)(location, {
+        exceptionOnHttpErrorStatus: false
+      });
+      if (response.origResponse.status < 400) {
+        if (response.successBody !== void 0 && typeof response.successBody === "object" && response.successBody !== null) {
+          return response;
+        }
+        successResult = successResult ?? response;
+      } else {
+        logger.debug(`host ${host} with endpoint type ${endpointType} at ${location} status: ${response.origResponse.status}, ${response.origResponse.statusText}`);
+        errorResult = errorResult ?? response;
+      }
+    } catch (error) {
+      logger.debug(`host ${host} with endpoint type ${endpointType} at ${location} error: ${error instanceof Error ? error.message : error}`);
+      lastError = error;
+    }
   }
-  return result;
+  if (successResult) {
+    return successResult;
+  }
+  if (errorResult) {
+    if (opts?.errorOnNotFound) {
+      const error = JSON.stringify(errorResult.errorBody ?? {});
+      throw new Error(error === "{}" ? '{"error": "not found"}' : error);
+    }
+    return errorResult;
+  }
+  throw lastError instanceof Error ? lastError : new Error(`Could not retrieve well-known ${endpointType} for host ${host}`);
 }, "retrieveWellknown");
 
 // lib/functions/AccessTokenUtil.ts