This is an automated email from the ASF dual-hosted git repository. mgubaidullin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit 287c076146c252675da3292196b12850d117f227 Author: Marat Gubaidullin <[email protected]> AuthorDate: Mon Aug 24 17:54:47 2026 -0400 Karavan-app java backend update for 4.22.0 --- .../apache/camel/karavan/api/AbstractApiResource.java | 4 ++-- .../camel/karavan/api/TokenAuthenticationMechanism.java | 2 +- .../org/apache/camel/karavan/cache/AccessToken.java | 17 ----------------- .../camel/karavan/complexity/ComplexityProject.java | 17 ----------------- .../apache/camel/karavan/service/ComplexityService.java | 5 ----- 5 files changed, 3 insertions(+), 42 deletions(-) diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/api/AbstractApiResource.java b/karavan-app/src/main/java/org/apache/camel/karavan/api/AbstractApiResource.java index 9c29d311..6f024921 100644 --- a/karavan-app/src/main/java/org/apache/camel/karavan/api/AbstractApiResource.java +++ b/karavan-app/src/main/java/org/apache/camel/karavan/api/AbstractApiResource.java @@ -60,11 +60,11 @@ public class AbstractApiResource { String lastName = jwt.getClaim("family_name"); String email = jwt.getClaim("email"); if (user == null) { - LOGGER.info("OIDC User not found in Talisman Database. Creating new one."); + LOGGER.info("OIDC User not found in Platform Database. Creating new one."); user = new AccessUser(username, firstName, lastName, email, AccessUser.UserStatus.ACTIVE, roleList); karavanCache.saveUser(user, true); } else if (!Objects.equals(firstName, user.getFirstName()) || !Objects.equals(lastName, user.getLastName()) || !Objects.equals(email, user.getEmail())) { - LOGGER.info("OIDC User found in Talisman Database. User is outdated. Updating user."); + LOGGER.info("OIDC User found in Platform Database. User is outdated. Updating user."); user.setFirstName(firstName); user.setLastName(lastName); user.setEmail(email); diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/api/TokenAuthenticationMechanism.java b/karavan-app/src/main/java/org/apache/camel/karavan/api/TokenAuthenticationMechanism.java index 2e5c39b5..8bc069e5 100644 --- a/karavan-app/src/main/java/org/apache/camel/karavan/api/TokenAuthenticationMechanism.java +++ b/karavan-app/src/main/java/org/apache/camel/karavan/api/TokenAuthenticationMechanism.java @@ -65,7 +65,7 @@ public class TokenAuthenticationMechanism implements HttpAuthenticationMechanism .addAttribute("clientName", metadata.clientName()) .setAnonymous(false); - LOGGER.infof("Trace: Authenticated MCP agent [%s] owned by [%s]", metadata.clientName(), metadata.ownerName()); + LOGGER.infof("Trace: Authenticated", metadata.clientName(), metadata.ownerName()); return Uni.createFrom().item(builder.build()); } catch (Exception e) { diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/cache/AccessToken.java b/karavan-app/src/main/java/org/apache/camel/karavan/cache/AccessToken.java index 4514b40f..60e14176 100644 --- a/karavan-app/src/main/java/org/apache/camel/karavan/cache/AccessToken.java +++ b/karavan-app/src/main/java/org/apache/camel/karavan/cache/AccessToken.java @@ -12,24 +12,7 @@ public record AccessToken( Instant expiresAt ) { - /** - * Checks if the token has surpassed its expiration timestamp. - */ public boolean isExpired() { return expiresAt != null && Instant.now().isAfter(expiresAt); } - - /** - * Checks whether the external agent has authorization to access a specific project. - * Supports a wildcard "*" for unrestricted developer-level access. - */ - public boolean hasProjectAccess(String projectId) { - if (isExpired()) { - return false; - } - if (allowedProjectIds == null || allowedProjectIds.isEmpty()) { - return false; - } - return allowedProjectIds.contains("*") || allowedProjectIds.contains(projectId); - } } \ No newline at end of file diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/complexity/ComplexityProject.java b/karavan-app/src/main/java/org/apache/camel/karavan/complexity/ComplexityProject.java index e9b13109..15bb41a9 100644 --- a/karavan-app/src/main/java/org/apache/camel/karavan/complexity/ComplexityProject.java +++ b/karavan-app/src/main/java/org/apache/camel/karavan/complexity/ComplexityProject.java @@ -12,8 +12,6 @@ public class ComplexityProject { private List<ComplexityRoute> routes = new ArrayList<>(); private Integer rests = 0; private boolean exposesOpenApi = false; - private boolean mcp = false; - private boolean agents = false; private List<String> dependencies = new ArrayList<>(); public ComplexityProject() { @@ -87,19 +85,4 @@ public class ComplexityProject { this.exposesOpenApi = exposesOpenApi; } - public boolean isMcp() { - return mcp; - } - - public void setMcp(boolean mcp) { - this.mcp = mcp; - } - - public boolean isAgents() { - return agents; - } - - public void setAgents(boolean agents) { - this.agents = agents; - } } diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/service/ComplexityService.java b/karavan-app/src/main/java/org/apache/camel/karavan/service/ComplexityService.java index 144a2de6..0e2d2b7a 100644 --- a/karavan-app/src/main/java/org/apache/camel/karavan/service/ComplexityService.java +++ b/karavan-app/src/main/java/org/apache/camel/karavan/service/ComplexityService.java @@ -73,13 +73,8 @@ public class ComplexityService { routes1.forEach(r -> r.getComponentsExt().forEach(complexityFile::addComponentExt)); routes1.forEach(r -> r.getComponentsInt().forEach(complexityFile::addComponentInt)); routes1.forEach(r -> r.getKamelets().forEach(complexityFile::addKamelet)); - if (file.getName().equals("mcp-route.camel.yaml")) { - complexityProject.setMcp(true); - } routes.addAll(routes1); - } else if (file.getName().equals("AgentConfig.java")) { - complexityProject.setAgents(true); } else if (file.getName().equals(APPLICATION_PROPERTIES_FILENAME)) { complexityFile.setType(ComplexityFile.Type.properties); complexityProject.setDependencies(getDependencies(file.getCode()));
