diff --git a/src/main/java/caosdb/server/ServerProperties.java b/src/main/java/caosdb/server/ServerProperties.java index 65eff4ffbde6a2b73d7aaf4f9ea7407990b3c8b9..a4f93ec1c1207e21b0d282974fbf23c1a028053e 100644 --- a/src/main/java/caosdb/server/ServerProperties.java +++ b/src/main/java/caosdb/server/ServerProperties.java @@ -145,7 +145,7 @@ public class ServerProperties extends Properties { serverProperties.setProperty(KEY_MYSQL_USER_NAME, "CaosDB"); serverProperties.setProperty(KEY_MYSQL_USER_PASSWORD, "CaosDB"); - serverProperties.setProperty(KEY_MYSQL_SCHEMA_VERSION, "v2.0.31"); + serverProperties.setProperty(KEY_MYSQL_SCHEMA_VERSION, "v2.1.0"); serverProperties.setProperty(KEY_BASE_PATH, basepath); serverProperties.setProperty(KEY_CONTEXT_ROOT, ""); diff --git a/src/main/java/caosdb/server/resource/AbstractCaosDBServerResource.java b/src/main/java/caosdb/server/resource/AbstractCaosDBServerResource.java index 5e8599978a9bf287b4f5e5f8d40192bffd4a3624..5a32cf795b661537f3dbc07fe8717aff4d8a0242 100644 --- a/src/main/java/caosdb/server/resource/AbstractCaosDBServerResource.java +++ b/src/main/java/caosdb/server/resource/AbstractCaosDBServerResource.java @@ -187,6 +187,7 @@ public abstract class AbstractCaosDBServerResource extends ServerResource { } addRoles(userInfo, user); + retRoot.addContent(userInfo); } } diff --git a/src/test/java/caosdb/server/resource/TestAbstractCaosDBServerResource.java b/src/test/java/caosdb/server/resource/TestAbstractCaosDBServerResource.java index 9240843855cbd3b6bd75e010f44616188d4d3a24..57031f088d9ca9f939b9772ae8d613df914208c4 100644 --- a/src/test/java/caosdb/server/resource/TestAbstractCaosDBServerResource.java +++ b/src/test/java/caosdb/server/resource/TestAbstractCaosDBServerResource.java @@ -67,5 +67,7 @@ public class TestAbstractCaosDBServerResource { assertEquals("TEST-CRID", response.getAttribute("crid").getValue()); assertEquals("0", response.getAttribute("timestamp").getValue()); assertEquals("https://example.com/root/", response.getAttributeValue("baseuri")); + Element userInfo = response.getChild("UserInfo"); + assertNotNull(userInfo); } }