fix: Align Compat VertX Web usage with lastest changes in main code

kabir · kabir · commit 4164b868b1bd · 2026-05-06T10:37:41.000+01:00
diff --git a/compat-0.3/reference/grpc/src/test/java/org/a2aproject/sdk/compat03/server/grpc/quarkus/AuthTestProfile_v0_3.java b/compat-0.3/reference/grpc/src/test/java/org/a2aproject/sdk/compat03/server/grpc/quarkus/AuthTestProfile_v0_3.java
diff --git a/compat-0.3/reference/grpc/src/test/java/org/a2aproject/sdk/compat03/server/grpc/quarkus/QuarkusA2AGrpc_v0_3_WithAuthTest.java b/compat-0.3/reference/grpc/src/test/java/org/a2aproject/sdk/compat03/server/grpc/quarkus/QuarkusA2AGrpc_v0_3_WithAuthTest.java
@@ -7,6 +7,7 @@
 import org.a2aproject.sdk.compat03.client.transport.grpc.GrpcTransportConfigBuilder_v0_3;
 import org.a2aproject.sdk.compat03.client.transport.spi.interceptors.auth.AuthInterceptor_v0_3;
 import org.a2aproject.sdk.compat03.conversion.AbstractA2AServerWithAuthTest_v0_3;
+import org.a2aproject.sdk.compat03.conversion.AuthTestProfile_v0_3;
 import org.a2aproject.sdk.compat03.spec.TransportProtocol_v0_3;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
diff --git a/compat-0.3/reference/jsonrpc/src/main/java/org/a2aproject/sdk/compat03/server/apps/quarkus/A2AServerRoutes_v0_3.java b/compat-0.3/reference/jsonrpc/src/main/java/org/a2aproject/sdk/compat03/server/apps/quarkus/A2AServerRoutes_v0_3.java
@@ -99,7 +99,7 @@ void setupRoutes(@Observes Router router) {
                         invokeJSONRPCHandler(ctx.body().asString(), ctx);
                     });
                 } catch (UnauthorizedException | ForbiddenException e) {
-                    VertxSecurityHelper.handleAuthError(ctx, e);
+                    vertxSecurityHelper.handleAuthError(ctx, e);
                 } catch (Exception e) {
                     VertxSecurityHelper.handleGenericError(ctx);
                 }
diff --git a/compat-0.3/reference/jsonrpc/src/test/java/org/a2aproject/sdk/compat03/server/apps/quarkus/QuarkusA2AJSONRPC_v0_3_WithAuthTest.java b/compat-0.3/reference/jsonrpc/src/test/java/org/a2aproject/sdk/compat03/server/apps/quarkus/QuarkusA2AJSONRPC_v0_3_WithAuthTest.java
@@ -5,6 +5,7 @@
 import org.a2aproject.sdk.compat03.client.transport.jsonrpc.JSONRPCTransportConfigBuilder_v0_3;
 import org.a2aproject.sdk.compat03.client.transport.spi.interceptors.auth.AuthInterceptor_v0_3;
 import org.a2aproject.sdk.compat03.conversion.AbstractA2AServerWithAuthTest_v0_3;
+import org.a2aproject.sdk.compat03.conversion.AuthTestProfile_v0_3;
 import org.a2aproject.sdk.compat03.spec.TransportProtocol_v0_3;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;
