Path parameter is missing in the get account endpoint

pedroigor · pedroigor · commit 7da3953435f5 · 2022-02-15T15:44:05.000-03:00
Closes keycloak#10055
diff --git a/services/src/main/java/org/keycloak/services/resources/account/AccountRestService.java b/services/src/main/java/org/keycloak/services/resources/account/AccountRestService.java
@@ -138,7 +138,7 @@ public void init() {
     @GET
     @Produces(MediaType.APPLICATION_JSON)
     @NoCache
-    public UserRepresentation account(final @PathParam("userProfileMetadata") Boolean userProfileMetadata) {
+    public UserRepresentation account(final @QueryParam("userProfileMetadata") Boolean userProfileMetadata) {
         auth.requireOneOf(AccountRoles.MANAGE_ACCOUNT, AccountRoles.VIEW_PROFILE);
 
         UserModel user = auth.getUser();
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceTest.java
@@ -106,7 +106,13 @@ public void testGetUserProfileMetadata_EditUsernameAllowed() throws IOException
         assertUserProfileAttributeMetadata(user, "firstName", "${firstName}", true, false);
         assertUserProfileAttributeMetadata(user, "lastName", "${lastName}", true, false);
     }
-    
+
+    @Test
+    public void testGetUserProfileWithoutMetadata() throws IOException {
+        UserRepresentation user = getUser(false);
+        assertNull(user.getUserProfileMetadata());
+    }
+
     @Test
     public void testGetUserProfileMetadata_EditUsernameDisallowed() throws IOException {
         
@@ -462,7 +468,13 @@ public void testUpdateProfileWithRegistrationEmailAsUsername() throws IOExceptio
     }
 
     protected UserRepresentation getUser() throws IOException {
-        SimpleHttp a = SimpleHttp.doGet(getAccountUrl(null), httpClient).auth(tokenUtil.getToken());
+        return getUser(true);
+    }
+
+    protected UserRepresentation getUser(boolean fetchMetadata) throws IOException {
+        String accountUrl = getAccountUrl(null) + "?userProfileMetadata=" + fetchMetadata;
+        SimpleHttp a = SimpleHttp.doGet(accountUrl, httpClient).auth(tokenUtil.getToken());
+
         try {
             return a.asJson(UserRepresentation.class);
         } catch (IOException e) {
