Update

Author: skyforce77

src/main/java/com/authlete/jaxrs/server/api/vci/BatchCredentialEndpoint.java

@@ -37,6 +37,7 @@
 import com.authlete.jaxrs.server.util.CredentialUtil;
 import com.authlete.jaxrs.server.util.ExceptionUtil;
 import com.authlete.jaxrs.server.util.ResponseUtil;
+import com.authlete.jaxrs.server.util.StringUtil;
 
 
 @Path("/api/batch_credential")
@@ -59,8 +60,12 @@ public Response post(@Context HttpServletRequest request,
         final CredentialRequestInfo[] credential =
                 credentialBatchParse(api, requestContent, accessToken);
 
-        final CredentialIssuanceOrder[] orders =
-                CredentialUtil.toOrder(introspection, credential);
+        final CredentialIssuanceOrder[] orders;
+        try {
+            orders = CredentialUtil.toOrder(introspection, credential);
+        } catch (final CredentialUtil.UnknownCredentialFormatException e) {
+            return ResponseUtil.badRequestJson(e.getJsonError());
+        }
 
         // Issue
         return credentialIssue(api, orders, accessToken);

src/main/java/com/authlete/jaxrs/server/api/vci/CredentialEndpoint.java

@@ -37,6 +37,7 @@
 import com.authlete.jaxrs.server.util.CredentialUtil;
 import com.authlete.jaxrs.server.util.ExceptionUtil;
 import com.authlete.jaxrs.server.util.ResponseUtil;
+import com.authlete.jaxrs.server.util.StringUtil;
 
 
 @Path("/api/credential")
@@ -59,11 +60,11 @@ public Response post(@Context HttpServletRequest request,
         final CredentialRequestInfo credential =
                 credentialSingleParse(api, requestContent, accessToken);
 
-        final CredentialIssuanceOrder order =
-                CredentialUtil.toOrder(introspection, credential);
-        if(order == null)
-        {
-            return ExceptionUtil.badRequest(String.format("Unsupported credential format %s.", formatId));
+        final CredentialIssuanceOrder order;
+        try {
+            order = CredentialUtil.toOrder(introspection, credential);
+        } catch (final CredentialUtil.UnknownCredentialFormatException e) {
+            return ResponseUtil.badRequestJson(e.getJsonError());
         }
 
         // Issue

src/main/java/com/authlete/jaxrs/server/api/vci/DeferredCredentialEndpoint.java

@@ -37,6 +37,7 @@
 import com.authlete.jaxrs.server.util.CredentialUtil;
 import com.authlete.jaxrs.server.util.ExceptionUtil;
 import com.authlete.jaxrs.server.util.ResponseUtil;
+import com.authlete.jaxrs.server.util.StringUtil;
 
 
 @Path("/api/deferred_credential")
@@ -59,12 +60,16 @@ public Response post(@Context HttpServletRequest request,
         final CredentialRequestInfo credential =
                 credentialDeferredParse(api, requestContent, accessToken);
 
-        final CredentialIssuanceOrder order =
-                CredentialUtil.toOrder(introspection, credential);
+        final CredentialIssuanceOrder order;
+        try {
+            order = CredentialUtil.toOrder(introspection, credential);
+        } catch (final CredentialUtil.UnknownCredentialFormatException e) {
+            return ResponseUtil.badRequest(e.getJsonError());
+        }
 
         if (order.isIssuanceDeferred())
         {
-            return ResponseUtil.badRequestJson("{\"error\": \"issuance_pending\"");
+            return ResponseUtil.badRequestJson(StringUtil.toJsonError("issuance_pending"));
         }
 
         // Issue

src/main/java/com/authlete/jaxrs/server/api/vci/JWTIssuerMetadataEndpoint.java

@@ -1,7 +1,8 @@
 package com.authlete.jaxrs.server.util;
 
 
-import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedList;
 import com.authlete.common.dto.CredentialIssuanceOrder;
 import com.authlete.common.dto.CredentialRequestInfo;
 import com.authlete.common.dto.IntrospectionResponse;
@@ -12,12 +13,13 @@ public class CredentialUtil
 {
     public static CredentialIssuanceOrder toOrder(final IntrospectionResponse introspection,
                                                   final CredentialRequestInfo info)
+            throws UnknownCredentialFormatException
     {
         final String formatId = info.getFormat();
         final OrderFormat format = OrderFormat.byId(formatId);
         if (format == null)
         {
-            throw ExceptionUtil.badRequestException(String.format("Unsupported credential format %s.", formatId));
+            throw new UnknownCredentialFormatException(String.format("Unsupported credential format %s.", formatId));
         }
 
         return format.getProcessor()
@@ -27,9 +29,26 @@ public static CredentialIssuanceOrder toOrder(final IntrospectionResponse intros
 
     public static CredentialIssuanceOrder[] toOrder(final IntrospectionResponse introspection,
                                                     final CredentialRequestInfo[] infos)
+            throws UnknownCredentialFormatException
     {
-        return Arrays.stream(infos)
-                .map(info -> toOrder(introspection, info))
-                .toArray(CredentialIssuanceOrder[]::new);
+        final Collection<CredentialIssuanceOrder> orders = new LinkedList<>();
+        for(final CredentialRequestInfo info : infos)
+        {
+            orders.add(toOrder(introspection, info));
+        }
+
+        return orders.toArray(new CredentialIssuanceOrder[0]);
+    }
+
+
+    public static class UnknownCredentialFormatException extends Exception {
+        UnknownCredentialFormatException(final String message) {
+            super(message);
+        }
+
+        public String getJsonError()
+        {
+            return StringUtil.toJsonError(this.getMessage());
+        }
     }
 }

src/main/java/com/authlete/jaxrs/server/util/CredentialUtil.java

@@ -0,0 +1,10 @@
+package com.authlete.jaxrs.server.util;
+
+public class StringUtil {
+
+    public static String toJsonError(final String error)
+    {
+        return String.format("{\"error\": \"%s\"", error);
+    }
+
+}

src/main/java/com/authlete/jaxrs/server/util/StringUtil.java

@@ -39,7 +39,7 @@
         com.authlete.jaxrs.server.api.vci.DeferredCredentialEndpoint,
         com.authlete.jaxrs.server.api.vci.CredentialOfferEndpoint,
         com.authlete.jaxrs.server.api.vci.CredentialOfferIssueEndpoint,
-        com.authlete.jaxrs.server.api.vci.JWKSetMetadataEndpoint,
+        com.authlete.jaxrs.server.api.vci.CredentialJWKSetEndpoint,
         com.authlete.jaxrs.server.api.ClientRegistrationEndpoint,
         com.authlete.jaxrs.server.api.ConfigurationEndpoint,
         com.authlete.jaxrs.server.api.FederationConfigurationEndpoint,
@@ -86,7 +86,6 @@
   <filter-mapping>
     <filter-name>API</filter-name>
     <url-pattern>/api/*</url-pattern>
-    <url-pattern>/.well-known/jwks.json</url-pattern>
     <url-pattern>/.well-known/openid-configuration</url-pattern>
     <url-pattern>/.well-known/openid-credential-issuer</url-pattern>
     <url-pattern>/.well-known/openid-federation</url-pattern>