diff --git a/compat-0.3/reference/rest/src/main/java/org/a2aproject/sdk/compat03/server/rest/quarkus/A2AServerRoutes_v0_3.java b/compat-0.3/reference/rest/src/main/java/org/a2aproject/sdk/compat03/server/rest/quarkus/A2AServerRoutes_v0_3.java
@@ -150,7 +150,7 @@ private Handler<RoutingContext> authenticated(Consumer<RoutingContext> action) {
             try {
                 vertxSecurityHelper.runInRequestContext(ctx, () -> action.accept(ctx));
             } catch (UnauthorizedException | ForbiddenException e) {
-                VertxSecurityHelper.handleAuthError(ctx, e);
+                vertxSecurityHelper.handleAuthError(ctx, e);
             } catch (Exception e) {
                 VertxSecurityHelper.handleGenericError(ctx);
             }
@@ -253,10 +253,13 @@ public void cancelTask(RoutingContext rc) {
 
     private void sendResponse(RoutingContext rc, @Nullable HTTPRestResponse response) {
         if (response != null) {
-            rc.response()
+            var httpResponse = rc.response()
                     .setStatusCode(response.getStatusCode())
-                    .putHeader(CONTENT_TYPE, response.getContentType())
-                    .end(response.getBody());
+                    .putHeader(CONTENT_TYPE, response.getContentType());
+
+            response.getHeaders().forEach(httpResponse::putHeader);
+
+            httpResponse.end(response.getBody());
         } else {
             rc.response().end();
         }
@@ -466,7 +469,7 @@ public void onSubscribe(Flow.Subscription subscription) {
                     this.upstream.request(1);
 
                     response.closeHandler(v -> {
-                        logger.info("REST SSE connection closed by client, calling EventConsumer.cancel() to stop polling loop");
+                        logger.debug("REST SSE connection closed by client, calling EventConsumer.cancel() to stop polling loop");
                         context.invokeEventConsumerCancelCallback();
                         subscription.cancel();
                     });
diff --git a/compat-0.3/reference/rest/src/test/java/org/a2aproject/sdk/compat03/server/rest/quarkus/AuthTestProfile_v0_3.java b/compat-0.3/reference/rest/src/test/java/org/a2aproject/sdk/compat03/server/rest/quarkus/AuthTestProfile_v0_3.java
diff --git a/compat-0.3/reference/rest/src/test/java/org/a2aproject/sdk/compat03/server/rest/quarkus/QuarkusA2ARest_v0_3_WithAuthTest.java b/compat-0.3/reference/rest/src/test/java/org/a2aproject/sdk/compat03/server/rest/quarkus/QuarkusA2ARest_v0_3_WithAuthTest.java
@@ -5,6 +5,7 @@
 import org.a2aproject.sdk.compat03.client.transport.rest.RestTransportConfigBuilder_v0_3;
 import org.a2aproject.sdk.compat03.client.transport.spi.interceptors.auth.AuthInterceptor_v0_3;
 import org.a2aproject.sdk.compat03.conversion.AbstractA2AServerWithAuthTest_v0_3;
+import org.a2aproject.sdk.compat03.conversion.AuthTestProfile_v0_3;
 import org.a2aproject.sdk.compat03.spec.TransportProtocol_v0_3;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;
diff --git a/compat-0.3/reference/rest/src/test/java/org/a2aproject/sdk/compat03/server/rest/quarkus/TestIdentityProvider_v0_3.java b/compat-0.3/reference/rest/src/test/java/org/a2aproject/sdk/compat03/server/rest/quarkus/TestIdentityProvider_v0_3.java
diff --git a/compat-0.3/server-conversion/pom.xml b/compat-0.3/server-conversion/pom.xml
@@ -107,6 +107,20 @@
             <scope>test</scope>
         </dependency>
 
+        <!-- Quarkus Security for TestIdentityProvider_v0_3 -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-security</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Quarkus JUnit5 for AuthTestProfile_v0_3 (QuarkusTestProfile) -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <!-- REST-assured for test utilities -->
         <dependency>
             <groupId>io.rest-assured</groupId>
diff --git a/compat-0.3/server-conversion/src/test/java/org/a2aproject/sdk/compat03/conversion/AuthTestProfile_v0_3.java b/compat-0.3/server-conversion/src/test/java/org/a2aproject/sdk/compat03/conversion/AuthTestProfile_v0_3.java
@@ -1,4 +1,4 @@
-package org.a2aproject.sdk.compat03.server.apps.quarkus;
+package org.a2aproject.sdk.compat03.conversion;
 
 import java.util.Map;
 
@@ -9,12 +9,18 @@ public class AuthTestProfile_v0_3 implements QuarkusTestProfile {
     @Override
     public Map<String, String> getConfigOverrides() {
         return Map.ofEntries(
-                // Disable the TestIdentityProvider - we want real authentication
+                // Disable TestIdentityProvider auto-authentication
                 Map.entry("test.identity.auto-auth", "false"),
 
+                // Disable Quarkus test security
+                Map.entry("quarkus.test.security.auth.enabled", "false"),
+
                 // Enable security in AgentCard (server advertises Basic Auth support)
                 Map.entry("test.agent.security.enabled", "true"),
 
+                // Enable authorization so @Authenticated is enforced (used by gRPC)
+                Map.entry("test.authorization.enabled", "true"),
+
                 // Enable embedded user store
                 Map.entry("quarkus.security.users.embedded.enabled", "true"),
                 Map.entry("quarkus.security.users.embedded.plain-text", "true"),
diff --git a/compat-0.3/server-conversion/src/test/java/org/a2aproject/sdk/compat03/conversion/TestIdentityProvider_v0_3.java b/compat-0.3/server-conversion/src/test/java/org/a2aproject/sdk/compat03/conversion/TestIdentityProvider_v0_3.java
@@ -1,4 +1,4 @@
-package org.a2aproject.sdk.compat03.server.apps.quarkus;
+package org.a2aproject.sdk.compat03.conversion;
 
 import jakarta.enterprise.context.ApplicationScoped;
 
diff --git a/compat-0.3/transport/rest/src/main/java/org/a2aproject/sdk/compat03/transport/rest/handler/RestHandler_v0_3.java b/compat-0.3/transport/rest/src/main/java/org/a2aproject/sdk/compat03/transport/rest/handler/RestHandler_v0_3.java
@@ -11,6 +11,7 @@
 import jakarta.inject.Inject;
 
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.Flow;
 
 import org.a2aproject.sdk.server.ExtendedAgentCard;
@@ -389,11 +390,17 @@ public static class HTTPRestResponse {
         private final int statusCode;
         private final String contentType;
         private final String body;
+        private final Map<String, String> headers;
 
         public HTTPRestResponse(int statusCode, String contentType, String body) {
+            this(statusCode, contentType, body, Map.of());
+        }
+
+        public HTTPRestResponse(int statusCode, String contentType, String body, Map<String, String> headers) {
             this.statusCode = statusCode;
             this.contentType = contentType;
             this.body = body;
+            this.headers = Map.copyOf(headers);
         }
 
         public int getStatusCode() {
@@ -408,9 +415,13 @@ public String getBody() {
             return body;
         }
 
+        public Map<String, String> getHeaders() {
+            return headers;
+        }
+
         @Override
         public String toString() {
-            return "HTTPRestResponse{" + "statusCode=" + statusCode + ", contentType=" + contentType + ", body=" + body + '}';
+            return "HTTPRestResponse{" + "statusCode=" + statusCode + ", contentType=" + contentType + ", body=" + body + ", headers=" + headers + '}';
         }
     }
 
diff --git a/reference/multiversion-jsonrpc/src/main/java/org/a2aproject/sdk/server/multiversion/jsonrpc/MultiVersionJSONRPCRoutes.java b/reference/multiversion-jsonrpc/src/main/java/org/a2aproject/sdk/server/multiversion/jsonrpc/MultiVersionJSONRPCRoutes.java
@@ -53,8 +53,7 @@ void setupRoutes(@Observes Router router) {
                                 null);
                         }
                     });
-                } catch (UnauthorizedException | ForbiddenException e) {
-                    VertxSecurityHelper.handleAuthError(ctx, e);
+                } catch (UnauthorizedException | ForbiddenException e) {vertxSecurityHelper.handleAuthError(ctx, e);
                 } catch (A2AError e) {
                     ctx.response()
                         .setStatusCode(200)
diff --git a/reference/multiversion-rest/src/main/java/org/a2aproject/sdk/server/multiversion/rest/MultiVersionRestRoutes.java b/reference/multiversion-rest/src/main/java/org/a2aproject/sdk/server/multiversion/rest/MultiVersionRestRoutes.java
@@ -123,7 +123,7 @@ void setupRoutes(@Observes @Priority(5) Router router) {
                     vertxSecurityHelper.runInRequestContext(ctx,
                         () -> v03Routes.getAuthenticatedExtendedCard(ctx));
                 } catch (UnauthorizedException | ForbiddenException e) {
-                    VertxSecurityHelper.handleAuthError(ctx, e);
+                    vertxSecurityHelper.handleAuthError(ctx, e);
                 } catch (Exception e) {
                     VertxSecurityHelper.handleGenericError(ctx);
                 }
@@ -167,7 +167,7 @@ private io.vertx.core.Handler<RoutingContext> versionDispatch(
                     }
                 });
             } catch (UnauthorizedException | ForbiddenException e) {
-                VertxSecurityHelper.handleAuthError(ctx, e);
+                vertxSecurityHelper.handleAuthError(ctx, e);
             } catch (A2AError e) {
                 sendA2AErrorResponse(ctx, e);
             } catch (Exception e) {
@@ -197,7 +197,7 @@ private io.vertx.core.Handler<RoutingContext> versionDispatchNoBody(
                     }
                 });
             } catch (UnauthorizedException | ForbiddenException e) {
-                VertxSecurityHelper.handleAuthError(ctx, e);
+                vertxSecurityHelper.handleAuthError(ctx, e);
             } catch (A2AError e) {
                 sendA2AErrorResponse(ctx, e);
             } catch (Exception e) {
diff --git a/tests/reference/grpc/src/test/java/org/a2aproject/sdk/tests/multiversion/grpc/AuthTestProfile.java b/tests/reference/grpc/src/test/java/org/a2aproject/sdk/tests/multiversion/grpc/AuthTestProfile.java
@@ -19,23 +19,29 @@ public class AuthTestProfile implements QuarkusTestProfile {
     @Override
     public Map<String, String> getConfigOverrides() {
         return Map.ofEntries(
-                // Disable test security (injected test user) - we want REAL authentication
+                // Disable TestIdentityProvider auto-authentication
+                Map.entry("test.identity.auto-auth", "false"),
+
+                // Disable Quarkus test security
                 Map.entry("quarkus.test.security.auth.enabled", "false"),
 
+                // Enable security in AgentCard (server advertises Basic Auth support)
+                Map.entry("test.agent.security.enabled", "true"),
+
+                // Enable authorization so @Authenticated is enforced (used by gRPC)
+                Map.entry("test.authorization.enabled", "true"),
+
                 // Enable embedded user store
                 Map.entry("quarkus.security.users.embedded.enabled", "true"),
                 Map.entry("quarkus.security.users.embedded.plain-text", "true"),
                 Map.entry("quarkus.security.users.embedded.users.testuser", "testpass"),
                 Map.entry("quarkus.security.users.embedded.roles.testuser", "user"),
 
-                // Enable security in agent card
-                Map.entry("test.agent.security.enabled", "true"),
-
-                // Enable authorization so @Authenticated is enforced
-                Map.entry("test.authorization.enabled", "true"),
-
                 // Enable HTTP Basic authentication
-                Map.entry("quarkus.http.auth.basic", "true")
+                Map.entry("quarkus.http.auth.basic", "true"),
+
+                // Enable proactive authentication - authenticate at HTTP layer before route handler
+                Map.entry("quarkus.http.auth.proactive", "true")
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ void setupRoutes(@Observes Router router) {`
`99`	`99`	`invokeJSONRPCHandler(ctx.body().asString(), ctx);`
`100`	`100`	`});`
`101`	`101`	`} catch (UnauthorizedException \| ForbiddenException e) {`
`102`		`- VertxSecurityHelper.handleAuthError(ctx, e);`
	`102`	`+ vertxSecurityHelper.handleAuthError(ctx, e);`
`103`	`103`	`} catch (Exception e) {`
`104`	`104`	`VertxSecurityHelper.handleGenericError(ctx);`
`105`	`105`	`}`