From 8b57465e1bfc4eb939492eebb1f3aff47eed9877 Mon Sep 17 00:00:00 2001 From: dseurotech Date: Thu, 20 Jun 2024 15:52:56 +0200 Subject: [PATCH] :fix: scopeid representation can contain dashes, which need to be captured by the bypass regex for legacy endpoints Signed-off-by: dseurotech --- .../eclipse/kapua/app/api/resources/v1/resources/Account.java | 2 +- .../kapua/app/api/resources/v1/resources/UserCredentials.java | 2 +- .../kapua/app/api/resources/v1/resources/UserProfiles.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Account.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Account.java index eec0d04cb67..d3febdb0a14 100644 --- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Account.java +++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Account.java @@ -38,7 +38,7 @@ Where the scopeId has no meaning when dealing with a specific account Remove the match with /{scopeId}/... in the next release */ -@Path("{scopeId: (\\w+)?}{path:|/}accounts/{accountId}") +@Path("{scopeId: ([\\w-]+)?}{path:|/}accounts/{accountId}") public class Account extends AbstractKapuaResource { @Inject diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/UserCredentials.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/UserCredentials.java index f8803ab2cfc..1fe546b36d1 100644 --- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/UserCredentials.java +++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/UserCredentials.java @@ -37,7 +37,7 @@ Where the scopeId has no meaning of the current user (the one from the session will always be used) Remove the match with /{scopeId}/... in the next release */ -@Path("{scopeId: (\\w+)?}{path:|/}user/credentials") +@Path("{scopeId: ([\\w-]+)?}{path:|/}user/credentials") public class UserCredentials extends AbstractKapuaResource { @Inject diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/UserProfiles.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/UserProfiles.java index 1b312133607..775f1cc28e8 100644 --- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/UserProfiles.java +++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/UserProfiles.java @@ -33,7 +33,7 @@ Where the scopeId has no meaning of the current user (the one from the session will always be used) Remove the match with /{scopeId}/... in the next release */ -@Path("{scopeId: (\\w+)?}{path:|/}user/profile") +@Path("{scopeId: ([\\w-]+)?}{path:|/}user/profile") public class UserProfiles extends AbstractKapuaResource { @Inject