KAA-1337: Add REST API to retrieve a configuration of a specific user…

… by its external id.

server/common/admin-rest-client/src/main/java/org/kaaproject/kaa/server/common/admin/AdminClient.java

@@ -59,6 +59,7 @@
 import org.springframework.util.Base64Utils;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.client.RequestCallback;
 import org.springframework.web.client.ResponseExtractor;
 
@@ -1060,4 +1061,9 @@ public void onCredentialsRevoked(String applicationToken, String credentialsId)
         parameters.add("credentialsId", credentialsId);
         this.restTemplate.postForLocation(restTemplate.getUrl() + "notifyRevoked", parameters);
     }
+
+    public EndpointUserConfigurationDto findUserConfigurationByUserId(String externalUId, String appToken, Integer schemaVersion){
+        return restTemplate.getForObject(restTemplate.getUrl() + "configuration/{externalUId}/{appToken}/{schemaVersion}",
+                EndpointUserConfigurationDto.class, externalUId, appToken, schemaVersion);
+    }
 }

server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/UserConfigurationServiceImpl.java

@@ -130,8 +130,7 @@ public EndpointUserConfigurationDto findUserConfigurationByExternalUIdAndAppToke
                 String appToken,
                 Integer schemaVersion,
                 String tenantId) {
-        return getDto(
-                endpointUserConfigurationDao.findByUserIdAndAppTokenAndSchemaVersion(
+        return getDto(endpointUserConfigurationDao.findByUserIdAndAppTokenAndSchemaVersion(
                         endpointUserDao.findByExternalIdAndTenantId(externalUid, tenantId).getId(),
                         appToken,
                         schemaVersion));

server/node/src/main/java/org/kaaproject/kaa/server/admin/controller/ConfigurationController.java

@@ -359,4 +359,28 @@ public void deleteConfigurationRecord(
         configurationService.deleteConfigurationRecord(schemaId, endpointGroupId);
     }
 
+    /**
+     * Get configuration of specific endpoint user bu externalUId
+     *
+     * @param appToken        the application token
+     * @param schemaVersion   the schema version
+     * @param externalUId     the external user id
+     * @throws KaaAdminServiceException the kaa admin service exception
+     */
+    @ApiOperation(value = "Get endpoint user configuration by external user id",
+            notes="Get endpoint user configuration by external user id." +
+                    " Only user with TENANT_DEVELOPER and TENANT_USER roles is allowed to perform this operation.")
+    @ApiResponses(value = {
+            @ApiResponse(code = 400, message = "The specified url is not valid"),
+            @ApiResponse(code = 401, message = "The user is not authenticated or invalid credentials were provided"),
+            @ApiResponse(code = 403, message = "The authenticated user does not have neither TENANT_DEVELOPER nor TENANT_USER role"),
+            @ApiResponse(code = 500, message = "An unexpected error occurred on the server side")})
+    @RequestMapping(value = "configuration/{externalUId}/{appToken}/{schemaVersion}", method = RequestMethod.GET)
+    @ResponseBody
+    public EndpointUserConfigurationDto findUserConfigurationByExternalUIdAndAppTokenAndSchemaVersion(
+            @PathVariable String externalUId,
+            @PathVariable String appToken,
+            @PathVariable Integer schemaVersion) throws KaaAdminServiceException {
+        return  configurationService.findUserConfigurationByExternalUIdAndAppTokenAndSchemaVersion(externalUId,appToken,schemaVersion);
+    }
 }

server/node/src/main/java/org/kaaproject/kaa/server/admin/controller/UserController.java

@@ -290,21 +290,4 @@ public List<UserDto> findAllTenantAdminsByTenantId(
        return  userService.findAllTenantAdminsByTenantId(tenantId);
     }
 
-    @ApiOperation(value = "Get endpoint user configuration by external user id",
-            notes="Get endpoint user configuration by external user id." +
-                    " Only user with TENANT_DEVELOPER and TENANT_USER roles is allowed to perform this operation.")
-    @ApiResponses(value = {
-            @ApiResponse(code = 400, message = "The specified url is not valid"),
-            @ApiResponse(code = 401, message = "The user is not authenticated or invalid credentials were provided"),
-            @ApiResponse(code = 403, message = "The authenticated user does not have neither TENANT_DEVELOPER nor TENANT_USER role"),
-            @ApiResponse(code = 500, message = "An unexpected error occurred on the server side")})
-    @RequestMapping(value = "configuration/{userId}/{appToken}/{schemaVersion}", method = RequestMethod.GET)
-    @ResponseBody
-    public EndpointUserConfigurationDto findUserConfigurationByUserId(
-            @PathVariable String userId,
-            @PathVariable String appToken,
-            @PathVariable Integer schemaVersion) throws KaaAdminServiceException {
-        return  configurationService.findUserConfigurationByExternalUIdAndAppTokenAndSchemaVersion(userId,appToken,schemaVersion);
-    }
-
 }

server/node/src/main/java/org/kaaproject/kaa/server/control/service/ControlService.java

@@ -1719,7 +1719,5 @@ CTLSchemaDto getCTLSchemaByFqnVersionTenantIdAndApplicationId(String fqn, int ve
      */
     List<String> getCredentialsServiceNames() throws ControlServiceException;
 
-
     EndpointUserConfigurationDto findUserConfigurationByExternalUIdAndAppTokenAndSchemaVersion(String userId, String appToken, Integer schemaVersion,String tenantId);
-
 }