Merge branch 'backport-4060' into release-2.0.x

eclipse-kapua · Jun 20, 2024 · 192c491 · 192c491
2 parents f919dab + af19143
commit 192c491
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Account.java b/...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/...urces/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/UserCredentials.java b/...urces/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/...esources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/UserProfiles.java b/...esources/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