Merge pull request #1618 from sberyozkin/minor_secure_mcp_cmd_demo_updates

Refer to service account in the command line secure MCP demo

Author: geoand

samples/mcp-sse-client-server/mcp-server/pom.xml

@@ -39,7 +39,7 @@
         <dependency>
             <groupId>io.quarkiverse.mcp</groupId>
             <artifactId>quarkus-mcp-server-sse</artifactId>
-            <version>1.3.1</version>
+            <version>1.4.0</version>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>

samples/secure-mcp-cmd-client-server/secure-mcp-cmd-client/src/main/java/io/quarkiverse/langchain4j/sample/PoemService.java

@@ -8,7 +8,7 @@
 public interface PoemService {
     @UserMessage("""
             Write a short 1 paragraph poem in {language} about a Java programming language.
-            Please start by greeting the currently logged in user by name and asking to enjoy reading the poem.""")
-    @McpToolBox("user-name")
+            Please use the service account name when creating the poem.""")
+    @McpToolBox("service-account-name")
     String writePoem(String language);
-}
+}

samples/secure-mcp-cmd-client-server/secure-mcp-cmd-client/src/main/resources/application.properties

@@ -1,5 +1,5 @@
-quarkus.langchain4j.mcp.user-name.transport-type=http
-quarkus.langchain4j.mcp.user-name.url=http://localhost:8080/mcp/sse/
+quarkus.langchain4j.mcp.service-account-name.transport-type=http
+quarkus.langchain4j.mcp.service-account-name.url=http://localhost:8080/mcp/sse/
 
 quarkus.oidc-client.auth-server-url=http://localhost:8081/realms/quarkus
 quarkus.oidc-client.client-id=quarkus-mcp-client

samples/secure-mcp-cmd-client-server/secure-mcp-cmd-server/pom.xml

@@ -39,7 +39,7 @@
         <dependency>
             <groupId>io.quarkiverse.mcp</groupId>
             <artifactId>quarkus-mcp-server-sse</artifactId>
-            <version>1.3.1</version>
+            <version>1.4.0</version>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>

samples/secure-mcp-cmd-client-server/secure-mcp-cmd-server/src/main/java/io/quarkiverse/langchain4j/sample/ServiceAccountNameProvider.java

@@ -0,0 +1,19 @@
+package io.quarkiverse.langchain4j.sample;
+
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+
+import io.quarkiverse.mcp.server.TextContent;
+import io.quarkiverse.mcp.server.Tool;
+import jakarta.inject.Inject;
+
+public class ServiceAccountNameProvider {
+
+    @RestClient
+    @Inject
+    ServiceAccountNameRestClient serviceAccountNameRestClient;
+
+    @Tool(name = "sevice-account-name-provider", description = "Provides a name of the current service account")
+    TextContent provideServiceAccountName() {
+        return new TextContent(serviceAccountNameRestClient.getServiceAccountName());
+    }
+}

samples/secure-mcp-cmd-client-server/secure-mcp-cmd-server/src/main/java/io/quarkiverse/langchain4j/sample/UserNameRestClient.java renamed to samples/secure-mcp-cmd-client-server/secure-mcp-cmd-server/src/main/java/io/quarkiverse/langchain4j/sample/ServiceAccountNameRestClient.java

@@ -8,9 +8,9 @@
 
 @RegisterRestClient
 @AccessToken 
-public interface UserNameRestClient {
+public interface ServiceAccountNameRestClient {
 
     @GET
     @Produces("text/plain")
-    String getUserName();
-}
+    String getServiceAccountName();
+}

samples/secure-mcp-cmd-client-server/secure-mcp-cmd-server/src/main/java/io/quarkiverse/langchain4j/sample/UserNameRestServer.java renamed to samples/secure-mcp-cmd-client-server/secure-mcp-cmd-server/src/main/java/io/quarkiverse/langchain4j/sample/ServiceAccountNameRestServer.java

@@ -7,16 +7,16 @@
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
 
-@Path("/user-name-service")
-public class UserNameRestServer {
+@Path("/service-account-name")
+public class ServiceAccountNameRestServer {
 
     @Inject
     SecurityIdentity securityIdentity;
 
     @GET
     @Produces("text/plain")
     @Authenticated
-    public String getUserName() {
+    public String getServiceAccountName() {
         return securityIdentity.getPrincipal().getName();
     }
 }

samples/secure-mcp-cmd-client-server/secure-mcp-cmd-server/src/main/java/io/quarkiverse/langchain4j/sample/UserNameProvider.java

@@ -37,10 +37,10 @@ quarkus.oidc-client.grant.type=exchange
 quarkus.oidc-client.grant-options.exchange.subject_token_type=urn:ietf:params:oauth:token-type:access_token
 
 # REST client which accesses a protected REST server, by propagating the exchanged token 
-io.quarkiverse.langchain4j.sample.UserNameRestClient/mp-rest/url=http://localhost:8080/user-name-service
+io.quarkiverse.langchain4j.sample.ServiceAccountNameRestClient/mp-rest/url=http://localhost:8080/service-account-name
 
 # OIDC `user-name-service` tenant that secures a protected REST server.
 # It enforces that all tokens that reach it have a `quarkus-mcp-service` audience.
-quarkus.oidc.user-name-service.auth-server-url=${quarkus.oidc.auth-server-url}
-quarkus.oidc.user-name-service.token.audience=quarkus-mcp-service
-quarkus.oidc.user-name-service.tenant-paths=/user-name-service
+quarkus.oidc.service-account-name-rest-server.auth-server-url=${quarkus.oidc.auth-server-url}
+quarkus.oidc.service-account-name-rest-server.token.audience=quarkus-mcp-service
+quarkus.oidc.service-account-name-rest-server.tenant-paths=/service-account-name

samples/secure-mcp-cmd-client-server/secure-mcp-cmd-server/src/main/resources/application.properties

@@ -39,7 +39,7 @@
         <dependency>
             <groupId>io.quarkiverse.mcp</groupId>
             <artifactId>quarkus-mcp-server-sse</artifactId>
-            <version>1.3.1</version>
+            <version>1.4.0</version>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>